From aebc1b19b6620db8e6e3df19e8985b857bb88972 Mon Sep 17 00:00:00 2001 From: pm-ankur-prava <81356008+pm-ankur-prava@users.noreply.github.com> Date: Mon, 28 Feb 2022 16:37:28 +0530 Subject: [PATCH] Stable release for v4.43 (#514) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Pubmatic: fix issue where using an adUnit outstream renderer throws an error (#6152) * Malltv Bid Adapter : added data object as a param (#6232) * Updated malltv adapter * Updated markdown * Added test for malltvBidAdapter * support setting coopSync in s2sConfig (#6213) Co-authored-by: Mark Monday * Revert "support setting coopSync in s2sConfig (#6213)" (#6249) This reverts commit 25dd35c99f404390242133b84245bb5cafeb7d7b. * pbsBidAdapter: change order of client syncs (#6248) * pbsBidAdapter: change order cookie_syncs Prebid Server places cookie-sync URLs in a specific order. PBJS was pulling them off in reverse order. * moving comment * reverting coopSync * pass a flag back to ID5 servers if abTesting was enabled by the publisher for monitoring usage of the feature (#6170) * appneuxs Bid Adapter - add support for identitylink userId (#6245) * Update britepoolIdSystem.md (#6254) Eliot from Britepool says you can set just the api key without any params (eg ssid or hash) * UNICORN Adapter - accept multiple formats (#6255) * enable multiple formats add version * add banner w/h * fix w/h & spec * ATS-analytics - add comment clarifying ownership of atsAnalytics (#6257) * [ParrableIdSystem] Ensure base64 payload is url-safe (#6258) * Added url safe base64 encoding * Added url safe base64 encoding test Co-authored-by: Victor * Keywords + Screen resolution + CPU Core (#6259) Co-authored-by: sgimenez * Rubicon Analytics: Fire event once gptSlots render (#6241) * Once all gam slots are back fire event * push to cmd queue * New dimension for tracking name of the matching adUnit pattern (#6252) * Adhese Bid Adapter: Per adunit targets (#6256) * adpod category support test * Revert "adpod category support test" * Gjirafa Bid Adapter: added data object as a param (#6231) * Added data parameter to gjirafaBidAdapter * Updated gjirafaBidAdapter markdown * Added test for gjirafaBidAdapter * Fix a TypeError when message event source is not available (#6224) * fix broken tests due to "encoded" base64 logic (#6268) * Adkernel Bid Adapter: stringads alias added (#6262) * Adkernel: stringads alias * Revert "Extended ID permissions supported by bidder (#6112)" (#6269) This reverts commit a926dee9e108ca4b8792ba8992a9bca7c2f42781. * Prebid 4.25.0 Release * Increment pre version * smartxBidAdapter: new Feature - Made Out-Stream Player configurable (#6239) * Add smartclipBidAdapter * smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions * - made outstream player configurable * remove wrong named files * camelcase * fix Co-authored-by: smartclip AdTechnology Co-authored-by: Gino Cirlini * Idl1 (#6242) * Renaming idLibrary to idImportLibrary * Renaming idLibrary to idImportLibrary Co-authored-by: skocheri * Add the trade desk gvlid (#6263) UnifiedId only works with a vendor exception in the gdpr enforcement module. However this is not okay as the unifiedId matching endpoint doesn't take the consent into account and cookies are being dropped even without consent. * pick up wrapper family detail (#6272) * Add user sync (#6244) * initial * fix * remove redundant language mod, use player sizes in video traff * test modify * fix * Adding Tests * add keywords param * log * log * log * fix * add idl * add idl * fix test * lint * lint * fix * lint * lint * lint * lint * add sync * fix Co-authored-by: Aigolkin1991 Co-authored-by: Aiholkin * Zeotap id plus gvlid (#6260) * Add gvlid for ZeotapIdPlus module * Pass gvlid and module name to storage manager * add testcases to zeotapIdPlusIdSystem * remove unwanted code * adWMG adapter: add new parameter, fix minor bugs (#6265) * Support floorCPM parameter, fix some minor bugs * fix space-in-parens circleci error * example fix * clean usersync URL * spaces * spaces * add new unit tests, compatibility with IE11 * remove logInfo Co-authored-by: Mikhail Dykun * [ParrableIdSystem] Supply iframe state to backend (#6278) * Add iframe detection * Remove forgotten .only Co-authored-by: Victor * Bid Viewability Module (#6206) * introducing a new event, bidViewable * new module: bidViewability * details in bidViewability.md * disable webdriver tests in trionBidAdapter spec (#6280) * [ParrableIdSystem] Supply Prebid library version to backend (#6279) * Add prebid version to data object * Renamed prebid to prebidVersion * Fix missing coma Co-authored-by: Victor * [ParrableIdSystem] Accept list of partners as an array or string (#6277) * Accept partners as an array and fallthrough partner if no partners * Ensure that Parrable data object decodes with urlsafe base64 in tests * Fixed tests caused by typo in config property * Fix failing test due to accessing unexisting property 'partner' Co-authored-by: Victor * Rubicon Bid Adapter FPD Update (#6122) * Update to consolidate applying FPD to both banner and video requests. FPD will be merged using global defined FPD, ad unit FPD, and rubicon bidder param FPD. Validation logic with warning logs added * Refectored last push to: 1) Correct keywords bug 2) Revise error which looked for FPD in (user/context).ext.data as opposed to (user/context).data 3) General code cleanup * Consolidated other FPD data logic into new function * 1. Update to move pbadslot and adserver data into imp[] as opposed to parent. 2. Update to convert keywords passed through RP params to string if array found * Removed unnecessary conditional * Changed conditional to check for undefined type * Update to consolidate several lines of duplicate code into one location * ID5 User Id Module: update a/b testing to be user based not request based (#6281) * convert A/B testing to be user-based, rather than request-based * update docs to say a/b testing is user based, not request based * Shared ID gdpr support (#6275) * SharedId gdpr support * Reverted commented locally failing tests * Lemma:set mediaType key value (#6006) * lemmaBidAdapter.js Added lemma bid adapter file * lemmaBidAdapter.md Added lemma bid adapter md file * lemmaBidAdapter_spec.js Added lemma bid adapter test spec file * Update lemmaBidAdapter.js Fixed automated code review alert comparison between inconvertible types * Update lemmaBidAdapter.js Fixed review changes * Update lemmaBidAdapter.md Correct parameter value. * Update lemmaBidAdapter.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter_spec.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.md Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.js Added user sync support into bid adapter. * updated include modules file extension. updated include modules js file extension. * Update lemmaBidAdapter_spec.js Added unit test for user sync feature. * Update lemmaBidAdapter.js Fixed format error. * Update lemmaBidAdapter_spec.js Fixed format error and typo error. * Set mediaType key value into bid object Set mediaType key value into the bid object. * Update lemmaBidAdapter.js remove duplicate function * Update lemmaBidAdapter.js Remove non supported code. * Update lemmaBidAdapter_spec.js Remove GDPR test cases. * added support for addtlConsent (#6005) Co-authored-by: Ix-Prebid-Support * Add bid adapter for Missena (#6247) * adds support for getFloor of video mediaTypes * adds test for calling getFloor with correct mediaType * checks that _getFloor converts string floors to float * Add bid adapter for Missena * Use publisher demo token in tests * Add Missena global vendor ID to spec * Use apiKey in the current bidRequest * Add referer info to payload Co-authored-by: Nick Llerandi Co-authored-by: Brandon Ling <51931757+blingster7@users.noreply.github.com> Co-authored-by: Brandon Ling * Gulp test file example added in readme (#6287) * Sharethrough: Add support for ID5, Shared ID, and Live Intent ID (#6261) * Update prebid adapter universal ids to include ID5, SharedID, and LiveIntent ID. [#176447070](https://www.pivotaltracker.com/story/show/176447070) Co-authored-by: Mathieu Pheulpin * Addressing review [#176447070] * Quick rewrite [#176447070] * Address ID5 review, forward linkType to adserver * Reformatting SharedID to align with ID5 Co-authored-by: Mathieu Pheulpin * SmartAdServer Bid Adapter: image sync and noAd (#6236) * SIM-889 Now we have image based sync * SIM-889 Added test to check noad and image sync * SIM-889 Fixing indenting issues * Add client Alias Adkernel (#6291) Adding "bcm" alias to Adkernel adapter * [ParrableIdSystem] Add GVLID and handle TC Consent data (#6283) * Added GDPR support * Remove forgotten .only Co-authored-by: Victor * 4.26.0 release * 4.27.0-pre * Updated data mapping of winning bid and auction logs in pubxai analytics adapter (#6285) Co-authored-by: Phaneendra Hegde * Grid Bid Adapter: Added video protocols to the ad request (#6299) * Rubicon Bid Adapter: updated transactionId to auctionId for OpenRTB (#6298) * Fix for Issue 6117: Added Module Name in Build to Comments (#6297) * map tripleliftBidAdapter.js tl_source to bid.meta.mediaType (#6303) * Tappx Bid Adapter: new bidder adapter added (#6233) * ADD: tappx bid adapter * FIX: replace .includes by .indexOf * UPDATE: Expand the test coverage * FIX: format spacing tests * FIX: get auctionId from validBidRequests * UPDATE: add bannerMediaType tablet sizes * FIX: get timeout from bidderRequest.timeout * UPDATE: replace the way to get the hostname * UPDATE: adding support multiple bid requests in a single call * UPDATE: remove hardcoded test payload param Co-authored-by: marc_tappx * Add Native ad capability to AdYouLike adapter (#6198) * Remove useless bidderCode in bid response * send all the available sizes in the bid request * Use the banner sizes if given * avoid compatibility issue with old bid format * ad iframe and publisher domain paramters to bid requests * add publisher domain info in ad request * add a check in unit tests for publisherDomain * encode uri components * add native assets support * add native information to ad request * fix native ad parsing * fix nativ condition to set mediatype * fix image access and add trackers * fix and add unit test on native ad * update md file * remove usage of URLSearchParams * allox pure native ad with no adm provided Co-authored-by: Guillaume * Update targeting.js to fix TTL buffer arithmetic (#6300) * Permutive RTD submodule (#6290) * Add Permutive RTD module * set demo data in LS for test page * fix linter issues * reduce timeout on example page * decrease sample timeouts * rename targeting to segments * Adtelligent Bid Adapter: Add Navelix as alias (#6306) * Navelix bidder * gvlID * Pubmatic add warning for non-string adSlots (#6304) * add warning for non-string adSlots - and update the markdown file to say they should be strings * be more specific in explanatory comment * Update ttl outstream (#6253) * adding DMX test @97%, two files added one updated * Update districtm_spec.js * Update districtmDMX.js * adding all districtm needed file * remove legacy file * remove typo || 0 in the test method * force default to return a valid width and height * update unit test code for failing test * changed class for an object * remove package-lock.json * change file name for dmx adapter * renamed files * restaure package-lock.json * update to last package-lock state * update gdpr user consent * fix sizes issue * Documentation updates Adding the readme.md info * update file name and update unit testing import file location * current machine state * lint correction * remove variable assigment duplicate * adding CCPA support for DMX * adding test for ccpa and gdpr * districtm dmx adding deal id field * idsync support ccpa & gdpr * merge forked * stop mediatype changing ttl * remove lint error * adding gvlid for dmx * removing change Removing change from on commit PR file package-lock.json * update file Removing comments on DMX adapter * Revert "removing change" This reverts commit e4bbbe55 * adding aliases base on ticket #6294 * update file Removing comments on DMX adapter * fix error for issue #6294 * file removal from PR Co-authored-by: Steve Alliance Co-authored-by: Luis Co-authored-by: Steve Alliance Co-authored-by: Steve Alliance Co-authored-by: steve-a-districtm Co-authored-by: Steve Alliance * [ParrableIdSystem] Accept lowercase timezone names in timezone filter (#6282) * Add lower case comparison for allowedZones * Lowercase blocked zones also * Fixed timezone lowercase tests * Handle IE missing timeZone field * Improve lowercase timezone comparison Co-authored-by: Victor * Added new size - Id 550 (980x480) (#6311) * Revert "Rubicon Bid Adapter: updated transactionId to auctionId for OpenRTB (#6298)" (#6314) This reverts commit f672209110ef30b9cdf96048d4e8285d43716b4a. * Rubicon: adding size 300x200 (#6315) * added prebid version support to ixdiag (#6292) * Extended ID permissions supported by bidder (#6276) * User id bidder permission scheme * styling * prebidServer support * - * fix * prebidServerBidAdapter take eidPermissions directly from userId module * - * unit tests * - * - * update * - * - * changed pbjs_bidders to pbjsBidders * changed pbjsBidders to bidders ext.prebid.data.eidPermissions to ext.prebid.data.eidpermissions * rerun circleci * rerun circleci * omitting eidPermission entry if 'bidders' is not configured * fixed 'calling the PBS adapter without any defined userId modules causes an exception' * proposal * rerun circleci * utils implementation * comment * revert import validation Co-authored-by: myerkovich Co-authored-by: Marko Yerkovich Co-authored-by: Marko Yerkovich * new bid adapter: Logain (#6312) Co-authored-by: Aiholkin * Change URL in Tapad Id Submodule (#6318) * IndexExchange Bid Adapter: Added support for netID, ID+ and FabrickId userId (#6286) * added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap * removed liveintent and adsrvr.org [DNA-5040] * updated neustar id * fixed fabrickid * frabrickId instead of id * added more userID partner support for IX adapter - NetID, Neustar, Zeotap (#1) * added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap * added tests * added tests for new userinfo modules * missed a few checks * Dna 5040 ix userid support (#2) * added more userID partner support for IX adapter - TDID, LI, NetID, Neustar, Zeotap * removed liveintent and adsrvr.org [DNA-5040] * updated neustar id * fixed fabrickid * frabrickId instead of id * added tests * added tests for new userinfo modules * missed a few checks Co-authored-by: Ran Li * added few missing checks in IX adapter * Use userIdAsEids instead of userId (#3) * use eids, revert package-lock * test update Co-authored-by: Ran Li Co-authored-by: amykwyang * Prebid 4.27.0 Release * increment pre version * mediasquare fix userId (#6321) * Change the EU consent string parameter name to the company-wide standard (#6320) * adding support in pbsAdapter for getFloor (#6273) * AdHash Bidder Adapter: initial prebid.js integration (#6274) * PBJS Video Cache Update (#6295) * Support bidder aliasing by not using bid.bidder to retrieve configs (which are static anyway) (#6313) * Fabrick ID System : updates to _setReferrer and appending urls (#6322) * fabrickId updates - encode all url params - dedupe w/out queryString and keep the longest - additionally truncate from % if that ends up being the last (or next to last) char after truncation - truncate 1k instead of 200 - don't send functions along in query (only send strings and numbers) * attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 * re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 * re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 * re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 * re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 * re-attempting to fix ie failure - https://app.circleci.com/pipelines/github/prebid/Prebid.js/3945/workflows/4929a5c0-9e57-49e3-a6d8-29691560ca31/jobs/12086 - attempting to add debugging so I can know what exactly is failing in ie (since I don't have a windows machine) * found the issue having debugged locally - stubbing my error message is what killed me! * not the right way to loop through a map Co-authored-by: Anderson, Ben * Configureable option to delay auction event + fix bug with googletag init (#6344) * Adhese Bid Adapter: replace id5 with eid (#6339) * FID-287: Update Reconciliation RTD delivery id format (#6343) * Inskin Bid Adapter: send screen size in the ad call (#6316) * Ozone Bid Adapter: added or updated support for multiple modules (#6324) * ozone 2.5.0 adapter updates * ozone 2.5.0 adapter - fixup for prebidCircleCI tests to remove object values on user.eid Co-authored-by: Afsheen Bigdeli * Triplelift Bid Adapter: add PubCommon ID support (#6352) * Prebid 4.28.0 Release * Increment pre version * GMOSSP Bid Adapter : add refererInfo from bidderRequest (#6319) * Axonix Bid Adapter: add new bid adapter (#6341) * Add Axonix bid adapter * Fixed tests * Documentation: Prebid Server and Postbid integration example ( ad server-less ) (#6348) * Native: add custom data assets capability (#6220) Use `mediaTypes.native.ext: {}` special object to add/allow custom data. assets. * iPROM adapter upload - adapter (#6334) Co-authored-by: Gašper Žagar * Ucfunnel Bid Adapter: update currency parameter in ad response (#6357) * TheMediaGrid Bid Adapter: fix trouble with alias using (#6363) * Rubicon Analytics Adapter: pass along advertiserDomains (#6356) * Pass along advertiser domains! * only send up to 10 adomains * support setting coopSync in s2sConfig (#6330) * TrustX Bid Adapter: Fix alias error (#6373) * Adform Bid Adapter: add global targeting to the request query as parameter (#6376) Co-authored-by: Justas * Prebid 4.29.0 Release * Increment pre version * Gamoshi Bid Adapter: update adaptor aliases (#6355) * Marsmedia Bid Adapter: add support for viewability, floor price module, COPPA & CCPA (#6337) * Change publisherId to zoneId Add gdpr Add supply chain Add video media type * Remove comments * Fix unit test coverage * fix request id bug add vastXml to video response * Remove bid response default sizes * Change endpoint url * Add unit test for vastXml * Change end point * Remove trailing-space * Add onBidWon function * New adapter - videofy * Marsmedia & Videofy - Add onTimeout onSetTargeting * Create sendbeacon function * - add viewability * remove unnecessary utils.getWindowTop() * fix bidderRequest matching for finding a renderer (#6359) * Seedtag Bid Adapter: add support for inArticle placement (#6369) * Fix: check mandatory video params * Simplifying mediaType video existence check * SQDTAR-42: onWonBid event (#2) * Adding onBidWon handler. * Adding nurl to bid. * Adding nurl field to bid. * Adding inArticle placement type to seedtag adapter. (#1) Co-authored-by: Carlos Barreiro Mata * improve robustness on OnEvent fields (#6384) * oneVideo Bid Adapter: remove adapter adId because of conflict with pbjs core (#6382) * updated object,str,num validations using pbjs utils * validation if statements for content object * validation if statements for content object * updated contetn object validations using utils * refractoring clean if statement * fixing typos * added todos * added category string & data object validations * fixed esling ENDPOINT issue * updated content obj unit tests * fixed cat & data validation * fixed producer as object * revert .includes() to .indexof() for IE * reduced content obj params accoriding to ad-server support * fixed typeOf typo * fixed episode to Number * gitignore * restore gitignore * removed unsupported params from md file * reverted package & pagkage-lock * fixed incorrect episdoe from str to num * removed bid.adid setting from L97 * removed bid.adId setting * updated adId test * updated version to 3.0.6 * PBS Bid Adapter: add dchain (demand chain object) to prebid server adapter (#6383) * Update prebidServerBidAdapter_spec.js * Update index.js * Gulp Build: fix to populate modules list when gulp bundle is executed (#6331) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * need to update modules list when gulp bundle is called * added a comment * Smartx Bid Adapter: updated out-stream render to support smartPlay 5.2 (#6370) * Add smartclipBidAdapter * smartxBidAdapter.js - removed unused variables, removed debug, added window before the outstream related functions * - made outstream player configurable * remove wrong named files * camelcase * fix * Out-Stream render update to SmartPlay 5.2 * ESlint fix * ESlint fix * ESlint fix * adjust tests, fixes * ESlint Co-authored-by: smartclip AdTechnology Co-authored-by: Gino Cirlini * Fpd 2.0 Update (#6293) * Update to consolidate applying FPD to both banner and video requests. FPD will be merged using global defined FPD, ad unit FPD, and rubicon bidder param FPD. Validation logic with warning logs added * Refectored last push to: 1) Correct keywords bug 2) Revise error which looked for FPD in (user/context).ext.data as opposed to (user/context).data 3) General code cleanup * Consolidated other FPD data logic into new function * 1. Update to move pbadslot and adserver data into imp[] as opposed to parent. 2. Update to convert keywords passed through RP params to string if array found * Removed unnecessary conditional * Changed conditional to check for undefined type * FPD 2.0 Update 1) The setConfig and setBidderConfig functions support a transition period where they map the original 'fpd' config: - fpd.context.ATTR --> ortb2.site.ATTR - fpd.context.data.ATTR --> ortb2.site.ext.data - fpd.user.ATTR --> ortb2.user.ATTR - fpd.user.data.ATTR --> ortb2.user.ext.data 2) gptPreAuction: a) move adunit.fpd to adunit.ortb2 b) adUnit.ortb2Imp.ext.data.adserver.{name, adSlot} c) pbAdSlot moves to AdUnit.ortb2Imp.ext.data.pbAdSlot 3) pbsBidAdapter a) merge the new ortb2 and AdUnit.ortb2Imp.ext objects into the OpenRTB JSON. b) therefore imp[].ext.context.data.pbadslot is now changed to imp[].ext.data.pbadslot (no context) c) read adUnit.ortb2Imp.ext.data.adserver from the new location. Output location is moved to imp[].ext.data.adserver (no context) * FPD 2.0 Update Update to adrelevantis adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to amx adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to avocet adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to criteo adapter to look at config.ortb2 instead of config.fpd * Update to correct imp fpd structure * Update to s2s adapter to coincide with imp fpd alteration * Update to consolidate several lines of duplicate code into one location * Slight modification for ortb2Imp to use ortb2Imp.ext as opposed to ortb2Imp.ext.data * FPD 2.0 Update Update to grid adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to inmar adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to luponmedia adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to smaato adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to triplelift adapter to look at config.ortb2 instead of config.fpd * Update to gptPreAuction to move over to imp level ortb2 * FPD 2.0 Update Update to triplelift adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update * FPD 2.0 Update Update to jwplayerRtd adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to admixer adapter to look at config.ortb2 instead of config.fpd * FPD 2.0 Update Update to rubicon adapter to look at config.ortb2 instead of config.fpd * Update to fix keyword bug * Added backwards compatibility functions for FPD both global/bidder and adunit level data * Update to utilize new backward functionality for fpd 2.0 * Removed extra new line * Update to include new backward functionality for FPD 2.0 data * Update to utilize new backward functionality to pass FPD 2.0 data * Update to utilize backward functionality to pass FPD 2.0 data * Update to utilize backward functionality to pass FPD 2.0 data * Update to utilize backward functionality to pass FPD 2.0 data * Update to utilize backward functionality to pass FPD 2.0 data * Update to utilize backward functionality to pass FPD 2.0 data * Fixed typo in fpd config object location * Uodate to utilize backward functionality to pass FPD 2.0 data * Update to change all ortb2Imp.ext.data.adserver.adSlot references to ortb2Imp.ext.data.adserver.adslot - all lowercase. Corresponding adapter and unit tests to adhere to these changes * Fixed typo * Fixed typo * FPD 2.0 update to rubicon adapter to pass iab values * Updates: 1) Change function name 2) addAdUnits always pass array 3) Remove unecessary comment 4) Bug fix for ortb2.user.data to be filtered on legacy fpd conversion * PBS Bid Adapter: fix s2s alias collision with built-in adapter aliasing (#6379) * fixed overwriting of aliases for s2s * made change * added fix * Clean side-effect when checking that local storage is enabled (#6323) * updates docs and demo for fpd changes (#6302) Co-authored-by: karimJWP * Changed net revenue to True (#6387) * adagioBidAdapter: add Native support (#6368) * EIDS Support Update (#6394) * TheMediaGridNM Bid Adapter: fix trouble with alias (#6371) * Added TheMediaGridNM Bid Adapter * Updated required params for TheMediaGridNM Bid Adapter * Update TheMediGridNM Bid Adapter * Fix tests for TheMediaGridNM Bid Adapter * Fixes after review for TheMediaGridNM Bid Adapter * Add support of multi-format in TheMediaGrid Bid Adapter * Update sync url for grid and gridNM Bid Adapters * TheMediaGrid Bid Adapter: added keywords adUnit parameter * Update TheMediaGrid Bid Adapter to support keywords from config * Implement new request format for TheMediaGrid Bid Adapter * Fix jwpseg params for TheMediaGrid Bid Adapter * Update unit tests for The Media Grid Bid Adapter * Fix typo in TheMediaGrid Bid Adapter * Added test for jwTargeting in TheMediaGrid Bid Adapter * The new request format was made by default in TheMediaGrid Bid Adapter * Update userId format in ad request for TheMediaGrid Bid Adapter * Added bidFloor parameter for TheMediaGrid Bid Adapter * Fix for review TheMediaGrid Bid Adapter * Support floorModule in TheMediaGrid Bid Adapter * Fix empty bidfloor for TheMediaGrid Bid Adapter * Some change to restart autotests * Fix userIds format for TheMediaGrid Bid Adapter * Remove digitrust userId from TheMediaGrid Bid Adapter * Protocols was added in video section in ad request for TheMediaGrid Bid Adapter * TheMediaGrid: fix trouble with alias using * TheMediaGridNM: fix trouble with alias * Grab sourceAgnostic IDs first, then fallback to regular IDs (#6400) * Permutive - add AC support for TrustX (#6393) * SmartRTB Bid Adapter: add alias and update valid opts (#6365) * Add alias, update valid opts * Update bidder tests * Prebid 4.30.0 Release * Increment pre version * Sonobi Bid Adapter: send eids in bid request. (#6364) * unwrapping id5id uid. Added new eid param for user id modules * set userid to new variable * fixed spelling mistake in unit test Co-authored-by: Scott Menzer * copying userid object so the referenced object does not get updated. * using deepClone instead of spreading the top userId object Co-authored-by: Scott Menzer * Apacdex Bid Adapter: userId module support, show demo ads in debug mode & other maintenance (#6378) * Upgrade and maintenance apacdexBidAdapter * fix error and add unit test * Novatiq ID System: add snowflake userId submodule (#6350) * Novatiq snowflake userId submodule Novatiq snowflake userId submodule initial release * change request updates added novatiq info /modules/userId/userId.md added novatiq info /modules/userId/eids.md added novatiq eids /modules/userId/eids.js added novatiq module in /modules/.submodules.json removed unnecessary value from getId response * Update novatiqIdSystem_spec.js removed unnecessary srcid value * Update novatiqIdSystem.md Novatiq ID System: updated novatiq snowflake ID description * Rise Bid Adapter: add session_id & is_wrapper params to adapter (#6407) * add new params to rise adapter * add unit tests for isWrapper and sessionId adapter params * IronSource Bid Adapter: add session_id & is_wrapper params to adapter (#6408) * add new params * add unit tests for isWrapper and sessionId adapter params * AMX Bid Adapter: add or update general adapter support and code refactoring (#6403) * AMX Bid adapter improvements * fix eslint issues (breaking CI) * VOX Bid adapter, Hybrid Bid adapter: fix global var name to avoid conflicts with astraOne adapter. (#6416) Co-authored-by: Petrov Denis * LiveIntent Id System: fix for parsing response twice (#6418) * Don't parse response twice in LiveIntent Id submodule * Update the liveintent module test to have the 204 response * PBJS Core: use mediaType renderer when backupOnly and no bid.renderer (#6419) * use mediaType renderer when backupOnly and no bid.renderer * check if necessary renderer properties are defined * GumGum Bid Adapter: pass bidfloor currency in bidrequest (#6391) * adds support for zone and pubId params * adds support for iriscat field * sets mediatype depending on product id * Update doc for mediaType needed for video products * makes slot and invideo products avail for pubId * updates gumgum doc * lint * adds missing comma in gumgum doc * adds currency in ad request, adds unit test * readd the previous irisid changes * remove the only in testing * Documentation: fixed a typo and sentence structure (#6421) * Bid Glass Bid Adapter: pass options in bid request (#6424) * Added bidglass adapter + test * PR Review Updates: - Added formal params to getUserSyncs function definition - getUserSyncs now always returns an array - Improved unit test coverage * PR Review Updates: - Removed unused methods: getUserSyncs, onTimeout, onBidWon, onSetTargeting - Removed getUserSyncs unit test - Removed "dead code" - Removed some unnecessary comments - Fixed usage of parseInt * Bid Glass Bid Adapter: pass options in bid request * Spotx Bid Adapter: add publisher support for cache.ignoreBidderCacheKey (#6413) * Support ignoreBidderCacheKey in spotxBidAdapter * Update spotxBidAdapter_spec.js * Update spotxBidAdapter_spec.js Co-authored-by: Nick Peceniak * update prebid adapter. Add at, ccpa, gdpr and coppa support (#6405) * Qwarry Bid Adapter: add referer detection (#6412) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev * Smartyads Bid Adapter: add coppa field from config (#6402) * update adapter. Add coppa field from config * move stubs and restores for coppa tests * PBS Bid Adapter: Fpd2.0 bug fix for first party data issue (#6428) * Bug fix for PBS data from FPD2.0 update: Merging request.site and request.user with site and user object in FPD. * Prebid 4.31.0 Release * Increment pre version * a4g Bid Adapter: delete adid and use crid if it exists (#6409) * Deleted adid * set crid if it's exist and added unit tests * Mediawallah ID System: add openlink userId submodule (#5921) * My first commit * Removed unnecessary await operation * Bug fixes and compliance fixes * Fixing some formatting and naming * Updating code based on automated feedback. * Parking refactoring change for team review * update mwOpenLink module * remove .git 2 folder * Trying to force a change * update the PR comments * applying the changes * update submodules.json and userId.md * fix typo of module names * update module decode function and test code * update test codes * apply the suggestions from Prebid * fix count of modules. Co-authored-by: Eric Brown Co-authored-by: hanna Co-authored-by: hannapanova190119 <71532550+hannapanova190119@users.noreply.github.com> * Documentation: Adjust desired bitrate examples smartx adapter (#6438) * Remove adId (autogenerated by Prebid) (#6441) * RichAudience Bid Adapter: add render video in banner (#6392) * Integration Example: ID import library example (#6434) * ID Import Library example * Fixing review comments Co-authored-by: skocheri * Mass Module: add module to support MASS protocol (#6332) * Initial implementation for the MASS module * Updated namespace and CDN location * Updated the data object passed to MASS bootloader * Fix linting issues * Added unit tests * Added a README for the MASS module. * Allow MASS be disabled via Prebid configuration * Only check deal ID for matching MASS bids * Updated docs * Update how we test for MASS bids * Thighten the test for MASS bids * Fix linting issues * Change deal ID prefix and add option to specify the bootloader location. Updates to docs. * Updated tests with the new META_MASS deal ID prefix * Update comment in modules/mass.js Co-authored-by: Scott Menzer * Additional information about the module * More specific description of external resource * Identify MASS bids by looking for a 'mass' flag in bid meta or testing deal IDs against a publisher defined pattern * Updated MASS module tests * Bug fixing, added integration example and increased test coverage * Fix integration example and add notice * Updated example page * Updated bootloaderUrl param name to renderUrl and removed its default value. Must be specfied in module config now. * Updated integration example for MASS * Update mass.md Updated disclaimer and synced with docs Co-authored-by: Scott Menzer Co-authored-by: massadmin <58946787+massadmin@users.noreply.github.com> * Axonix bid adapter: set both connectiontype & effectivetype in the request (#6439) * Set both connectiontype and effectivetype in the request object * Version bump * Fixes for undefined var * Sublime Bid Adapter: v0.7.1 & add extra information in tracking pixels (#6442) * add prebid version of adapter * Feature/update sublime adapter (#21) * Update sublimeBidAdapter to 0.5.1 * Add tests for private functions * Remove window.sublime * Update pixel name for bid event * Remove pixels on non-event and add onBidWon (#22) * add prebid version of adapter * Feature/update sublime adapter (#21) * Update sublimeBidAdapter to 0.5.1 * Add tests for private functions * Remove window.sublime * Update pixel name for bid event * Remove pixels on non-event and add onBidWon * Incremente version of sublimeBidAdapter * Renamed pixel for timeout and introduce gvlid * Remove unnecessary params for sendEvent Co-Authored-By: fgcloutier Co-authored-by: Gaby Co-authored-by: fgcloutier * Remove trailing-space * Fix version in tests * sublimeAdapter: Improve pixels data * sublimeAdapter: Update tests * sublimeAdapter: Rename data Co-authored-by: Gaby Co-authored-by: Léo <51166933+SublimeLeo@users.noreply.github.com> Co-authored-by: fgcloutier Co-authored-by: Léo GRAND * Interactive Offers Bid Adapter: add new bid adapter (#6399) * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * Interactive Offers bid adapter * manually kicking off tests Co-authored-by: Chris Huie * AdYouLike Bid Adapter: replace shorthand "image" native config (#6401) * replace shrorthand "image" native type * merge publisher native config with image type config * add unit tests on native image config type * AMX Bid Adapter: Video Bugfix (#6435) * LiveWrapper Bid Adapter: use userIdAsEids to handle all user ids (#6445) * Livewrapped bid and analytics adapter * Fixed some tests for browser compatibility * Fixed some tests for browser compatibility * Changed analytics adapter code name * Fix double quote in debug message * modified how gdpr is being passed * Added support for Publisher Common ID Module * Corrections for ttr in analytics * ANalytics updates * Auction start time stamp changed * Detect recovered ad blocked requests Make it possible to pass dynamic parameters to adapter * Collect info on ad units receiving any valid bid * Support for ID5 Pass metadata from adapter * Typo in test + eids on wrong level * Fix for Prebid 3.0 * Fix get referer * http -> https in tests * Native support * Read sizes from mediatype.banner * Revert accidental commit * Support native data collection + minor refactorings * Set analytics endpoint * Support for app parameters * Fix issue where adunits with bids were not counted on reload * Send debug info from adapter to external debugger * SChain support * Send GDPR data in analytics request * video support Video support * Report back floor via analytic * Send auction id and adunit/bidder connection id * Criteo id support * Updated example * livewrapped Analytics Adapter info file * Livewrapped gvlid * Handle all User Ids * kick off tests manually Co-authored-by: Chris Huie * Invibes: Read legitimate interests; pubCommonId & pubProvidedId integration (#6420) * Update dfpAdServerVideo.js * revert accidental commit * AdTrue Bid Adapter: getUserSyncs logic update (#6338) * add AdTrue bid adapter * add AdTrue Bid Adapter unit tests * add AdTrue Bid Adapter unit tests * add AdTrue bid adapter * add AdTrue Bid Adapter unit tests * add AdTrue Bid Adapter unit tests * add AdTrue bid adapter * adtrue usersync udpate * adtrue usersync udpate * #adtrue bidder usersync udpate * #Refactoring code & add unit test * Update package.json * Update package-lock.json * 1. Merge branch 'master' of https://github.com/prebid/Prebid.js 2.AdTrue Bid Adapter Refactoring code * 1. Merge branch 'master' of https://github.com/prebid/Prebid.js 2.AdTrue Bid Adapter Refactoring code * removing a package-lock.json from PR * - removing a package-lock.json from PR - AdTrue bidder: refactoring code & add unit test * - removing a package-lock.json from PR - AdTrue bidder: refactoring code & add unit test * - removing a package-lock.json from PR - AdTrue bidder: refactoring code & add unit test * update package-lock.json from upstream * IX Bid Adapter: add priceFloors support and an integration example (#6390) * Adding priceFloors Support to IX bid adapter and some refactoring * refactoring the getfloor logic, and removing dead code * newline at end of integration example * spacing issues lint fix * try catch around getFloor, in case the priceFloors module throws an exception * minor rename allU -> allu * falsey values fix, log prefix added * PBS adapter: remove condition on gdpr consentstring which isnt required by the tcf2 spec when gdprapplies is false (#6429) * Update index.js * Update prebidServerBidAdapter_spec.js * Update prebidServerBidAdapter_spec.js * Update prebidServerBidAdapter_spec.js * if the stored value was an object, then it could end up with a space before the {, causing the stored value not to be json parsed simply because of a space in the first character (#6467) * Kargo Bid Adapter: add gdpr support (#6447) * Bid Glass Adapter: Merge externally set targeting params (#6426) * Added bidglass adapter + test * PR Review Updates: - Added formal params to getUserSyncs function definition - getUserSyncs now always returns an array - Improved unit test coverage * PR Review Updates: - Removed unused methods: getUserSyncs, onTimeout, onBidWon, onSetTargeting - Removed getUserSyncs unit test - Removed "dead code" - Removed some unnecessary comments - Fixed usage of parseInt * Bid Glass Bid Adapter: pass options in bid request * Merge externally set targeting params * Updates to address gulp errors * Get `bidglass` reference from window * Optimon Analytics Adapter: add new analytics adapter (#6333) * Publish the Optimon platform's analytics adapter for prebid Added js and md files for the analytics adapter. * Fix wrong content in MD file * Fix wrong content in MD file * Created unit testing to Optimon Analytics Adapter * Created unit testing to Optimon Analytics Adapter * Created unit testing to Optimon Analytics Adapter * Created unit testing to Optimon Analytics Adapter * Fixes ESlint styling * Removing DEF const * Created unit testing to Optimon Analytics Adapter * Created unit testing to Optimon Analytics Adapter * 4.32.0 release * 4.33.0-pre * UID 2.0 Userid submodule (#6443) * UID 2.0 User id submodule * UID 2.0 User id submodule * UID 2.0 User id submodule * UID 2.0 User id submodule * Resolving merge conflicts and review comments * Updating documentation * Renaming module * Fixing review comments * Fixing review comments * Fixing review comments * Fixing review comments * Fixing review comments * Updating source uid2.com to uidapi.com Co-authored-by: skocheri * H12media Bid Adapter: added new optional params, fixes, and various integration support (#6436) * Change module H12 Media * Change module H12 Media * Change module H12 Media * Change module H12 Media * Update module H12 Media * Update module H12 Media * Update module H12 Media * Update module H12 Media * Update module H12 Media * Update module H12 Media * AdYouLike Bid Adapter: add video capabilities (#6398) * read and send getFloor value * improve robustness on OnEvent fields * add video mediatype to adyoulike adapter * improve robustness on OnEvent fields * handle instream cases * minor format fix * move the atob call to apply it on every Vast response * update adyoulike md file with video type * update adyoulike bidder doc * fix merge error on 'bid' var name * update adyoulike bidder doc * remove deprecated creative rendering example * Update Recommendation to install with 'npm ci' (#5697) With the recent upgrade of npm we should be using the 'npm ci' option install packages. This provides a more reliable deployment that does not update packages on install. It will reduce check-ins of improper package-lock.json and provide greater assurance that a stable node_modules is deployed. * Openx Bid Adapter: add floor support for Video (#6460) * fix confusing comment * refactor(openxBidAdapter): extract enrichQueryWithFloors * PBID-1194: add floor for Video * Update to rubicon analytics adapter to pass along pbsBidId if present on the bidObject (#6461) * differentiate the IDs provided by ID5 when the user is opted out vs the user is in the control group of A/B testing (#6471) * AdagioBidAdapter: add capability to pass ext-data from localStorage in bidRequest (#6415) * Seedtag Bid Adapter: add connection type to bid request (#6457) * add connectionType to the bidRequest * remove a console.log * put connectionType in the payload * more secure connectionType access * add a unit test for connectionType * fix connectionType typo * AdDefend Bid Adapter: new bid adapter (#6450) * addefeend bid adapter implementation * fixed parameter documentation Co-authored-by: Mitschi * GumGum Bid Adapter: adds meta field to bidresponse (#6478) * adds meta field to bidresponse * adds meta mediatype and advertiserdomain default * example integration file renamed to hello_world (#6475) * Incorrect atypes on various eids (#6477) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * added support for roundel alias (#6473) * Doceree Bid Adapter: new bid adapter (#6437) * doceree adapter * add fix for impression register * fix linting issues * fix build issue * remove extra spaces * fixing - Implicit operand conversion * fixed ci/cd lint issue * update test case * support for advertiserdomains and updated test case * remove space to rerun test cases * remove the client side creative creation * OpenX Bidder Adapter: Add user ID sub-modules (#6490) * Smaato: FPD Revision (#6459) Co-authored-by: Bernhard Pickenbrock * Conversant adapter: add adomain, remove digitrust (#6495) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Update conversantBidAdapter.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Rads Bid Adapter: add GDPR support & user sync support (#6455) * Proxistore Bid Adapter: add cookieless url endpoint & use floor module (#6427) * use floor module * call cookieless endpoint when necessary * test endpoint url * change url endpoint * delete console log * fix tests * add language to url * use ortb interface * unit test * update test unit * create proxistore module * add unit tests and documentation * delete modules * delete module * add proxistore rtd submodule * delete proxistore module * spacing * change url * AdYoulike Bid Adapter: Add an "Insertion" tracking for Native mediatype (#6481) * add insertion event * add missing campaign ID parameter * update unit test with new tracking checked * Dspx Bid Adapter : add user sync support (#6456) * Add sync support for dspx adapter * Dspx Bid Adapter : add user sync support Co-authored-by: Alexander * Multibid Module: add new module to handle multiple bids from single bidder & update rubicon adapter (#6404) * Multibid module - create new module - Expands the number of key value pairs going to the ad server in the normal Prebid way by establishing the concept of a "dynamic alias" First commit * Continued updates from 1st commit * Adding logWarn for filtered bids * Update to include passing multibid configuration to PBS requests * Update to rubicon bid adapter to pass query param rp_maxbids value taken from bidderRequest.bidLimit * Update to config to look for camelcase property names according to spec. These convert to all lowercase when passed to PBS endpoint * Adjust RP adapter to always include maxbids value - default is 1 * Added support for bidders array in multibid config * Fixed floor comparison to be <= bid cpm as oppossed to just < bid cpm. Updated md file to fix camelCase tpyo * Update to include originalBidderRequest in video call to prebid cache * Update to ignore adpod bids from multibid and allow them to return as normal bids * Adding uid2 to submodules.json (#6508) * NextRoll ID System: add new ID module (#6396) * Add Nextroll ID Module * Add nextroll to eids * Make configuration value names consistent with Adapter Module * Use parnerId instead of sellerId * Add nextroll to userId and eids md files * Remove storage configuration * Rename nextroll -> nextrollId * Add nextrollId to common ID specs * Qwarry Bid Adapter: add GDPR and consent string handling (#6489) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests * GDPR consent string support * NPE fix Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> * Zemanta Bid Adapter: add support for new params & consent strings to usersync URL (#6468) * add gvl id to spec * add support for bcat and badv params * add consent strings to usersync url * add bcat and badv params to doc * Automatad Bid Adapter: Add meta.advertiserDomains to bid response (#6509) * added bid meta with advertiserDomains * Adhese Bid Adapter: add support for caching video content (#6501) * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * Adhese Bid Adapter: cache video content Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz * update apacdex unit test to disable debug mode (#6511) * Telaria: not setting adid (#6507) * Prebid 4.33.0 Release * automate-creation of modules.json file * Prebid upgarde automate- test pull request created through git api please ignore it (#455) * Support for ext object in icon * automate-creation of modules.json file * Fixed merge issue and test cases fixes * Check for valid sizes only * Unit test cases for the change * automate-creation of modules.json file * Fixed Merge issues * UOE-4404 if adslot and mediatype both contain sizes * automate-creation of modules.json file * Initial User Id Module * Updated modules.json * automate-creation of modules.json file * Server Side throttling based on condition * Condition for all partners throttled * Changed gulp task dependencies * Build Time Optimization * changed unused gulp packages * Updated Package.json * automate-creation of modules.json file * resolved conflixt * automate-creation of modules.json file * IdentityPartners * Changes for Hashed Key and parseAdSlot logic * Fix for custom module * making call secure of ow * Removed implicit customId system and added it as a separated submodule * Making server side calls secure and flag secure to 1 * Changed unifiedId from implicit to explicit * Updated The code to fix text cases * Fixed unit test cases * Took latest for all ids * Fixed the linting issue * Custom Data support and ParseInt for Id5 * Fixed custom data * Updated function call * Changed Event from Auction End to Request Bid * added secure flag * Revert "Open identity" * Revert "Revert "Open identity"" * First Party Id name updated for cookies * PubMatic Handle first Party Id * Pubmatic alias * Handle regex pattern in logger for Hybrid Implementation * Increment pre version * Somo: fix an issue where the requestId was being set to the wrong value (#4596) * Sovrn ccpa support legacy (#4623) * sovrn ccpa support * use array map/join instead of object.entries * TripleLift: CCPA legacy support (#4641) * Add CCPA query param * Simplify check for usPrivacy argument * pbsBidAdapter currency fix for legacy branch (#4642) * pbsBidAdapter currency fix for legacy branch * fixed unit tests * Prebid 2.44.1 Release * Revert "Prebid 2.44.1 Release" This reverts commit 105313b792b79002c0ada3301d154afd49adb7cd. * fix a bug when the iframe locator is not present on page (#4637) * fix a bug when the iframe locator is not present on page * clean up * Prebid 2.44.1 Release * increment pre version * Index Exchange: CCPA support (#4662) * support for us privacy (CCPA) (#4665) * Added CCPA support for legacy (#4663) * Update CCPA v3 (#4677) CCPA support V2 compatibility Sample tag update * automate-creation of modules.json file * Medianet: CCPA support added (#4656) * Ccpa legacy support for OneVideo (#4648) * outstream changes * removing global filtet * reverting page * message * adapter change * remove space * testcases * testpage * spaces for test page * renderer exist case * reverting package-lock.json * adding schain object * adding tagid * syntaxx error fix * video.html * space trailing * space * tagid * inventoryId and placement * rewarded video * added unit test case * ccpa cahnges * ccpa change * test page * test page change * test page change 2 * change the variable * handling the case if both GDPR and CCPA case * handiling both cases * test cases * legacy ccpa support * Update oneVideoBidAdapter.js * Add us privacy 2.X (#4669) * cedato adapter gdpr and usp compliance (#4686) * Fidelity Media Bid Adapter 2.44.x legacy. CCPA support. (#4652) * Fidelity Media Bid Adapter v2.44.x. CCPA support. * Fidelity Media Bid Adapter v2.44.x. CCPA support. * add dh adapter for legacy prebid 2.x (#4670) * Prebid 2.44.2 Release * automate-creation of modules.json file * Support for CCPA * Adding tracker in vast creative before cache * add adform alias adform2 * Updated First Party Module * Updated our adapter to have firstpartyid * automate-creation of modules.json file * Update key value pair for video in openwrap * Server side syncup in accordance with latest filter settings * Support for Eids in PubMaticServerBidAdapter * Fix for pubCommonId * Fix for pubmatic server bid adapter * fix for player size and considering w & h for video * automate-creation of modules.json file * Fixed test issues * automate-creation of modules.json file * fix test cases * Pull changes for dspid and seatid from prebid master * Support for buyerId * Updated location of buyid * automate-creation of modules.json file * Changes for consuming targeting from server side * Fix test cases * Updated rubiconBidAdapter for alias * adding sspId * UOE-5262 : OpenWrap: Add Secondary Ad Generation Bidder * bluebillywig outstream renderer * Fix an issue with replacing Renderer * Replaced Renderee * code review comments * automate-creation of modules.json file * added missing adatpers * updating package.json for prod dependecies * updated namespace * Fix for SSP ID * fixed test cases * took latest * ternay adapters * Update adformBidAdapter.js * automate-creation of modules.json file * updated modules.json removed audienceNetworkBidAdapter * wiid fix * Targeting Keys * dg bid adapter * automate-creation of modules.json file * fixes for dfp * removed audienceNetwork from modules.json * Fix for UOE-5694 * Fix for test cases * regex support * OpenWrap Nightly Release v21.1.0 (#417) * support for video in hybrid profiles * added newBid.mediaType for pubmaticServerBidAdapter * unit test case for video request * reverted debug flag * Changes for UOe-5712/5705 * Manually took the changes for DVC related info * Fix Typo * piid for hybrid profiles * removed fix for piid from staged_nightly * Removing OW PB Same Changes regarding device as it will be releaed in Q1 * Log SSPId in piid for pubmatic * OpenWrap Release v21.3.0 (#426) * support for video in hybrid profiles * added newBid.mediaType for pubmaticServerBidAdapter * unit test case for video request * reverted debug flag * Changes for UOe-5712/5705 * Manually took the changes for DVC related info * Fix Typo * piid for hybrid profiles * removed fix for piid from staged_nightly * sspId for pubmatic only (#418) * fix to remove redundant validation for datatype for partner value - UOE-5788 * fix for UOE-5788 * moved changes for UOE-5788 in hasRequiredParams function * consent string gets overwritten when IH is enabled * Feature/secondary alias (#425) * gps secondary bid adapter * fix alias * remove dvc since it will go with ow prebid same Co-authored-by: manisha Co-authored-by: Manasi * Staged nightly (#427) * support for video in hybrid profiles * added newBid.mediaType for pubmaticServerBidAdapter * unit test case for video request * reverted debug flag * increment pre version * Britepool user id module update (#5750) * adding britepool_pubparams dynamic variable lookup and merge into submodule params if exists * adding support for gdpr consent string in query params * adding tests for britepool_pubparams * adding doc block for consentData * adding pixel on success * - ensures id resolution pixel only fires when authoritative information is not present - adds tests for id resolution pixel * Add a new param cid to bridgewellBidAdapter (#5764) * pass a new param cid to bridgewellBidAdapter * update the markdown file for bridgewellBidAdpter * Refactor refererDetection to allow for URL discovery on AMP pages. (#4846) * Refactor refererDetection to allow for URL discovery on AMP pages. * Update import to include extension. * Intentiq id add url params (#5771) * Add new url params from config * Add intentIqIdSystem_spec.js tests class * added instream video ad support (#5766) * added adapters for gjirafa and malltv * interpretResponse fix for empty result * updated testing propertyId and placementId * added instream video ad support * Single request for multple bids * feat(sublimeBidAdapter): updating sublimeBidAdapter module (#5726) - handle new notifyId parameter; - bumping version to 0.6.0. * Add GVL ID and bidder code to CriteoId module (#5781) * Add GVL ID and bidder code to CriteoId module * Add gvlid as property to CriteoIdSubmodule Co-authored-by: Jesus Alberto Polo Garcia * Update BrightMountainMedia cookie sync URL (#5740) * Convert id5id to an object to support passing additional data points to platforms (#5756) * move id5id to an object to support passing linkType and other data in the future * update bid adapters supporting the ID5 ID to use the new object instead of a string * remove `.only` from test * Smaato: Support in-app use cases (#5765) * Added GVLID to Media.net Analytics Adapter (#5789) Co-authored-by: monis.q * Add video ad support to ablida bid adapter (#5782) * add onBidWon function, add bidder adapter version to bid requests * add support for native * use triggerPxel instead of ajax, because ajax was called 3 times with native * add gdpr consent to bid requests * update tests * add video ad support * Add adrelevantis adapter (#5735) * Update adrelevantis adapter * Update Adrelevantis Bid Adapter and Add Unit Tests Commit changes suggested by @jsnellbaker on pull request #5735 * Adnow bidder (#5738) * Add AdNow bid Adaptor * Fix problems by PR comments. * PR comments: - Use only secure endpoint. - Use adUnit mediaTypes instead of mediaType param in buildRequests. - Pass correct sizes to the endpoint for banner and native. - Fix adnowBidAdaper.md examples. - Fix and add new tests in adnowBidAdaper_spec.js * rename test * Restore package-lock.json from master * Fix sizes of bid response object for banners. * Fix adapters tests. * Improve error and documentation for publisherId (#5788) - The error message you get if you use a publisherId that is a JS numeric instead of a JS string is not super helpful if you aren't familiar with JS internals. Update the warning message to give a suggestion on a solution, and update the markdown documentation to explictly state that the ID needs to be wrapped in quotes. * SpotX bid adapter: add page parameter (#5784) * Media.net Analytics improvements (#5755) * medianetAnalyticsAdapter improvements * medianetAnalyticsAdapter improvements * review changes * fixed eslint Co-authored-by: monis.q * adagio Bid Adapter: add support for CCPA, COPPA (#5749) Co-authored-by: Clément besse * PubMatic analytics adapter: Not passing GDPR information (#5791) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * not passing GDPR data in analytics * GumGum: adds support for new field - iriscat (#5790) * adds support for zone and pubId params * adds support for iriscat field * fix a few id5 docs (#5793) * update id5 eids value and add html storage example * html5, not html * New PubProvided Id UserId Submodule (#5767) * PubProvided Module * - * formatting * formatting * Added rubiconBidAdapter support Added unit tests * formatting * formatting * formatting * formatting * commit to rerun build * type changes * type changes * type changes * Revert "type changes" This reverts commit af408b0a * Revert "type changes" This reverts commit af408b0a * formatting * formatting * formatting * formatting * formatting * Revert "type changes" This reverts commit 114005a5 * formatting * formatting * formatting * formatting * commit to rerun build * commit to rerun build * commit to rerun build * rubiconBidAdapter changes * rubiconBidAdapter changes * rubiconBidAdapter changes * trigger build * fix * fix * fix * rebuild Co-authored-by: myerkovich * standardize rubicon get config calls (#5780) * Prebid 4.10.0 Release * Increment pre version * Add Inmar bidder adapter (#5674) * Add Inmar bidder adapter * Update Inmar adapter * Small fix * Update Inmar params * Remove domain and bidFloor, add meta * Remove unused data * Fix unit tests * added detect referer (#5759) Co-authored-by: Ignat Khaylov * Qwarry bid adapter (#5662) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev * Allow selection of supported default targeting keys at configuration time. (#5763) * initial check-in: add ability to selectively allow default keys into GAM KV targeting. * add more descriptive test documentation to explain that the default targeting keys is checking against the key prefix to accomodate bid landscape. collate and remove targeting surrounding the key removal process. * cointrafficBidAdapter: added support responding in different currencies (#5800) * New adapter "Cointraffic" added * removed mobile detection * The sizes property has been updated, added supportedMediaTypes. * feat: added support responding in different currencies * change: module description * Send proper slot info in case of adUnitPath (#5810) - using `getGptSlotInfoForAdUnitCode` to get `divId` in case of `adUnitPath` - added test case for visibility via `adUnitPath` Co-authored-by: monis.q * Update to rubiconBidAdapter to include criteoId support (#5806) * appnexus bid adapter: criteo back to tpuids (#5808) * Intentiq id add validation (#5797) * Add validity check to ignore not-available response * Added tests * Added error log * remove digitrust from rubicon bid adapter (#5798) * add native preset handling and automatic price macro replacement (#5807) Co-authored-by: Maxime Lequain * fix some video request params (#5799) * expose full user id config (including storage) to user id modules (#5803) * expose full user id config (including storage) to user id modules, rather than just the params object * update docs to `SubmoduleConfig` * more doc fixes * missed one doc * Fix timeToFirstByte unit test (#5820) * Debug timeToFirstByte unit test * review * rubicon: adding pubcid support (#5824) * rubicon: adding pubcid support * adding to orderedParams * removed eids filter so all eids will be supported * fix eids test * fixed eids assertions Co-authored-by: Isaac A. Dettman * Changes for UOe-5712/5705 * Appnexus: Add omid support (#5821) * basic implementation complete * add unit tests * remove redundant field tags[].video.frameworks * new userId module - neustar's fabrick (#5802) * submitting userId module for neustar's fabrick - https://www.home.neustar/fabrick * fixing 'gulp test' errors * fixing another test issue (related to ie) * removing another (last) repeat * - expose full user id config (including storage) to user id modules (#5803 - removing TODO from test * - updates to test Co-authored-by: Anderson, Ben * Integrate option to pass clickThrough urls to renderAd method (#5796) * adding options to renderAd method * adding replaceClickThrough method to utils * implemented replaceClickThrough method in render ad to enable ssps adding url param clickthrough for publisher side counting * update to cover some validation and unit tests as requested by harpere * adding unit test for clickthrough implementation; * Add credentials and explicit options to CriteoIdSystem (#5822) Co-authored-by: Hugo Duthil * AdYouLike bidAdapter - Add information in bid request (#5828) * Remove useless bidderCode in bid response * send all the available sizes in the bid request * Use the banner sizes if given * avoid compatibility issue with old bid format * ad iframe and publisher domain paramters to bid requests * add publisher domain info in ad request * add a check in unit tests for publisherDomain * encode uri components Co-authored-by: Guillaume * 4.11.0 release * 4.12.0-pre * IDx user id submodule (#5826) * add idx user id * Update modules/idxIdSystem.js to match new SubmoduleConfig param Co-authored-by: Scott Co-authored-by: Scott * Adding Test mode for the IronSource bidder (#5831) * Change ironsource to be lower case all over code * Add test mode to the IronSource bidder * Manually took the changes for DVC related info * Adtelligent: Add new alias (#5825) * Add vuukle adapter (#5773) * add vuukle adapter * add readme * doc: add email * Handling video outstream in smartadserver adapter. (#5739) * Handling video outstream in smartadserver adapter. * Fixing the outstream example with the queue handler. Co-authored-by: tadam * add stroeerCoreBidAdapter (#5830) * add stroeerCoreBidAdapter * test correction * refactroring * add gvl id to spec Co-authored-by: Jakub Dlouhý Co-authored-by: karel koule Co-authored-by: Lukáš Havrlant * Added the ability to send multiple bids in one ad request for mediaforce bid adapter (#5834) * Added the ability to send multiple bids in one ad request for mediaforce bid adapter * Fixes after review for mediaforce bid adapter * Force refresh userId (#5819) * Added global function for refreshing user id's * Refactored submodule initialization to allow for refresh * Added submodule initialization when refreshing user id's * Refactored refresh parameter to be optional Refactored refresh user id's parameter to be optional where an empty list will result in all modules being refreshed. * Added unit tests for refresh user id's * Added single module refresh test * Test callback in refreshUserIds test * Remove zeotapIdPlus expiration on cookie in test because it caused it to intermittently fail Co-authored-by: chammon * Hybrid adapter. Added support In-Image format (#5754) * Added Hybrid.ai adapter * Is used 'find' from 'core-js/library/fn/array/find' instead Array.find * Fixed missing file extensions for imports * Typo fixed * Fixed missing file extensions for imports * Added support In-Image format * Added more test * Fixed errors of lint * Deleted debug line Co-authored-by: s.shevtsov * PubMatic Analytics: internal kgpv param support in analytics (#5849) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * not passing GDPR data in analytics * adding support for OpenWrap regex support * added unit test cases * TrueReach Bidder Adapter: Added User Sync Support (#5846) * Added Trureach Prebid Adapter * cleaned up truereach bidder adapter for release * truereach bidder adapter md file for release * [truereach] bidder adapter and md files update. bidderUrl no more configurable. * [Prebid] supporting nurl * [Prebid] changes required due to code style * [Prebid] prebid unit test * [Prebid] added advertiserDomains in response object * [Prebid] Secure Bidder Url. * Added usersync support * changes in bidder url Co-authored-by: Nitin Kumar Co-authored-by: arnav Co-authored-by: arnav * Don't parse the querystring when extracting the protocolHost (#5851) Co-authored-by: Karim El Shabrawy * Add rubicon size 548 (#5853) * Rubicon Adapter: Add multiple sizes to sizeMap * Add new size 500x1000 (ID: 548) in Rubicon Adapter Co-authored-by: Bret Gorsline * PR Review Process: Adding RTD, UserId. General modernization. (#5829) * Adding RTD, UserId. General modernization. * Update PR_REVIEW.md Co-authored-by: Scott Menzer Co-authored-by: Scott Menzer * ATS-analytics - add retry logic to not fire request for envelope every time, and cut down analytics requests to 1/10 (#5839) * ATS-analytics - add retry logic to not fire request for envelope every time, and cut down analytics requests to 1/10 * ATS-analytics - fix test naming * Add examples and tests for criteo User Id Module (#5838) Co-authored-by: Hugo Duthil * Fix size validate (#5841) * add relaido adapter * remove event listener * fixed UserSyncs and e.data * fix conflicts * updated size validate Co-authored-by: cmertv-sishigami * fix adunit.bid undefined edge case (#5827) * PubMatic Analytics: pass device platform related information (#5855) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * not passing GDPR data in analytics * adding support for OpenWrap regex support * added unit test cases * passing device platform in logger call; test cases added * Prebid 4.12.0 Release * git commit -m "Increment pre version" * add ooloAnalyticsAdapter (#5852) * oolo analytics adapter added * update md * fix startsWith undefined * adjust tests * update tests - replace .find with .filter * update .md description * Add sharedid support to pubcommon (#5850) * Add sharedid support to pubcommon * Add sharedid support to pubcommon - fix typos * Add sharedid support to pubcommon - delete sharedid cookie when opt-out * Add sharedid support to pubcommon - disable sharedid by default * Fix Typo * PR Review process tweaks (#5862) Incorporating feedback * Added basic support for ID Module (#5835) Co-authored-by: John Rosendahl * Rename pubProvidedSystem.js to pubProvidedIdSystem.js (#5861) * Rename pubProvidedSystem.js to pubProvidedIdSystem.js * Update userId_spec.js * Adding Medianet outstream renderer support (#5854) * PR-review: fixed getFloor function name (#5876) * Real Time Data Module - Phase3 (#5783) * real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * RTD module extend #4610 * add hook for submodule init variables naming * RTD bug fix * remove auction delay and related hooks * RTD phase 3 * design changes * fix loop continuation * proper fix this time * linter * reduce loops Co-authored-by: bretg * Audigent RTD Provider HaloId Support & RTD Phase 3 Compliance (#5777) * real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * RTD module extend #4610 * add hook for submodule init variables naming * RTD bug fix * remove auction delay and related hooks * update audigent rtd provider * style update * change onDone() logic * RTD phase 3 * return on data unavailable * api endpoint update * update audigent RTD provider for new spec * design changes * fix loop continuation * proper fix this time * linter * update rtd parameters, onDone semantics * reduce loops * documentation update * working update to rtd3 spec, update segment example, documentation * remove unused vars, reference module name * resolve haloid for segments * update documentation to markdown * update description in documentation * minify optimizations Co-authored-by: omerdotan Co-authored-by: bretg * [AD-963] - Update JW Player RTD Provider for compliance with RTD Module Phase 3 (#5844) * updates grid adapter * adds response to bids * separates responsibilities * refactos success block * renames functions * tests getCache and formatting * tests data enrichment * adds tests for bid enhancement * updates documentation * adds clarification that sample params are placeholders * adds instructions to replace placeholder ids in example Co-authored-by: karimJWP * Reconciliation Real Time Data Provider (#5774) * FID-162: Add Reconciliation RTD Provider * FID-162: Update Reconciliation RTD Provider API * FID-162: Update getTargetingData method * FID-162: Add tests * Update instream logic to account for multimp (#5872) * initial commit, instream poc done * push in poc changes * push in poc changes * restore instream.html * push in poc changes * restore instream.html * restore instream.html v2 * adding instream unit tests v1 * catch up to bidfloor changes * unit tests finalized! * update adapter md * add support for mediaTypes.video * merge in prebid master * add instream validation * add unit test for instream validation Co-authored-by: Sy Dao * Verizon Media user id module (#5786) * Initial work on Verizon Media User ID module * Submodule tests * Add sample eid object for Verizon Media * Documentation update * Switch to HTTP GET, update tests. * Remove single test restriction. * Documentation update * Addressing initial PR feedback. * Accept pixelId parameter to construct VMUID URL * Fix tests following API signature change * Add IAB vendor ID Co-authored-by: slimkrazy * Use new ad request format by default in TheMediaGrid Bid Adapter (#5840) * The new request format was made by default in TheMediaGrid Bid Adapter * Update userId format in ad request for TheMediaGrid Bid Adapter * Added bidFloor parameter for TheMediaGrid Bid Adapter * Fix for review TheMediaGrid Bid Adapter * Support floorModule in TheMediaGrid Bid Adapter * Floors Module update to include floorMin (#5805) * Update to floors module to allow floorMin definition using setConfig({floors:...}); 1) If floorMin exists, set floorValue to new property floorRuleValue. 2) If floorMin is greater than floorValue, set floorValue to floorMin. Update to Rubicon Analytics Adapter to pass floorMin under auction.floors.floorMin if exists. Also includes update to pass floorRuleValue for each bid if floorMin exists Update to floorsModule roundup functionality to fix to one decimal place prior to roundup. This will fix issues in which JS evalutates a whole number to include a very small decimal value that forces a roundup to the next whole number. * Remove extra spaces * Package Lock revert * Updates to commit * Remove comment * Remove excess spaces * Update to priceFloor and rubiconAnalytics adapters * Prebid 4.13.0 Release * Increment pre version * configurable TTL for impressions (#5880) * PulsePoint Adapter: Fix on multi-format support (#5857) * ET-1691: Pulsepoint Analytics adapter for Prebid. (#1) * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter * ET-1691: cleanup * ET-1691: minor * ET-1691: revert package.json change * Adding bidRequest to bidFactory.createBid method as per https://github.com/prebid/Prebid.js/issues/509 * ET-1765: Adding support for additional params in PulsePoint adapter (#2) * ET-1850: Fixing https://github.com/prebid/Prebid.js/issues/866 * Minor fix * Adding mandatory parameters to Bid * APPS-3774 * ID5 user id module: migrate publishers to use local storage instead of 1p cookies (#5874) * change storage name * id5 user id module will now prefer localstorage over cookies with a specific name. - for now, the requirement is a warning, but in a future release it will be a strict requirement and the module will not work if it's not configured properly by the publisher - remove code to support legacy endpoint / storage since all publishers using ID5 have upgraded past v3.25.0 - once a publisher is using localstorage, remove any legacy cookies that are not longer needed * add id5 markdown file * update example docs to use html5 and new storage name * add todo * code review updates * update version * doc tweaks * doc tweaks * address PR feedback - fix bug in storage expiration dates - remove unnecessary check * add us_privacy to id5 id module (#5858) * Rubicon Bid Adapter - Interpret response adds new meta values (#5864) * [Synacormedia] Config override for site.domain property (#5885) * CAP-1992 - use get config for site.domain * AOL Adapter: User ID Support (#5886) * Added support for passing VMUID to SSP endpoints * Remove 'only' command * Do not create user.ext object unless required * Add support for passing Liveramp envelope to VM SSP * WIP * Updated tests * Remove trailing comma Co-authored-by: slimkrazy * the code to require local storage will be released in 4.14.0 not 4.13.0 (#5889) * piid for hybrid profiles * fix: schain complete can be 0 (#5902) * [AD-1020] JWPlayer RTD: Obtain targeting params from FPD (#5892) * reads jwTargeting from fpd * refactors param extraction * updates documentation * mentions support of config fpd * reduces auction delay examples Co-authored-by: karimJWP * Add support for Publisher Common ID Module (#5871) - New user id value to be sent to STR Ad Server as `pubcid` of the bid request object Story: [#175125639](https://www.pivotaltracker.com/story/show/175125639) * Liveintent id module doesn't fall back to the default implementations of ajax, pixel and storage. (#5859) Liveintent id module reads an email hash that is provided in the configuration. * removed fix for piid from staged_nightly * aol bid adapter: support IE (#5894) * support IE in aol spec * array includes not supported IE11 * add check for config to make sure its defined (#5873) * Prebid 4.14.0 Release * Increment pre version * Media type renderers (#5760) * allow publisher to define a renderer specific to the mediaType * validate outstream bid with a renderer defined on the video mediaType * get the mediaTypes from the bidReqest * tests for publisher-defined, media-specific renderers * use single quote * undo inadvertent package-lock.json changes Co-authored-by: Michael Sperone * Added GVL_ID & addtl_consent for smartadserverBidAdapter (#5870) * SIM-875 Adding GVL_ID * SIM-875 Added addtl_consent * SIM-875 removing trailing whitespaces * New krushmedia Prebid.js adapter (#5833) * inital * fix * fix * fix * fix * fix * fix * add maintener to md * Added native support Co-authored-by: Aiholkin * eTarget: adapter update (#5881) * adapter update Send response reason * Update etargetBidAdapter.js Adding optional response parameter * Update etargetBidAdapter_spec.js * DMX Fix video bug (#5910) * adding DMX test @97%, two files added one updated * Update districtm_spec.js * Update districtmDMX.js * adding all districtm needed file * remove legacy file * remove typo || 0 in the test method * force default to return a valid width and height * update unit test code for failing test * changed class for an object * remove package-lock.json * change file name for dmx adapter * renamed files * restaure package-lock.json * update to last package-lock state * update gdpr user consent * fix sizes issue * Documentation updates Adding the readme.md info * update file name and update unit testing import file location * current machine state * lint correction * remove variable assigment duplicate * adding CCPA support for DMX * adding test for ccpa and gdpr * districtm dmx adding deal id field * idsync support ccpa & gdpr * fix error on vast response that failed Co-authored-by: Steve Alliance Co-authored-by: Luis Co-authored-by: Steve Alliance Co-authored-by: Steve Alliance Co-authored-by: steve-a-districtm * fix failing lint errors on circle ci (#5918) * sspId for pubmatic only (#418) * IX missing sizes testing and diagnosis (#5856) * Added support for Liveramp userId submodule * Fixing URL length for large requests * adding telemetry to missing sizes feature * adding markdown file with detectMissingSizes * example value update Co-authored-by: IX-Prebid-Support * Add apacdex bid adapter & Merge valueimpression, quantumdex to apacdex (#5888) * Adkernel: basic meta forwarding (#5836) * Add skip params to Beachfront adapter (#5847) * feat: add skip params and standard params to video bid request * refactor: add props to exclude list * refactor: bump adapter version Co-authored-by: John Salis * AMX RTB: improve URL handling in request (#5905) * feat: add the elapsed time to events for debugging (#5868) * feat: add the elapsed time to events for debugging * naming * remove 'only' to run all tests (#5926) * Add Auction Options Config (#5787) * feature/auction-timing * rename to auctionOptions * move filtering outside of loop and organized logic. * remove auctionOptions test page * TL: Add GVLID, update validation method, add unit tests (#5904) * Add IdentityLink support and fix UnifiedId. It appears we've been looking for UnifiedId userIds on the bidderRequest object, when they are found on bidRequests. This commit fixes that error, and adds support for IdentityLink. * change maintainer email to group * TripleLift: Sending schain (#1) * Sending schain * null -> undefined * Hardcode sync endpoint protocol * Switch to EB2 sync endpoint * Add support for image based user syncing * Rename endpoint variable * Add assertion * Add CCPA query param * Simplify check for usPrivacy argument * put advertiser name in the bid.meta field if it exists * update unit tests with meta.advertiserName field * Triplelift: FPD key value pair support (#5) * Triplelift: Add support for global fpd * don't filter fpd * adds coppa support back in * add gvlid, update validation method, add unit tests * remove advertiserDomains logic * typo * update _buildResponseObject to use new instream validation Co-authored-by: Will Chapin Co-authored-by: colbertk <50499465+colbertk@users.noreply.github.com> Co-authored-by: David Andersen Co-authored-by: Brandon Ling Co-authored-by: colbertk Co-authored-by: Kevin Zhou Co-authored-by: kzhouTL <43545828+kzhouTL@users.noreply.github.com> Co-authored-by: Sy Dao * rubicon - support all userIds (#5923) * rubicon - support all userIds * rubicon - support all userIds update * rubicon update to userId logic Co-authored-by: Eric Harper * Adds tcf v2 support (#5883) Co-authored-by: francesco * get dynamic ttl from the server response (#5896) * Change ironsource to be lower case all over code * Add test mode to the IronSource bidder * get dynamic ttl from the server response * Teads adapter: add Global Vendor Id (GDPR enforcement) (#5929) * Smaato: Add userIds to BidRequest (#5927) * Mediasquare: add native and video support (#5823) * Mediasquare: Add support for uspConsent + schain userIds support. Plus enhance userSync * fix iframeEnabled and pixelEnabled + suggested shortand statement * mediasquare bidder: add metrics to onBidWon Event * mediasquare bidder: fix getUserSyncs * MediaSquare: add native and video support * 33Across: Added Video Support (#5884) * check gdpr in buildRequest * User sync based on whether gdpr applies or not * check if consent data exists during user sync * split user sync into further branches: 1) when gdpr does not apply 2) when consent data is unavailable * contribute viewability to ttxRequest * update tests * remove window mock from tests * use local variables * introduce ServerRequestBuilder * add withOptions() method to ServerRequestBuilder * add semicolons * sync up package-lock.json with upstream/master * stub window.top in tests * introduce getTopWindowSize() for test purpose * reformat code * add withSite() method to TtxRequestBuilder add withSite() method to TtxRequestBuilder * add isIframe() and _isViewabilityMeasurable() * handle NON_MEASURABLE viewability in nested iframes * consider page visibility, stub utils functions getWindowTop() and getWindowSelf() * contribute viewability as 0 for inactive tab * add prebidjs version to ttx request * send caller as an array * send viewability as non measurable when unable to locate target HTMLElement, add warning message * fix JSDoc in utils.js * introduce mapAdSlotPathToElementId() * introduce getAdSlotHTMLElement(), add logging * introduce mapAdSlotPathToElementId() * update logging in ad unit path to element id mapping * rephrase logging, fix tests * update adapter documentation * remove excessive logging * improve logging * revert change * fix return of _mapAdUnitPathToElementId() * improve logging of _mapAdUnitPathToElementId() * do not use Array.find() * return id once element is found * return id once element is found * let -> const * Removing killswitch behavior for GDPR * Updated comments to reflect current gdpr logic * URI encode consent string * Updated example site ID to help Prebid team e2e test our adapter * send page url in ortb * Removed redundant pageUrl default * Restored package-log.json that mirrors prebid's repo * Sending USP string during buildRequest * Adding USP consent data to user sync * add unit test for syncing without bidrequest * Changed to uspConsent to make the connatation consistent * Resetting adapter state in adapter after user sync rather than exposing it. * removed console log * Adding schain info * remove setting empty format ext * better tests invalid values * removing validation of schain * Fixed lint errors * First cut for bidfloors support * fixed where getFloors is read * fixed merge conflicts * support the guid in the api endpoint * Reformat + validation updates * refactor banner to conform to mediaType format * Building video ORTB * code review changes for better refactor * Building video ORTB * Interpret video response * Updated documentation * Updated supported mediatypes * Added bidfloors * Adding support bidder specific overrides * only validate startdelay when instream * fixed incorrect params for instream * Removed usage of an actual GUID for safety. * Added mimes and protocols as required * placement is +ve int * fix for sizes + valid sample GUID Co-authored-by: Gleb Glushtsov Co-authored-by: Gleb Glushtsov Co-authored-by: Gleb Glushtsov Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: terryc33x <64039851+terryc33x@users.noreply.github.com> Co-authored-by: Terry Chen * Prebid 4.15.0 Release * Increment pre version * Improve Digital adapter: eids support (#5935) * Improve Digital adapter: eids support * Fix quotes * Adkernel: andbeyond alias (#5922) * fix to remove redundant validation for datatype for partner value - UOE-5788 * fix for UOE-5788 * LunamediaHB bid adapter (#5906) * Add User ID Targeting to googletag.cmd as a fallback when GPT API is not ready (#5925) * Add User IDs to googletag.cmd The purpose of this change is to allow the userIdTargeting module to function even when googletag has not been defined yet. * Fixing indentation errors Fixing indentation errors thrown by * Fix 'googletag' is not defined errors * Added unit test for userIdTargeting fallback * No bid version 1.2.9 (#5794) * Enable supplyChain support * Added support for COPPA * rebuilt * Added support for Extended User IDs. Co-authored-by: Reda Guermas * EMX Adding Schain forwarding (#5946) * adding ccpa support for emx_digital adapter * emx_digital ccpa compliance: lint fix * emx 3.0 compliance update * fix outstream renderer issue, update test spec * refactor formatVideoResponse function to use core-js/find * Add support for schain forwarding Co-authored-by: Nick Colletti Co-authored-by: Nick Colletti Co-authored-by: Kiyoshi Hara Co-authored-by: Dan Bogdan Co-authored-by: Jherez Taylor Co-authored-by: EMXDigital * pubGENIUS bid adapter: fix bug that requestBids timeout is not respected (#5940) * fix requestBids timeout * fix pubgenius bid adapter test * Updated the text in line 292 (#5937) Updated the text in line 292 * Update for Qwarry bid adapter (#5936) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev * moved changes for UOE-5788 in hasRequiredParams function * Adagio Bid Adapter: support UserId's (#5938) * userId module: fix auctionDelay submodules with callbacks (#5891) * clearTimeout only after all submodules are done * check that setTimeout function was not cleared * fix circle ci failing lint error (#5952) * PR-Review process: fleshing out RTD review (#5948) * PR-Review process: fleshing out RTD review * align bidrequest attribute * delete pubcommon test cookie for domainOverride after writing it in all cases (#5943) * delete pubcommon test cookie after writing it in all cases, not just when it is found again * fix lunamediahbBidAdapter lint issue * call domainOverride only when needed in the module, not ahead of time when the module is registered. * Gamoshi - Add new alias (#5895) * add logic to prefer prebid modules over external modules in build process (#4124) * add check in getModules helper function * update logic based on feedback * update node version of project * Improve Digital adapter: adding bid floor, referrer, more native fields (#4103) * Bid floor, https, native ad update * Update the ad server protocol module * Adding referrer * YIELDONE adapter - change urls to adapt https (#4139) * update: change urls to adapt https * fix test code * Added SupplyChain Object support and an onTimeout Callback (#4137) * - Implemented the 'onTimeout' callback to fire a pixel when there's a timeout. - Added the ability to serialize an schain object according to the description provided here: https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md * some mods to the schain tag generation * - added tests for schain param checking. * - fixed a malformed url for timeouts * - Removed a trailing ',' while generating a schain param. * Revert "Added SupplyChain Object support and an onTimeout Callback (#4137)" This reverts commit e61b246b45bd2c2390350eaeca693f208b1a3a24. This commit doesn't use the schain module added in #4084 * Nobid Prebid Adapter commit (#4050) * Nobid Prebid Adapter commit * Fixed global replace and unit tests * Fixed find function * Added nobidBidAdapter.md * Removed description and added "Bid Params" section. * Added test siteId 2 for testing. * Refactored the Adapter to remove most references to the nobid object. We still need the nobid object because we have a passback tag in DFP that makes reference to it. * Fix concurrent responses on the page * Cosmetic change to log an error in case of missing ad markup * Keep nobid.bidResponses cross adapters. * Added GDPR support in user sync and added test coverage. gulp test-coverage gulp view-coverage * Padding issues * Fix padding issues * Fix padding * update outstream prod url (#4104) * support pubcid and uids (#4143) * Fix misspelling and minor cleanup of schain docs (#4150) * Prebid 2.31.0 Release * Increment pre version * Rubicon: tuning logged messages (#4157) * Rubicon: tuning logged messages * Update rubiconBidAdapter.js * fixed indentation * Rubicon Video COPPA fix (#4155) * Rubicon Video COPPA fix * Unit test for Rubicon Video COPPA fix * Playground XYZ adapter - iframe usersync bug fix (#4141) * corrected user sync type * removed support for iframe usersync * added unit tests for getUserSyncs * update nvmrc file (#4162) * update gulp-footer package (#4160) * Datablocks bid/analytics adapter (#4128) * add datablocks Analytics and Bidder Adapters * remove preload param * remove preloadid * better coverage of tests * better coverage * IE doesn't support array.find * lint test * update example host * native asset id should be integer * update logic of ad_types field in appnexusBidAdapter (#4065) * Shorten SomoAudience to just Somo (#4163) * Shorten SomoAudience to just Somo * Make package-lock return * Quantcast: Fix for empty video parameters (#4145) * Copy params from bid.params.video. * Added test for missing video parameters. * Include mimes from adunit. * One Video adding Rewarded Video Feature (#4142) * outstream changes * removing global filtet * reverting page * message * adapter change * remove space * testcases * testpage * spaces for test page * renderer exist case * reverting package-lock.json * adding schain object * adding tagid * syntaxx error fix * video.html * space trailing * space * tagid * inventoryId and placement * rewarded video * added unit test case * Module to pass User Ids to DFP (#4140) * first commit * renamed * minor doc change * documentation * small change * EB * removed unused imports * minor changes * reanmaed a const * adding more methods to test shareUserIds module * unit tets cases for shareUserIds * indentation * renamed DFP to GAM * renamed shareUserIds to userIdTargeting * Update userIdTargeting.md * trying to restart CI * digitrust userId case handled * minor comment change * using auctionEnd event instead of requestBids.before * using events.on * Buzzoola bid adapter (#4127) * initial commit for buzzoola adapter * leave only banners for now * fix bid validation * change endpoint url * add video type * restore renderer * fix renderer * add fixed player sizes * switch bids * convert dimentions to strings * write tests * 100% tests * remove new DOM element creation in tests * handle empty response from server * change description * E2e tests for Native and Outstream video Ad formats. (#4116) * reorganize e2e/ tests into separate directories * new test page for e2e-banner testing * add test to check if Banner Ad is getting loaded * change location of the spec files to reflect change in test/e2e directory structure * add test case to check for generation of valid targeting keys * create Native Ad test page * add test case to check validity of the targeting keys and correct rendering of the Ad * update old browser versions to new * update browser version * update title * remove console.log statements * add basic functional test for e2e outstream video ad format * Update LockerDome adUnitId bid param (#4176) This is not a breaking change * fix several issues in appnexus video bids (#4154) * S2s testing disable client side (#4123) * Add microadBidAdapter * Remove unnecessary encodeURIComponent from microadBidAdapter * Submit Advangelists Prebid Adapter * Submit Advangelists Prebid Adapter 1.1 * Correct procudtion endpoint for prebid * analytics update with wrapper name * reverted error merge * New testServerOnly flag * Tests and a bug fix * Removed dead code * Fixes requested in review * Check each adUnit * isTestingServerOnly changes per Eric * Fixed IE 11 bug * More tests * improved test case names * New option to Include deal KVPs when enableSendAllBids === false (#4136) * new option to include KVPs which have deals when enableSendAllBids === false * updating tests to be more realistic * Prebid 2.32.0 Release * increment pre version * Rubicon doc: changing video test zone (#4187) * added schain support to sonobi adapter (#4173) * if schain config is not defined then error should not be thrown (#4165) * if schain config is not defiend then error should not be thrown * relaxed mode nodes param not defined error handled * added test cases for config validation * a curly bracket was missing in the example * Rubicon: updating test params (#4190) * myTargetBidAdapter: support currency config (#4188) * Update README.md (#4193) * Update README.md * Update README.md * cedato bid adapter instream video support (#4153) * Added adxpremium prebid analytics adapter (#4181) * feat(OAFLO-186): added support for schain (#4194) * Sonobi - send entire userid payload (#4196) * added userid param to pass the entire userId payload to sonobis bid request endpoint * removed console log git p * fixed lint * OpenX Adapter fix: updating outdated video examples (#4198) * userId - Add support for refreshing the cached user id (#4082) * [userId] Added support for refreshing the cached user id: refreshInSeconds storage parameter, related tests and implementation in id5 module * [userId] Added support for refreshing the cached user id: refreshInSeconds storage parameter, related tests and implementation in id5 module * UserId - ID5 - Updated doc with new contact point for partners * UserId - Merged getStoredValue and getStoredDate * [UserId] - ID5 - Moved back ID5 in ./modules * UserId - ID5 - Fixed incorrect GDPR condition * [UserId] - Doc update and test cleanup * Prebid 2.33.0 Release * Increment pre version * SupplyChainObject support and fires a pixel onTimeout (#4152) * - Implemented the 'onTimeout' callback to fire a pixel when there's a timeout. - Added the ability to serialize an schain object according to the description provided here: https://github.com/InteractiveAdvertisingBureau/openrtb/blob/master/supplychainobject.md * some mods to the schain tag generation * - added tests for schain param checking. * - fixed a malformed url for timeouts * - Removed a trailing ',' while generating a schain param. * - Using the schain object from validBidRequest if present. Reverting to checking if params has it if not. * - reverting changes to merge with master * - Resolving merge issues * Feature/add profile parameter (#4185) * Add optional profile parameter * EMXDigital Bid Adapter: Add video dimensions in request (#4174) * addressed feedback from #3731 ticket * removed commented code from emx test spec * logging removed from spec * flip h & w values from playerSize for video requests * adding Outstream mediaType to EMX Digital * adding device info. update to grab video param. styling changes. * add video dimensions from playerSize * fix test for video dimensions * Added keywords parameter support in TrustX Bid Adapter (#4183) * Add trustx adapter and tests for it * update integration example * Update trustx adapter * Post-review fixes of Trustx adapter * Code improvement for trustx adapter: changed default price type from gross to net * Update TrustX adapter to support the 1.0 version * Make requested changes for TrustX adapter * Updated markdown file for TrustX adapter * Fix TrustX adapter and spec file * Update TrustX adapter: r parameter was added to ad request as cache buster * Add support of gdpr to Trustx Bid Adapter * Add wtimeout to ad request params for TrustX Bid Adapter * TrustX Bid Adapter: remove last ampersand in the ad request * Update TrustX Bid Adapter to support identical uids in parameters * Update TrustX Bid Adapter to ignore bids that sizes do not match the size of the request * Update TrustX Bid Adapter to support instream and outstream video * Added wrapperType and wrapperVersion parameters in ad request for TrustX Bid Adapter * Update TrustX Bid Adapter to use refererInfo instead depricated function utils.getTopWindowUrl * HOTFIX for referrer encodind in TrustX Bid Adapter * Fix test for TrustX Bid Adapter * TrustX Bid Adapter: added keywords passing support * rubicon: avoid passing unknown position (#4207) * rubicon: not passing pos if not specified * added comment * not sending pos for video when undefined * cleaning up test * fixed unit test * correctly reference bidrequest and determine mediatype of bidresponse (#4204) * GumGum: only send gdprConsent when found (#4205) * adds digitrust module, mods gdpr from bool to int * update unit test * only send gdprconsent if present * LKQD: Use refererInfo.referer as fallback pageurl (#4210) * Refactored URL query parameter passthrough for additional values, changed SSP endpoint to v.lkqd.net, and updated associated unit tests * Use refererInfo.referer as fallback pageurl * Removed logs and testing values * [UserId] - ID5 - Fixed case when consentData is undefined (No CMP) (#4215) * create stubs for localStorage in widespaceBidAdapter test file (#4208) * added adId property to adRenderFailed event (#4097) When no bid (therefore no adUnitCode) is available in the adRenderFailed event it can be difficult to identify the erroring slot.But in almost all cases the given slot still has the adId targeting. * OpenX Adapter: Forcing https requests and adding UserID module support for LiveRamp and TTD (#4182) * OpenX Adapter: Updated requests to force https * OpenX Adapter: Added support for TTD's UnifiedID and LiveRamp's IDL * PubMatic to support userId sub-modules (#4191) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * TripleLift support for UnifiedId and IdentityLink (#4197) * Add IdentityLink support and fix UnifiedId. It appears we've been looking for UnifiedId userIds on the bidderRequest object, when they are found on bidRequests. This commit fixes that error, and adds support for IdentityLink. * change maintainer email to group * Added lemma adapter (#4126) * lemmaBidAdapter.js Added lemma bid adapter file * lemmaBidAdapter.md Added lemma bid adapter md file * lemmaBidAdapter_spec.js Added lemma bid adapter test spec file * Update lemmaBidAdapter.js Fixed automated code review alert comparison between inconvertible types * Update lemmaBidAdapter.js Fixed review changes * Update lemmaBidAdapter.md Correct parameter value. * Adkernel adapter new alias (#4221) * Force https scheme for Criteo Bidder (#4227) * assign adapter version number * Ensure that Criteo's bidder is always called through https * Add Video Support for Datablocks Bid Adapter (#4195) * add datablocks Analytics and Bidder Adapters * remove preload param * remove preloadid * better coverage of tests * better coverage * IE doesn't support array.find * lint test * update example host * native asset id should be integer * add datablocks Video * remove isInteger * skip if empty * update adUnit, bidRequest and bidResponse object (#4180) * update adUnit, bidRequest and bidResponse object * add test for mediaTypes object * 3 display banner and video vast support for rads (#4209) * add stv adapter * remove comments from adapter file * start rads adapter * fix adapter and tests * fixes * fix adapter and doc * fix adapter * fix tests * little fix * add ip param * fix dev url * #3 radsBidAdapter.md * #3 radsBidAdapter.md: cleanup * fix code and doc * UserId - Add SameSite and server-side pubcid support (#3869) * Add SameSite and server-side pubcid support * Fix emoteevBidAdapter unit test * added schain to appnexus bid adapter (#4229) * added schain to appnexus bid adapter * semicolon * update doubleclick url (#4179) * Prebid 2.34.0 release * increment pre version * Rubi Analytics handles > 1 bidResponse per bidRequest (#4224) * videoNow bid adapter (#4088) * -- first commit * -- cors and bidder's name fixed * -- almost ready * -- added docs * -- added nurl tracking * -- bid params * -- tests added * -- test fixed * -- replace placeholder in the onBidWon pixel's url * -- commit for restart tests * -- change response data format for display ad * -- tests updated * -- 100% tests coverage * -- a few clean the test's code * -- custom urls from localStorage * -- tests updated * -- a few clean the test's code * -- new init model * -- spec for new init model * -- fix for new init model * -- code cleaned * -- 100% tests coverage * -- 100% tests coverage * -- fixed test * -- commit for restart tests * djax new bidder adapter (#4192) * djax bidder adapter * djax bidder adapter * Update hello_world.html * Added Turk Telekom Bid Adapter (#4203) * Added Turk Telekom Bid Adapter * Fix md file for Turk Telekom Bid Adapter * MicroAd: Use HTTPS in all requests (#4220) * Always use HTTPS endpoint in MicroAd * Update code * Fixed a broken test in MicroAd * Schain: avoiding Object.values as it is breaking on IE11 (#4238) * added support for pubcommon, digitrust, id5id * added support for IdentityLink * changed the source for id5 * added unit test cases * changed source param for identityLink * avoiding use of Object.values * 3952 delay auction for ids (#4115) * 3952 delay auction for user ids * 3952 add integration example * 3952 add tests * 3952 fix html example * add todos * 3952 continue auction if ids received * 3952 add tests for auction delay * increase test coverage * set config for test * remove todo * add a few more checks to tests * add comment, force tests to rerun * Feature: adUnitBidLimit (#3906) * added new feature to config to limit bids when sendallbids is enabled * cleaned up code. removed extra spaces etc * removed trailing spaces in config * remove .flat() and replaced with spread operator * removed flat function and instead pushing using spread operator * updated to use sendBidsControl instead * updated targeting_spec to test bidLimit * removed trailing spaces from targeting_spec * Update Rubicon Adapter netRevenue default (#4242) * Add microadBidAdapter * Remove unnecessary encodeURIComponent from microadBidAdapter * Submit Advangelists Prebid Adapter * Submit Advangelists Prebid Adapter 1.1 * Correct procudtion endpoint for prebid * analytics update with wrapper name * reverted error merge * update changed default value of netRevenue to true * Removed AdastaMadia from alias (#4255) * Update appnexusBidAdapter.js (#4251) * IdentityLink - change expiration time to 30 days (#4239) * Add coppa support for AppNexus adapter (#4253) * Add coppa support for AppNexus adapter * test name * add new longform e2e tests (#4206) * Konduit module (#4184) * Adding Konduit module * Removed superfluous arguments passed to obtainVastUrl function * Removed superfluous arguments passed to obtainVastUrl function. * Build trigger (empty commit) * Module documentation updated according to the comments * Logic in obtainVastUrl function updated according to the review comment. * Removed hook, enabled eslint * Circle CI runs e2e tests on every push (#4200) * run functional tests on circle ci on push to any remote branch * remove extraneous key from config file * add test.localhost as alias to 127.0.0.1 * check 0: execute circle-ci * move /etc/config to a separate command * change bid partner to rubicon * test appnexus bid adapter in ci * comment browserstack command * remove console.log statement * test1: circle-ci * change reference dev -> prod while loading prebid * add console.log statement * check-2: circle-ci * comment browserstack testing * change bid adapter * change bid adapter * remove test case for checking targeting keys * remove the ci flag * uncomment test for checking correct generation of targeting keys * swap AN -> Rubicon for testing targeting keys * Outcon bid adapter. (#4161) * Outcon bid adapter. * Fix identation * Fixes * Fixes * Fixes * Spec fixes * Fixes * Fix urls * Fix * Fix parameters * Fix space operators * Fix bidder timeout * Update * Fix whitespace * no message * Outcon unit test * no message * no message * no message * no message * Fixes * Fixes * Change url * no message * no message * no message * Added bidId * no message * no message * no message * no message * Wrapping url with html * no message * no message * no message * Adding workflow to run end to end tests (#4230) * Adding workflow to run end to end tests * trying self branch * Update to run at 12 every day * cleanup config using aliases * update branch and cron time * add command … * removed adagio * removed audiencenetwor * Added yargs * Removing adDomain * PubMatic bid adapter: support for FPD * Added DebugUI module (#464) Co-authored-by: Azhar * using bid.ext.bidType for mediaType (#460) * using bid.ext.bidType for mediaType * Fixed typo * changed bidtype method and log for fallback * added check for -1 * check for 0 as a condition * support for Native in PrebidSame (#462) Co-authored-by: Azhar * Removed dfp ad slot code (#463) Co-authored-by: Azhar * Added dfp adslot code (#466) * added dfp changes to server adapter * added changes for bidAdapter Co-authored-by: Azhar * Adagio (#467) * adagio bid adapte * trying to fix adagio bidd adapter * fixed adagio issue by updating the jsencrypt * Changed package-lock json * pulled admediaBidAdapter from nightly_upgrade * pulled changes from nightly_upgrade * Removed last blank line as per nightly_upgrade * Prebid Upgrade 4.43 (#476) * display bidder in utils.logs and disable bidder config on auction end (#6683) * add X-Prebid header to ajax requests fixes #6627 (#6676) * Prebid Docs: Typo fix in README.md (#6704) * Revert "add X-Prebid header to ajax requests fixes #6627 (#6676)" (#6702) This reverts commit a887289546bdf830a3ff450a664627471eec9dfc. * Criteo Bid Adapter: update contact email (#6701) * Fixing flaky adapter unit tests (#6706) * stub appendChild stuff * use ie11 safe strIncludes * update prebidManager to use storageManager * use ie safe stuff * going too fast ;P * Floc Userid System: add new ID module (#6521) * Zeta Bid Adapter: update to endpoint (#6697) * adapter updates * remove testing changes * modify endpoint path * address testing issues * prebid 4.38.0 release * 4.39.0-pre * Adkernel Bid Adapter: converge digital alias (#6714) * fix linting in gulpfile (#6694) * eslint(standard/object-curly-even-spacing) * eslint(space-before-blocks) * eslint(no-multi-spaces) * Admixer Bid Adapter: add meta key to response (#6674) * Grid Bid Adapter: add support for advertiserDomains (#6716) * Update gridBidAdapter.js * Update gridBidAdapter_spec.js * Update gridBidAdapter_spec.js * Update gridBidAdapter_spec.js * 33across bid adapter: Add adomain support (#6719) * Fix typo in UID 2.0 doc (#6724) * Bump url-parse from 1.4.7 to 1.5.0 (#6718) Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.0. - [Release notes](https://github.com/unshiftio/url-parse/releases) - [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * smartx Bid Adapter: bugfix renderer url (#6725) * Bump handlebars from 4.7.6 to 4.7.7 (#6717) Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Tappx Bid Adapter: add floor module support (#6626) * UPDATE: add initial UID * UPDATE: UID change user ext * UPDATE: UID clean logs * UPDATE: add host info * UPDATE: tappx bid adapter universal id * UPDATE: fix bidder param * UPDATE: tappxBidAdapter tests * tappxBidAdapter - fix spacing * tappxBidAdapter: add test user eids array * tappxBidAdapter: update eids array * FIX: package-lock.json * Conversant adapter: add adomain, remove digitrust (#6495) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Update conversantBidAdapter.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Rads Bid Adapter: add GDPR support & user sync support (#6455) * Proxistore Bid Adapter: add cookieless url endpoint & use floor module (#6427) * use floor module * call cookieless endpoint when necessary * test endpoint url * change url endpoint * delete console log * fix tests * add language to url * use ortb interface * unit test * update test unit * create proxistore module * add unit tests and documentation * delete modules * delete module * add proxistore rtd submodule * delete proxistore module * spacing * change url * AdYoulike Bid Adapter: Add an "Insertion" tracking for Native mediatype (#6481) * add insertion event * add missing campaign ID parameter * update unit test with new tracking checked * Dspx Bid Adapter : add user sync support (#6456) * Add sync support for dspx adapter * Dspx Bid Adapter : add user sync support Co-authored-by: Alexander * Multibid Module: add new module to handle multiple bids from single bidder & update rubicon adapter (#6404) * Multibid module - create new module - Expands the number of key value pairs going to the ad server in the normal Prebid way by establishing the concept of a "dynamic alias" First commit * Continued updates from 1st commit * Adding logWarn for filtered bids * Update to include passing multibid configuration to PBS requests * Update to rubicon bid adapter to pass query param rp_maxbids value taken from bidderRequest.bidLimit * Update to config to look for camelcase property names according to spec. These convert to all lowercase when passed to PBS endpoint * Adjust RP adapter to always include maxbids value - default is 1 * Added support for bidders array in multibid config * Fixed floor comparison to be <= bid cpm as oppossed to just < bid cpm. Updated md file to fix camelCase tpyo * Update to include originalBidderRequest in video call to prebid cache * Update to ignore adpod bids from multibid and allow them to return as normal bids * Adding uid2 to submodules.json (#6508) * NextRoll ID System: add new ID module (#6396) * Add Nextroll ID Module * Add nextroll to eids * Make configuration value names consistent with Adapter Module * Use parnerId instead of sellerId * Add nextroll to userId and eids md files * Remove storage configuration * Rename nextroll -> nextrollId * Add nextrollId to common ID specs * Qwarry Bid Adapter: add GDPR and consent string handling (#6489) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests * GDPR consent string support * NPE fix Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> * Zemanta Bid Adapter: add support for new params & consent strings to usersync URL (#6468) * add gvl id to spec * add support for bcat and badv params * add consent strings to usersync url * add bcat and badv params to doc * Automatad Bid Adapter: Add meta.advertiserDomains to bid response (#6509) * added bid meta with advertiserDomains * Adhese Bid Adapter: add support for caching video content (#6501) * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * Adhese Bid Adapter: cache video content Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz * update apacdex unit test to disable debug mode (#6511) * Telaria: not setting adid (#6507) * Prebid 4.33.0 Release * increment pre version * rubicon: removing maxduration as a required bidder parameter (#6513) * Zemanta adapter: add advertiserDomains (#6517) * Lemma Bid Adapter: accepting the floor to use the getFloor function (#6497) * lemmaBidAdapter.js Added lemma bid adapter file * lemmaBidAdapter.md Added lemma bid adapter md file * lemmaBidAdapter_spec.js Added lemma bid adapter test spec file * Update lemmaBidAdapter.js Fixed automated code review alert comparison between inconvertible types * Update lemmaBidAdapter.js Fixed review changes * Update lemmaBidAdapter.md Correct parameter value. * Update lemmaBidAdapter.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter_spec.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.md Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.js Added user sync support into bid adapter. * updated include modules file extension. updated include modules js file extension. * Update lemmaBidAdapter_spec.js Added unit test for user sync feature. * Update lemmaBidAdapter.js Fixed format error. * Update lemmaBidAdapter_spec.js Fixed format error and typo error. * Set mediaType key value into bid object Set mediaType key value into the bid object. * Update lemmaBidAdapter.js remove duplicate function * Update lemmaBidAdapter.js Remove non supported code. * Update lemmaBidAdapter_spec.js Remove GDPR test cases. * Update lemmaBidAdapter.js Made changes for accepting the floor to use the getFloor function * Update lemmaBidAdapter.js correct undefined keyword name. * Update lemmaBidAdapter_spec.js Added test coverage floor value * Update lemmaBidAdapter.js Remove trailing spaces on lines 379 and 381. * Update lemmaBidAdapter_spec.js Added getFloor function test case changes, Please review it. * Update lemmaBidAdapter_spec.js * Update lemmaBidAdapter.js * Update lemmaBidAdapter.js Fixed lint issue. * Update lemmaBidAdapter_spec.js Fixed test cases. * Update lemmaBidAdapter_spec.js Made suggested changes. Please review it. Co-authored-by: Abhijit Mane * Mediasquare Bid Adapter: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event (#6480) * Mediasquare bidder: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event * Mediasquare bidder: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event * removing status as it does not seem populated when called * add tests * Update nextroll ID variable name to match published ID module (#6519) * Merkle User ID Module: updates to user id submodule (#6503) * AdKernel Bid/Analytics Adapters: user privacy related changes (#6488) * SynacorMedia: remove adId from the bid response (#6520) * Rubicon: making doc data types consistent (#6526) * Synacormedia Bid Adapter: add meta.advertiserDomains (#6527) * Adloox Analytics Adapter: add new analytics adapter (#6308) * gulp: fix supplying list of browsers to test against The following now works: gulp test --browserstack --nolint --nolintfix --browsers=bs_ie_11_windows_10 --file 'test/spec/modules/adloox{AnalyticsAdapter,AdServerVideo,RtdProvider}_spec.js' * instreamTracking: unit test tidy From @robertrmartinez in https://github.com/prebid/Prebid.js/pull/6308#issuecomment-810537538 * adloaderStub: expose stub for other unit tests to use From @robertrmartinez in https://github.com/prebid/Prebid.js/pull/6308#issuecomment-810537538 * Adloox analytic module * Seedtag adapter: Fixing bug preventing to receive the right params onTimeout. (#6525) * adot bid adapter: add publisher path from bidder config to endpoint url (#6476) * Admixer ID System: add userId submodule (#6238) * Migrating to Prebid 1.0 * Migrating to Prebid 1.0 * Fix spec * add gdpr and usp * remove changes in gdpr_hello_world.html * Update gdpr_hello_world.html add spaces * add user syncs * remove comments * tests * admixer id system * admixer id system * admixer id system eids.md userId.md * admixer id system .submodules.json * admixer id system Co-authored-by: atkachov * PBJS Core: call custom render func after loadscript if provided (#6422) * Pubxai Analytics Adapter: bug fixes and code revamp (#6474) * Updated PubxAiAnalytics adapter - Bug fixes and Code restructuring * Updated endpoint URLs * Changed array.includes to array.indexOf to fix IE issue * Code cleanup and changes as suggested. * Updated browser testing order and edge browser token * PBJS Core: canBidderRegisterSync ignoring iframe sync disabled by default (#6535) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Update userSync.js * Update userSync_spec.js * Added automatic tzo and targetId to adserver request. (#6534) * Impactify Bid Adapter: add new bid adapter (#6518) * Add impactify adapter with MD file * Add impactify adapter * Prebid 4.34.0 Release * Increment pre version * Prebid server adapter: add config for openx hosting (#6530) * Yieldmo adapter: add meta data to bids (#6550) * Smartx Bid Adapter: Add meta.advertiserDomains support (#6547) * Onevideo / Adap.tv Adapter: updated example configuration (#6546) * Mass Deal Rendering Module: support multiple custom configs for dealId and rendering (#6500) * ZetaSsp Bid Adapter: add new bid adapter (#6432) * Adnuntius Bid Adapter: Fix for bid too low. (#6557) * Added automatic tzo and targetId to adserver request. * Fixing issues with bid price being too low. * Fixing issues with bid price being too low. * ReadPeak Bid Adapter: fix api issues, add gdpr consent, & getfloor module support (#6548) * BetweenBidAdatper: added sharedid support (#6531) * adWMG Bid Adapter: update endpoints for cookie sync (#6544) * Support floorCPM parameter, fix some minor bugs * fix space-in-parens circleci error * example fix * clean usersync URL * spaces * spaces * add new unit tests, compatibility with IE11 * remove logInfo * Check for floorCPM value * Check params before sending * New endpoints * code format * new endpoint for cookie sync * update tests Co-authored-by: Mikhail Dykun * Yieldmo Bid Adapter: add support for the floors module (#6541) * Sortable Bid Adapter: add eids support (#6565) * Add Sortable adapter for Prebid 3.x Update tests to reflect changes. * Add .js in imports * hostname not host: don't include port * Trivial change to trigger build: failure wasn't our adapter * More failures in other adapters * PR Feedback - use https for URL - fix examples in markdown - request to endpoint should work now * Feedback: add native and video examples * Update unit tests Co-authored-by: Shannon Broekhoven * Outbrain Bid Adapter: replacing Zemanta (#6558) * Sirdata Real-time Data Module: add new RTD module (#6515) * Logicad Bid Adapter: add support for userid modules (#6529) * ATS-identityLinkIdSystem - add use3P config property to control firing of 3P envelope endpoint (#6568) * Proxistore Bid Adapter: add support for tcf v2 consent (#6543) * use tcf v2 consent * set cosentGiven to false and test Gdpr api v2 * BlueBillyWig Bid Adapter: add renderer customization options (#6540) * add Blue Billywig adapter * Blue Billywig Adapter - update according to review feedback * Blue Billywig Adapter - update to try and pass CircleCI * Remove the last for .. of in bluebillywigBidAdapter.js, hopefully... * Update bluebillywigBidAdapter test parameters to match renderer to rendererCode rename * Blue Billywig - Also pass through site config with OpenRTB request * add Blue Billywig adapter * Blue Billywig Adapter - update according to review feedback * Blue Billywig Adapter - update to try and pass CircleCI * Remove the last for .. of in bluebillywigBidAdapter.js, hopefully... * Code quality update, always hit user syncs, improved video params * Remove unnecessary export * Add rendererSettings param to bluebillywig adapter * Kick off CircleCi tests manually Co-authored-by: Klaas-Jan Boon Co-authored-by: Chris Huie * OpenX Bid Adapter: Set Deal ID for video requests (#6573) * 33Across Bid Adapter: add support for User ID modules (#6554) * pubGENIUS bid adapter: support floor module (#6555) * Welect Bid Adapter: update url of API (#6570) * update api url * update api url in tests * Bright Mountain Media Bid Adapter: change bidder code to bmtm; alias old name (#6574) * Adtelligent Bid Adapter: add adUrl support & new alias (#6559) * add adUrl support * add adUrl test * Bright Mountain Media Bid Adapter: Change Endpoint URL (#6576) * tappxBidAdapter: update * tasppxBidAdapter: add video * tappxBidAdapter: update video * tappxBidAdapter: update name interpret banner * tappxBidAdapter: add tests for video * tappxBidAdapter: add adomain * tappxBidAdapter: update adapter version * tappxBidAdapter: update interpretBid adomain and dealid * tappxBidAdapter: update isBidRequestValid * tappxBidAdapter: update tests. Adding video to isBidRequestValid * tappxBidAdapter: update doc .md file * Tappx - Change accept floor module * Tappx - feature simplification * Tappx - remove log * Change version * Try to unrevert bad merge change * Tappx - prebid recomendations and changes * Tappx - CircleCI hotfixes * Tappx - Non important fix * Tappx - Test Coverage * Tappx - CircleCI hotfixes * Tappx - Only USD allowed in module floor + test * Tappx - aesthetic change for uniformity of logs * Tappx - CircleCI hotfixes * Tappx - remove don't used module * Tappx - Change the place and only one let * Tappx - use of beforeEach * Tappx - CircleCI hotfixes Co-authored-by: marc_tappx Co-authored-by: Patrick McCann Co-authored-by: onlsol <48312668+onlsol@users.noreply.github.com> Co-authored-by: vincentproxistore <56686565+vincentproxistore@users.noreply.github.com> Co-authored-by: guiann Co-authored-by: Alexander Co-authored-by: mmoschovas <63253416+mmoschovas@users.noreply.github.com> Co-authored-by: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com> Co-authored-by: Abimael Martinez Co-authored-by: artemiokost Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> Co-authored-by: Rok Sušnik Co-authored-by: Kanchika - Automatad Co-authored-by: Paweł L Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz Co-authored-by: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Co-authored-by: bretg Co-authored-by: Jason Snellbaker Co-authored-by: Lemma Dev <54662130+lemmadev@users.noreply.github.com> Co-authored-by: Abhijit Mane Co-authored-by: matthieularere-msq <63732822+matthieularere-msq@users.noreply.github.com> Co-authored-by: Denis Logachov Co-authored-by: RAJKUMAR NATARAJAN Co-authored-by: Alexander Clouter Co-authored-by: Laura Morillo-Velarde Co-authored-by: Giudici-a <34242194+Giudici-a@users.noreply.github.com> Co-authored-by: Galphimbl Co-authored-by: atkachov Co-authored-by: Jérémie Girault Co-authored-by: Phaneendra Hegde Co-authored-by: Mikael Lundin Co-authored-by: Thomas Co-authored-by: Mike Chowla Co-authored-by: Deivydas Šabaras Co-authored-by: ym-atsymuk <81176595+ym-atsymuk@users.noreply.github.com> Co-authored-by: Skylinar <53079123+Skylinar@users.noreply.github.com> Co-authored-by: Adam Browning <19834421+adam-browning@users.noreply.github.com> Co-authored-by: Catalin Ciocov Co-authored-by: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com> Co-authored-by: readpeaktuomo <66239046+readpeaktuomo@users.noreply.github.com> Co-authored-by: Ignat Khaylov Co-authored-by: nyakove <43004249+nyakove@users.noreply.github.com> Co-authored-by: Mikhail Dykun Co-authored-by: ym-dlabuzov <81709888+ym-dlabuzov@users.noreply.github.com> Co-authored-by: karentnarvaez <61426156+karentnarvaez@users.noreply.github.com> Co-authored-by: Shannon Broekhoven Co-authored-by: nouchy <33549554+nouchy@users.noreply.github.com> Co-authored-by: logicad Co-authored-by: mamatic <52153441+mamatic@users.noreply.github.com> Co-authored-by: Klaas-Jan Boon Co-authored-by: Klaas-Jan Boon Co-authored-by: Chris Huie Co-authored-by: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com> Co-authored-by: Aparna Rao Co-authored-by: Meng <5110935+edmonl@users.noreply.github.com> Co-authored-by: Nick Duitz <42961155+nduitz@users.noreply.github.com> Co-authored-by: BrightMountainMedia <69471268+BrightMountainMediaInc@users.noreply.github.com> Co-authored-by: Gena Co-authored-by: Albert Grandes * Undertone, Unruly, Concert, Adform: stub support for advertiserDomains (#6727) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Delete iasBidAdapter.js * Add files via upload * Update openxBidAdapter.js * Update openxBidAdapter.js * Update concertBidAdapter.js * Update unrulyBidAdapter.js * Update undertoneBidAdapter.js * Update adformBidAdapter.js * Update adformBidAdapter_spec.js * Update unrulyBidAdapter_spec.js * Update concertBidAdapter_spec.js * Update undertoneBidAdapter_spec.js * Update undertoneBidAdapter.js * Update adformBidAdapter_spec.js * Update adformBidAdapter_spec.js * Update undertoneBidAdapter_spec.js * Update adformBidAdapter_spec.js * Update adformBidAdapter_spec.js * Bump hosted-git-info from 2.8.8 to 2.8.9 (#6728) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * VIS.X: add instream video support (#6687) * VIS.X: add instream video support * VIS.X: move video params from bid.params to mediaTypes.video * move reading and writing of the consent string hash for the user id module to after the gdpr checks. if no user id modules will be executed, this value isn't really necessary anyways. (#6551) * Bright Mountain Media Bid Adapter: add video support and refactor (#6607) * Update BrightMountainMedia cookie sync URL * Bright Mountain Media: Update bidder code * Bright Mountain Media: Add brightmountainmedia as alias * Bright Mountain Media: Update Bid Endpoint * Bright Mountain Media: Add support for Video and refactor * Bright Mountain Media Bid Adapter: add video support and refactor * Bright Mountain Media Bid Adapter: add video support and refactor * Bright Mountain Media Bid Adapter: update test coverage * Bright Mountain Media Bid Adapter: fix typo * Bright Mountain Media Bid Adapter: fix example * Bright Mountain Media Bid Adapter: add support for reading video params from ad unit * Bright Mountain Media Bid Adapter: update read video config from bid.mediaTypes.video object * Bright Mountain Media Bid Adapter: update playbackmethod and skip for video params * Bright Mountain Media Bid Adapter: update skip for video params in test * RTB House Bid Adapter: updated supply chain support, included floor module support and identity module support (eids) (#6721) * ParrableIdSystem : Store third-party cookie support status in first-party cookie (#6689) * Add tpcSupport, read it from xxhr and store it in compound cookie * Parse a cookie boolean number (0, 1) as a boolean value * Improve conditions * Add tests * Tests passing * Read the cookie splitting parrableId and params (tpc, tpcUntil) * Adapt tests * Revert linting in test task * Convert Date.now to seconds on reading cookie * Add tests * Replace Math.trunc with Math.floor Co-authored-by: Victor * Bump lodash from 4.17.19 to 4.17.21 (#6722) * Bump lodash from 4.17.19 to 4.17.21 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ViewDeos: add gvlid (#6737) * Revert "ParrableIdSystem : Store third-party cookie support status in first-party cookie (#6689)" (#6735) This reverts commit ca100f4709f0a1d8782f09c159554a9914217653. * Eplanning Bid Adapter: add eids (#6732) * Adkernel: alias for adomega network (#6739) * Update to move fpd data matching from taxonomyname to segtax values (#6679) * Qwarry Bid Adapter: remove gdpr field from request (#6746) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests * GDPR consent string support * NPE fix * gdpr value added * merge master * gdpr value added * qwarry bid adapter: add tests * Qwarry bid adapter: remove gdpr field from request Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev * Halo RTD Module: add publisher params to RTD request (#6742) * add pub provided halo params to rtd request * missing semicolon * halo id url arg update * Prebid Core: Remove size check on native icons and image assets (#6678) * remove image size checking * fix unit tests * Prebid Server Bid Adapter: Bugfix for not taking defaultVendor enabled (#6740) * quick fix for enabled s2s bug * move enabled check outside of defaultVendor if * Prebid 4.39.0 Release * increment pre version * Beachfront Bid Adapter: add schain support (#6751) * add schain support to beachfront adapter * remove unnecessary mock tests for outstream player Co-authored-by: John Salis * fix: Webpack v5 complain about named export from JSON modules (#6755) * Pbs bid adapter: constants import styling for webpack v5 upgrade (#6723) * mapping spotx dealid to bid object * using proper syntax to import default json module * kick off tests * es lint fix Co-authored-by: Danny Khatib Co-authored-by: Chris Huie <3444727+ChrisHuie@users.noreply.github.com> * First Party Data module: Add new module and two submodules to populate defaults and validate ortb2 (#6452) * Creating fpd module * Continued work on FPD module. - Data validation - Pubcid optout check - Misc Fixes * Revert userId update. Committed in error * Added first party data unit tests and fixed bug * Added an unsubscribe for tests to run properly * Reworked logic to use bidderRequests hook to update global/bidder configs instead of subscribing - former method was preventing tests from completing properly * Merge master * Removing unused references. Fixing device data to point to device.h/device.w * Update to include opt out configuration for enrichments/validations * Modified logic to use ortb2 configuration mapping. This will allow for entries to be added/removed/modified from configuration as opposed to be specifically called out in the validation functions * Removed LGTM unneeded defensive code for check on object 'cur' * Remove unused conditional * Fix lint error * Updates to remove currency enrichment as well as optout for user object * Added optout flag to user.yob and user.gender fields * Added test for arbitrary values Added more comments * Broke module out into module and two submodules * Updated cur to validate as an array of strings not just a string Updated comments * Datablocks bid adapter: update adapter to conform to new bid server's format (#6696) * update datablocks bid adapter * remove TODO and fix linting errors * updated readme and changed insights to ortb2 * fixed ortb2 change Co-authored-by: John Mayor * Update to videoCache to include auction Id in vasttrack payload (#6757) * Revert "Datablocks bid adapter: update adapter to conform to new bid server's format (#6696)" (#6763) This reverts commit 2b8f888dc11d727f49867309f37e492d65eaee96. * clarify dependency on global rtdModule (#6759) As discussed with David from Permutive * Update to PBS bid adapter for video bids, pass along w and h respectively and filter out contxt and playerSize params as PBS does not use them (#6682) * Sovrn and Sharethrough Bid Adapters: support for advertiserDomains (#6764) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Delete iasBidAdapter.js * Add files via upload * Update openxBidAdapter.js * Update openxBidAdapter.js * Update sovrnBidAdapter.js * Update sharethroughBidAdapter.js * Update sharethroughBidAdapter_spec.js * Update sovrnBidAdapter_spec.js * Update sovrnBidAdapter_spec.js * Update sharethroughBidAdapter_spec.js * Update sharethroughBidAdapter_spec.js * Update sharethroughBidAdapter_spec.js * ucfunnel Bid Adapter: add support for FLoC and Verizon Media ConnectID (#6744) * Add a new ucfunnel Adapter and test page * Add a new ucfunnel Adapter and test page * 1. Use prebid lib in the repo to keep updated 2. Replace var with let 3. Put JSON.parse(JSON.stringify()) into try catch block * utils.getTopWindowLocation is a function * Change to modules from adapters * Migrate to module design * [Dev Fix] Remove width and height which can be got from ad unit id * Update ucfunnelBidAdapter to fit into new spec * Correct the endpoint. Fix the error of query string * Add test case for ucfunnelBidAdapter * Fix lint error * Update version number * Combine all checks on bid request * Add GDPR support for ucfunnel adapter * Add in-stream video and native support for ucfunnel adapter * Remove demo page. Add more test cases. * Change request method from POST to GET * Remove unnecessary comment * Support vastXml and vastUrl for video request * update TTL to 30 mins * Avoid using arrow function which is not discuraged in mocha * ucfunnel tdid support * ucfunnel fix error message in debug mode * ucfunnel adapter add bidfloor parameter * ucfunnel adapter support CCPA * ucfunnel adapter native support clicktrackers * ucfunnel adapter change cookie sync setting * ucfunnel adapter update request parameter * Update ucfunnelBidAdapter * ucfunnel adapter add currency in ad response * ucfunnel adapter support uid2 * ucfunnel Bid Adapter: add support for FLoC and Verizon Media ConnectID Co-authored-by: root Co-authored-by: Ryan Chou Co-authored-by: ucfunnel Co-authored-by: jack.hsieh * Permutive Rtd Submodule: register submodule in submodules list (#6768) * Beachfront Bid Adapter: update beachfront example docs (#6774) Co-authored-by: John Salis * Eplanning Bid Adapter: Adjust endpoint parameter formatting (#6772) * Beachfront Bid Adapter: add Unified ID 2.0 support (#6770) * appnexus bid adapter - create stub for meta.advertiserDomains (#6753) * Conversant adapter - picks up additional params from mediaTypes.video (#6775) * Relaido Adapter : size of the banner is checked and the banner can be bid on. (#6776) * add relaido adapter * remove event listener * fixed UserSyncs and e.data * fix conflicts * take size each mediaType Co-authored-by: ishigami_shingo Co-authored-by: cmertv-sishigami Co-authored-by: t_bun * ZetaSspBidAdapter fix typo (#6777) Co-authored-by: Surovenko Alexey * Adagio Bid Adapter: handle meta.advertiserDomains (and more) (#6781) Related to #6650 * PubMatic Adapter: add support for FloCID (#6749) * changes to support native in pubmaticbid adapter * Removed port from endpoint * Removed protocol from endpoint * Formatting * Fix request payload * Updated test case * Changed request and response as per ortb spec * Change in request and response * Removed comments and extra code * Code Review comments * Code Review Comments and Test cases for request and response * Removed data type as all data asset types are handled * Code Review Changes * Code Review Comments * Supporting both banner and native and sending 0x0 in case of native * Bug Fixes * Bug response not processed by prebid * Change warning message * Fixed typo * Do not send request in case of invalid native bid * Do not send request in case of invalid native requests * objects converted to strings in log for debug purposes * Fixed logic to check for required parmas * Fixed typo for stringify * documentation for native * Review comments from Prebid * Typo * Typo * Updated pub id for native * Code Review * Support for pubid * Test Cases for PubCommonId in PubMatic adapter * Delete yarn.lock * Rename adaptermanager.js to adapterManager.js * Rename yieldNexusBidAdapter.js to yieldnexusBidAdapter.js * Rename yieldNexusBidAdapter.md to yieldnexusBidAdapter.md * Rename yieldNexusBidAdapter_spec.js to yieldnexusBidAdapter_spec.yieldnexusBidAdaptera * Rename yieldnexusBidAdapter_spec.yieldnexusBidAdaptera to yieldnexusBidAdapter_spec.js * bluebillywig outstream player support in pubmatic adapter * removed pubcommon id test cases * BBW Renderer * Pubmatic should work with provided renderer * Review Comments * changes for flocId * code review comments * fixed for eids * code review comments * unit test cases for floc * updated md file * code review comment * TrustX Bid Adapter: added additional sync url (#6771) * Bucksense Bid Adapter: add adomain to adapter (#6779) * Update bucksenseBidAdapter.js Added support for advertiserDomains * Update bucksenseBidAdapter_spec.js Co-authored-by: Patrick McCann * Update to PBS Bid Adapter and RP Bid Adapter to pass PBJS version in auction requests (#6767) * AOL Bid Adapter: Remove client side support for already deprecated endpoint floor support (#6743) * tappx Bid Adapter: update isBidRequestValid and fix request url (#6761) * UPDATE: add initial UID * UPDATE: UID change user ext * UPDATE: UID clean logs * UPDATE: add host info * UPDATE: tappx bid adapter universal id * UPDATE: fix bidder param * UPDATE: tappxBidAdapter tests * tappxBidAdapter - fix spacing * tappxBidAdapter: add test user eids array * tappxBidAdapter: update eids array * FIX: package-lock.json * Conversant adapter: add adomain, remove digitrust (#6495) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Update conversantBidAdapter.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Rads Bid Adapter: add GDPR support & user sync support (#6455) * Proxistore Bid Adapter: add cookieless url endpoint & use floor module (#6427) * use floor module * call cookieless endpoint when necessary * test endpoint url * change url endpoint * delete console log * fix tests * add language to url * use ortb interface * unit test * update test unit * create proxistore module * add unit tests and documentation * delete modules * delete module * add proxistore rtd submodule * delete proxistore module * spacing * change url * AdYoulike Bid Adapter: Add an "Insertion" tracking for Native mediatype (#6481) * add insertion event * add missing campaign ID parameter * update unit test with new tracking checked * Dspx Bid Adapter : add user sync support (#6456) * Add sync support for dspx adapter * Dspx Bid Adapter : add user sync support Co-authored-by: Alexander * Multibid Module: add new module to handle multiple bids from single bidder & update rubicon adapter (#6404) * Multibid module - create new module - Expands the number of key value pairs going to the ad server in the normal Prebid way by establishing the concept of a "dynamic alias" First commit * Continued updates from 1st commit * Adding logWarn for filtered bids * Update to include passing multibid configuration to PBS requests * Update to rubicon bid adapter to pass query param rp_maxbids value taken from bidderRequest.bidLimit * Update to config to look for camelcase property names according to spec. These convert to all lowercase when passed to PBS endpoint * Adjust RP adapter to always include maxbids value - default is 1 * Added support for bidders array in multibid config * Fixed floor comparison to be <= bid cpm as oppossed to just < bid cpm. Updated md file to fix camelCase tpyo * Update to include originalBidderRequest in video call to prebid cache * Update to ignore adpod bids from multibid and allow them to return as normal bids * Adding uid2 to submodules.json (#6508) * NextRoll ID System: add new ID module (#6396) * Add Nextroll ID Module * Add nextroll to eids * Make configuration value names consistent with Adapter Module * Use parnerId instead of sellerId * Add nextroll to userId and eids md files * Remove storage configuration * Rename nextroll -> nextrollId * Add nextrollId to common ID specs * Qwarry Bid Adapter: add GDPR and consent string handling (#6489) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests * GDPR consent string support * NPE fix Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> * Zemanta Bid Adapter: add support for new params & consent strings to usersync URL (#6468) * add gvl id to spec * add support for bcat and badv params * add consent strings to usersync url * add bcat and badv params to doc * Automatad Bid Adapter: Add meta.advertiserDomains to bid response (#6509) * added bid meta with advertiserDomains * Adhese Bid Adapter: add support for caching video content (#6501) * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * adpod category support test * Revert "adpod category support test" This reverts commit 70a3cf2ad5db94757addd9e08c3a083caca282d0. * Adhese Bid Adapter: cache video content Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz * update apacdex unit test to disable debug mode (#6511) * Telaria: not setting adid (#6507) * Prebid 4.33.0 Release * increment pre version * rubicon: removing maxduration as a required bidder parameter (#6513) * Zemanta adapter: add advertiserDomains (#6517) * Lemma Bid Adapter: accepting the floor to use the getFloor function (#6497) * lemmaBidAdapter.js Added lemma bid adapter file * lemmaBidAdapter.md Added lemma bid adapter md file * lemmaBidAdapter_spec.js Added lemma bid adapter test spec file * Update lemmaBidAdapter.js Fixed automated code review alert comparison between inconvertible types * Update lemmaBidAdapter.js Fixed review changes * Update lemmaBidAdapter.md Correct parameter value. * Update lemmaBidAdapter.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter_spec.js Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.md Lemma Bid Adapter - v3.0 compliance * Update lemmaBidAdapter.js Added user sync support into bid adapter. * updated include modules file extension. updated include modules js file extension. * Update lemmaBidAdapter_spec.js Added unit test for user sync feature. * Update lemmaBidAdapter.js Fixed format error. * Update lemmaBidAdapter_spec.js Fixed format error and typo error. * Set mediaType key value into bid object Set mediaType key value into the bid object. * Update lemmaBidAdapter.js remove duplicate function * Update lemmaBidAdapter.js Remove non supported code. * Update lemmaBidAdapter_spec.js Remove GDPR test cases. * Update lemmaBidAdapter.js Made changes for accepting the floor to use the getFloor function * Update lemmaBidAdapter.js correct undefined keyword name. * Update lemmaBidAdapter_spec.js Added test coverage floor value * Update lemmaBidAdapter.js Remove trailing spaces on lines 379 and 381. * Update lemmaBidAdapter_spec.js Added getFloor function test case changes, Please review it. * Update lemmaBidAdapter_spec.js * Update lemmaBidAdapter.js * Update lemmaBidAdapter.js Fixed lint issue. * Update lemmaBidAdapter_spec.js Fixed test cases. * Update lemmaBidAdapter_spec.js Made suggested changes. Please review it. Co-authored-by: Abhijit Mane * Mediasquare Bid Adapter: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event (#6480) * Mediasquare bidder: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event * Mediasquare bidder: fix getUserSyncs issue with empty bids + add metrics to onBidWon Event * removing status as it does not seem populated when called * add tests * Update nextroll ID variable name to match published ID module (#6519) * Merkle User ID Module: updates to user id submodule (#6503) * AdKernel Bid/Analytics Adapters: user privacy related changes (#6488) * SynacorMedia: remove adId from the bid response (#6520) * Rubicon: making doc data types consistent (#6526) * Synacormedia Bid Adapter: add meta.advertiserDomains (#6527) * Adloox Analytics Adapter: add new analytics adapter (#6308) * gulp: fix supplying list of browsers to test against The following now works: gulp test --browserstack --nolint --nolintfix --browsers=bs_ie_11_windows_10 --file 'test/spec/modules/adloox{AnalyticsAdapter,AdServerVideo,RtdProvider}_spec.js' * instreamTracking: unit test tidy From @robertrmartinez in https://github.com/prebid/Prebid.js/pull/6308#issuecomment-810537538 * adloaderStub: expose stub for other unit tests to use From @robertrmartinez in https://github.com/prebid/Prebid.js/pull/6308#issuecomment-810537538 * Adloox analytic module * Seedtag adapter: Fixing bug preventing to receive the right params onTimeout. (#6525) * adot bid adapter: add publisher path from bidder config to endpoint url (#6476) * Admixer ID System: add userId submodule (#6238) * Migrating to Prebid 1.0 * Migrating to Prebid 1.0 * Fix spec * add gdpr and usp * remove changes in gdpr_hello_world.html * Update gdpr_hello_world.html add spaces * add user syncs * remove comments * tests * admixer id system * admixer id system * admixer id system eids.md userId.md * admixer id system .submodules.json * admixer id system Co-authored-by: atkachov * PBJS Core: call custom render func after loadscript if provided (#6422) * Pubxai Analytics Adapter: bug fixes and code revamp (#6474) * Updated PubxAiAnalytics adapter - Bug fixes and Code restructuring * Updated endpoint URLs * Changed array.includes to array.indexOf to fix IE issue * Code cleanup and changes as suggested. * Updated browser testing order and edge browser token * PBJS Core: canBidderRegisterSync ignoring iframe sync disabled by default (#6535) * Update eids.js * Update eids_spec.js * Update eids.js * Update pubmaticBidAdapter_spec.js * Update eids.js * Update eids_spec.js * Update conversantBidAdapter_spec.js * Update rubiconBidAdapter_spec.js * Update conversantBidAdapter_spec.js * Delete test/spec/adapters directory * Update userId_spec.js * Update userSync.js * Update userSync_spec.js * Added automatic tzo and targetId to adserver request. (#6534) * Impactify Bid Adapter: add new bid adapter (#6518) * Add impactify adapter with MD file * Add impactify adapter * Prebid 4.34.0 Release * Increment pre version * Prebid server adapter: add config for openx hosting (#6530) * Yieldmo adapter: add meta data to bids (#6550) * Smartx Bid Adapter: Add meta.advertiserDomains support (#6547) * Onevideo / Adap.tv Adapter: updated example configuration (#6546) * Mass Deal Rendering Module: support multiple custom configs for dealId and rendering (#6500) * ZetaSsp Bid Adapter: add new bid adapter (#6432) * Adnuntius Bid Adapter: Fix for bid too low. (#6557) * Added automatic tzo and targetId to adserver request. * Fixing issues with bid price being too low. * Fixing issues with bid price being too low. * ReadPeak Bid Adapter: fix api issues, add gdpr consent, & getfloor module support (#6548) * BetweenBidAdatper: added sharedid support (#6531) * adWMG Bid Adapter: update endpoints for cookie sync (#6544) * Support floorCPM parameter, fix some minor bugs * fix space-in-parens circleci error * example fix * clean usersync URL * spaces * spaces * add new unit tests, compatibility with IE11 * remove logInfo * Check for floorCPM value * Check params before sending * New endpoints * code format * new endpoint for cookie sync * update tests Co-authored-by: Mikhail Dykun * Yieldmo Bid Adapter: add support for the floors module (#6541) * Sortable Bid Adapter: add eids support (#6565) * Add Sortable adapter for Prebid 3.x Update tests to reflect changes. * Add .js in imports * hostname not host: don't include port * Trivial change to trigger build: failure wasn't our adapter * More failures in other adapters * PR Feedback - use https for URL - fix examples in markdown - request to endpoint should work now * Feedback: add native and video examples * Update unit tests Co-authored-by: Shannon Broekhoven * Outbrain Bid Adapter: replacing Zemanta (#6558) * Sirdata Real-time Data Module: add new RTD module (#6515) * Logicad Bid Adapter: add support for userid modules (#6529) * ATS-identityLinkIdSystem - add use3P config property to control firing of 3P envelope endpoint (#6568) * Proxistore Bid Adapter: add support for tcf v2 consent (#6543) * use tcf v2 consent * set cosentGiven to false and test Gdpr api v2 * BlueBillyWig Bid Adapter: add renderer customization options (#6540) * add Blue Billywig adapter * Blue Billywig Adapter - update according to review feedback * Blue Billywig Adapter - update to try and pass CircleCI * Remove the last for .. of in bluebillywigBidAdapter.js, hopefully... * Update bluebillywigBidAdapter test parameters to match renderer to rendererCode rename * Blue Billywig - Also pass through site config with OpenRTB request * add Blue Billywig adapter * Blue Billywig Adapter - update according to review feedback * Blue Billywig Adapter - update to try and pass CircleCI * Remove the last for .. of in bluebillywigBidAdapter.js, hopefully... * Code quality update, always hit user syncs, improved video params * Remove unnecessary export * Add rendererSettings param to bluebillywig adapter * Kick off CircleCi tests manually Co-authored-by: Klaas-Jan Boon Co-authored-by: Chris Huie * OpenX Bid Adapter: Set Deal ID for video requests (#6573) * 33Across Bid Adapter: add support for User ID modules (#6554) * pubGENIUS bid adapter: support floor module (#6555) * Welect Bid Adapter: update url of API (#6570) * update api url * update api url in tests * Bright Mountain Media Bid Adapter: change bidder code to bmtm; alias old name (#6574) * Adtelligent Bid Adapter: add adUrl support & new alias (#6559) * add adUrl support * add adUrl test * Bright Mountain Media Bid Adapter: Change Endpoint URL (#6576) * tappxBidAdapter: update * tasppxBidAdapter: add video * tappxBidAdapter: update video * tappxBidAdapter: update name interpret banner * tappxBidAdapter: add tests for video * tappxBidAdapter: add adomain * tappxBidAdapter: update adapter version * tappxBidAdapter: update interpretBid adomain and dealid * tappxBidAdapter: update isBidRequestValid * tappxBidAdapter: update tests. Adding video to isBidRequestValid * tappxBidAdapter: update doc .md file * tappxBidAdapter: update isBidRequestValid * tappxBidAdapter: update ads sizes available * tappxBidAdapter: update isBidRequestValid * tappxBidAdapter: update host depending tappx endpoint * tappxBidAdapter: update tappx adapter version * tappxBidAdapter: add EOL * revert outbrain cahnges to untrack in this pr * tappxBidAdapter: update isBidRequestValid tests * tappxBidAdapter: fix circleci error Co-authored-by: marc_tappx Co-authored-by: Patrick McCann Co-authored-by: onlsol <48312668+onlsol@users.noreply.github.com> Co-authored-by: vincentproxistore <56686565+vincentproxistore@users.noreply.github.com> Co-authored-by: guiann Co-authored-by: Alexander Co-authored-by: mmoschovas <63253416+mmoschovas@users.noreply.github.com> Co-authored-by: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com> Co-authored-by: Abimael Martinez Co-authored-by: artemiokost Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> Co-authored-by: Rok Sušnik Co-authored-by: Kanchika - Automatad Co-authored-by: Paweł L Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz Co-authored-by: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Co-authored-by: bretg Co-authored-by: Jason Snellbaker Co-authored-by: Lemma Dev <54662130+lemmadev@users.noreply.github.com> Co-authored-by: Abhijit Mane Co-authored-by: matthieularere-msq <63732822+matthieularere-msq@users.noreply.github.com> Co-authored-by: Denis Logachov Co-authored-by: RAJKUMAR NATARAJAN Co-authored-by: Alexander Clouter Co-authored-by: Laura Morillo-Velarde Co-authored-by: Giudici-a <34242194+Giudici-a@users.noreply.github.com> Co-authored-by: Galphimbl Co-authored-by: atkachov Co-authored-by: Jérémie Girault Co-authored-by: Phaneendra Hegde Co-authored-by: Mikael Lundin Co-authored-by: Thomas Co-authored-by: Mike Chowla Co-authored-by: Deivydas Šabaras Co-authored-by: ym-atsymuk <81176595+ym-atsymuk@users.noreply.github.com> Co-authored-by: Skylinar <53079123+Skylinar@users.noreply.github.com> Co-authored-by: Adam Browning <19834421+adam-browning@users.noreply.github.com> Co-authored-by: Catalin Ciocov Co-authored-by: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com> Co-authored-by: readpeaktuomo <66239046+readpeaktuomo@users.noreply.github.com> Co-authored-by: Ignat Khaylov Co-authored-by: nyakove <43004249+nyakove@users.noreply.github.com> Co-authored-by: Mikhail Dykun Co-authored-by: ym-dlabuzov <81709888+ym-dlabuzov@users.noreply.github.com> Co-authored-by: karentnarvaez <61426156+karentnarvaez@users.noreply.github.com> Co-authored-by: Shannon Broekhoven Co-authored-by: nouchy <33549554+nouchy@users.noreply.github.com> Co-authored-by: logicad Co-authored-by: mamatic <52153441+mamatic@users.noreply.github.com> Co-authored-by: Klaas-Jan Boon Co-authored-by: Klaas-Jan Boon Co-authored-by: Chris Huie Co-authored-by: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com> Co-authored-by: Aparna Rao Co-authored-by: Meng <5110935+edmonl@users.noreply.github.com> Co-authored-by: Nick Duitz <42961155+nduitz@users.noreply.github.com> Co-authored-by: BrightMountainMedia <69471268+BrightMountainMediaInc@users.noreply.github.com> Co-authored-by: Gena Co-authored-by: Chris Huie <3444727+ChrisHuie@users.noreply.github.com> * Qwarry Bid Adapter: add sizes (#6787) * qwarry bid adapter * formatting fixes * fix tests for qwarry * qwarry bid adapter * add header for qwarry bid adapter * bid requests fix * fix tests * response fix * fix tests for Qwarry bid adapter * add pos parameter to qwarry bid adapter * qwarryBidAdapter onBidWon hotfix * Change bidder endpoint url for Qwarry adapter * add referer JS detection * use bidderRequest.refererInfo * fix tests * GDPR consent string support * NPE fix * gdpr value added * merge master * gdpr value added * qwarry bid adapter: add tests * Qwarry bid adapter: remove gdpr field from request * qwarry bid adapter: add sizes * qwarry bid adapter: add sizes Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev * Medianet bid adapter: floor module support (#6713) * Medianet floor module support * removing backslash from wildcard * add adomain support (#6791) Co-authored-by: Ignat Khaylov * Beachfront Bid Adapter: add floors module support (#6752) * add price floors support to beachfront adapter * revert doc changes to create separate pull request Co-authored-by: John Salis * Zeta Ssp Bid Adapter: merge fpd.device and params.device (#6786) * pubGENIUS bid adapter: read more video params from mediaTypes.video (#6793) * Remove camel case for adserver.adslot value in RP Analytics Adapter (#6795) * Prebid 4.40.0 Release * Increment pre version * CCX Bid Adapter: add support for mediatypes video parameters (#6736) * adomain support * adomain support * adomain support * adomain support * adomain support * video params * docs changes * Index Exchange Bid Adapter: adds support for floc (#6758) * InvibesBidAdapter - multiposition support & support for multiple id modules (#6506) * appnexus bid adapter: add support for flocid (#6801) * appnexus bid adapter: add support for uid2 (#6802) * Delete xhbBidAdapter.js * Restore xhb (#6803) * EMX Digital Bid Adapter: floor module and advertiserDomain support (#6805) * Index Exchange Bid Adapter: coppa support, dealid & ttl field updates (#6782) * set bidderRequestId to be a string in r.id * set coppa value in r.reqs.coppa * added support for seat[].bid[].exp ttl value * read dealid from openrtb first, then fallback to ext * use utils.isInteger Co-authored-by: Kajan Umakanthan Co-authored-by: punkiller * Update permutiveRtdProvider.md (#6810) Updated to reflect current audience connector support. * Conversant adapter - add support for the floor module (#6798) * JW Player RTD Module - dev doc improvements (#6811) * update OpenX adapter to support mediaTypes.video and gpid (#6813) * SynacorMedia Bid Adapter: Add userID support (#6790) * SynacorMedia Bid Adapter: Add userID support * SynacorMedia Bid Adapter: User ID Support - Remove an unncessary conditional and use indexOf vs includes for IE11 support * VIS.X: change tracking win & pending url's (#6815) * Ogury Bid Adapter: add new adapter (#6729) * ParrableIdSystem: Store third-party cookie support status in first-party cookie (#6741) * Add tpcSupport, read it from xxhr and store it in compound cookie * Parse a cookie boolean number (0, 1) as a boolean value * Improve conditions * Add tests * Tests passing * Read the cookie splitting parrableId and params (tpc, tpcUntil) * Adapt tests * Revert linting in test task * Convert Date.now to seconds on reading cookie * Add tests * Replace Math.trunc with Math.floor * kick off test * unfollowed local fork, kick off test * Increase cookie expire time to 20s Co-authored-by: Victor Co-authored-by: Chris Huie <3444727+ChrisHuie@users.noreply.github.com> * update ID5 docs for PD string links (#6824) * Adagio Bid Adapter: decrease adapter weight (#6699) * PubMatic Adapter : Support For Video Params from AdUnit MediaTypes (#6773) * Fill currency parameters for Kobler adapter. (#6825) * Adf Bid Adapter: banner and video media type support added (#6726) * Trion bid adapter: support for meta advertiserDomains (#6829) * Adding files associated with the trion adapter update to the newest prebid version(1.0). * Updating pull request with safer checks for user sync and general clean up/consistency of tests. * removing a call to bidder code for pull request review. also removing the test that requires it * there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params. * Revert "there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params." This reverts commit 324d15785fb61c92db9c0a37f1001f47721e3a25. * there were some changes to the bid factory after our initial release that we didn't account for. Changing adapter to account for response body and required params. * adding safety checks to Trion adapter * Sending up to trion endpoint if there is bot traffic or the browser tab is not visible. * sending the wrong param in the test. * Trion test cleanup. returning document and window states to their original form after tests. * Trion test cleanup. using before and after to alter window and document objects in tests. * re-adding trion adapter to prebid project to stop using deprecated function for page url for 3.0 release * minor formatting change * accept size array from media types banner over the sizes array from pubs. * updating trion bid adapter to be us privacy and gdpr compliant * encoding consent strings for test * Trion adapter update. Changing request params to trion including removing support for optional 're' param, cleaning up existing params to send 1/0 instead of null when non is present and adding prebid version. * adding support for meta advertiserDomains in trion bid adapter for future use Co-authored-by: Mike Groh * Release Drafter: update to minor as the default (#6827) * Sonobi bid adapter: add support for gpid and set advertiserDomains (#6826) * added gpid to sonobi bidder adapter. It tries to get the gpt ad unit code * added advertiser domain to bid meta * Eplanning Bid Adapter: verify getUserIds exists and is a function; add adomain support (#6832) * Dgkeyword Rtd Provider: add new real-time data submodule (#6410) * add dgkeywordRtdProvider * change access url * we change not to access real url. and one test case delete because of the changing. * update test code. update api access using ajax() * update test code * set keywords using setBidderConfig in ortb2. * change test code for circle CI Co-authored-by: Patrick McCann * Revert "Dgkeyword Rtd Provider: add new real-time data submodule (#6410)" (#6837) This reverts commit e97db76c9288c82f849b9456b017ab010843b1a4. Co-authored-by: Olivier * NativoBidAdapter - Added new QS param to the bid request endpoint (#6838) * Initial nativoBidAdapter document creation (js, md and spec) * Fulling working prebid using nativoBidAdapter. Support for GDPR and CCPA in user syncs. * Added defult size settings based on the largest ad unit. Added response body validation. Added consent to request url qs params. * Changed bidder endpoint url * Changed double quotes to single quotes. * Reverted package-json.lock to remove modifications from PR * Added optional bidder param 'url' so the ad server can force- match an existing placement * Lint fix. Added space after if. * Added new QS param to send various adUnit data to adapter endpopint * Updated unit test for new QS param * Vuukle bid adapter: support for meta advertiserDomains (#6839) * add vuukle adapter * add readme * doc: add email * Vuukle bid adapter: support for meta advertiserDomains * add support for advertiser domains and other bid meta (#6842) Co-authored-by: John Salis * Prebid Core: Check for stale rendering (#6707) * Check for stale rendering * Check for stale rendering - code review changes * tappx Bid Adapter: fix wrong regex and gdpr bug (#6834) * tappxBidAdapter: hotfix gdpr url param * tappxBidAdapter: update version * tappxBidAdapter: update regex errors * Adyoulike bid adapter - improvements on Native case (#6831) * add required clickurl in every native adrequest * allows the native response to be given as is to prebid if possible * add unit tests on new Native case * Zeta Ssp Bid Adapter: Improve user sync logic (#6835) * Mediasquare Bid Adapter: support advertiserDomains (#6843) * Mediasquare Bid Adapter: support advertiserDomains * Update mediasquareBidAdapter.js * add unit tests * fix unit test * fix string single quote * Apacdex Bid Adapter: add support for me… * Adding au and mt in logger and tracker * Changed array to object * Removed code converting bidder to lowercase * Logging au and mt in logger and tracker * Removed reference for owpbjs from specs * changes to initialise a module configured from the page for OW profile (#477) * Added support for logging floor parameter * Added default value for fmv as undefined * changes from latest version of quantcast ID module (#481) * added function to store user identity object (#480) * Moved fmv, ft and fskp field on slot level * Moved fmv, ft and fskp to impression level * Moved fskp field on slot level * Updated test cases for floor logger change * Removed unwanted code * Added log message when Video.Placement property is not available * Added constant for message and checked for empty value * Removed commented code * Fixed review comments * Added Adunit along with message * Updated test cases for video placement missing scenario * Replaced bid.ext.BidType with bid.ext.bidType * Updated test case with key as bidType * Replaced bidType with bidtype * Merge Nightly4.x to nightly (#496) * code added * do not refer to pbjs.adUnits; better keep copy from auctionInit * for openerap ssetup we can remove the old KVs before refreshing the slot * code snippet macro fix * typo fix * fixing typo * added limitation * typo is fixed * added isfunction checks on PWT APIs * merge sso changes to pbjs nightly4.x (#491) * add function onSSOLogin to capture PII information * fixed linting errors and added test cases for onSSOLogin function * changes to facebook login status api * changes to support fb login in firefox * add timeout for fb script only for the first time * changed log stmts Co-authored-by: Harshad Mane Co-authored-by: kapil-tuptewar <91458408+kapil-tuptewar@users.noreply.github.com> * Changed the version of faker in package json Co-authored-by: pm-shashank-jain <40654031+pm-shashank-jain@users.noreply.github.com> Co-authored-by: ardit-baloku <77985953+ardit-baloku@users.noreply.github.com> Co-authored-by: msm0504 <51493331+msm0504@users.noreply.github.com> Co-authored-by: Mark Monday Co-authored-by: bretg Co-authored-by: Scott Menzer Co-authored-by: jsnellbaker <31102355+jsnellbaker@users.noreply.github.com> Co-authored-by: Patrick McCann Co-authored-by: Kotaro Shikata Co-authored-by: mamatic <52153441+mamatic@users.noreply.github.com> Co-authored-by: Ian Flournoy Co-authored-by: Victor Co-authored-by: Rich Audience Co-authored-by: sgimenez Co-authored-by: Robert Ray Martinez III Co-authored-by: mefjush Co-authored-by: Catalin Ciocov Co-authored-by: harpere Co-authored-by: Denis Logachov Co-authored-by: Eric Harper Co-authored-by: Skylinar <53079123+Skylinar@users.noreply.github.com> Co-authored-by: smartclip AdTechnology Co-authored-by: Gino Cirlini Co-authored-by: SKOCHERI <37454420+SKOCHERI@users.noreply.github.com> Co-authored-by: skocheri Co-authored-by: Nepomuk Seiler Co-authored-by: Adprime <64427228+Adprime@users.noreply.github.com> Co-authored-by: Aigolkin1991 Co-authored-by: Aiholkin Co-authored-by: shikharsharma-zeotap Co-authored-by: nyakove <43004249+nyakove@users.noreply.github.com> Co-authored-by: Mikhail Dykun Co-authored-by: Ian Flournoy Co-authored-by: Harshad Mane Co-authored-by: mmoschovas <63253416+mmoschovas@users.noreply.github.com> Co-authored-by: bjorn-lw <32431346+bjorn-lw@users.noreply.github.com> Co-authored-by: Lemma Dev <54662130+lemmadev@users.noreply.github.com> Co-authored-by: ix-certification Co-authored-by: Ix-Prebid-Support Co-authored-by: Missena <78362128+dev-missena@users.noreply.github.com> Co-authored-by: Nick Llerandi Co-authored-by: Brandon Ling <51931757+blingster7@users.noreply.github.com> Co-authored-by: Brandon Ling Co-authored-by: Pooja Pasawala Co-authored-by: Mathieu Pheulpin Co-authored-by: lowendavid <66423906+lowendavid@users.noreply.github.com> Co-authored-by: iskmerof Co-authored-by: Matt Kendall <1870166+mkendall07@users.noreply.github.com> Co-authored-by: pnh-pubx <73683023+pnh-pubx@users.noreply.github.com> Co-authored-by: Phaneendra Hegde Co-authored-by: TheMediaGrid <44166371+TheMediaGrid@users.noreply.github.com> Co-authored-by: prebidtappx <77485538+prebidtappx@users.noreply.github.com> Co-authored-by: marc_tappx Co-authored-by: guiann Co-authored-by: Guillaume Co-authored-by: David Reischer Co-authored-by: Gena Co-authored-by: jsut Co-authored-by: Steve Alliance Co-authored-by: Steve Alliance Co-authored-by: Luis Co-authored-by: Steve Alliance Co-authored-by: Steve Alliance Co-authored-by: steve-a-districtm Co-authored-by: Steve Alliance Co-authored-by: Thomas Skaarnes Nikitin <48713095+thomas-netric@users.noreply.github.com> Co-authored-by: lksharma Co-authored-by: YerkovichM <48519843+YerkovichM@users.noreply.github.com> Co-authored-by: myerkovich Co-authored-by: Marko Yerkovich Co-authored-by: Marko Yerkovich Co-authored-by: WlsLogan <77974248+WlsLogan@users.noreply.github.com> Co-authored-by: Paweł Cejrowski Co-authored-by: li-ran <70167305+li-ran@users.noreply.github.com> Co-authored-by: Ran Li Co-authored-by: amykwyang Co-authored-by: Jason Snellbaker Co-authored-by: matthieularere-msq <63732822+matthieularere-msq@users.noreply.github.com> Co-authored-by: Samuel Adu Co-authored-by: Damyan Co-authored-by: Ben Anderson Co-authored-by: Anderson, Ben Co-authored-by: Vladimir Fedoseev Co-authored-by: afsheenb Co-authored-by: Afsheen Bigdeli Co-authored-by: nllerandi3lift <75995508+nllerandi3lift@users.noreply.github.com> Co-authored-by: Mike Chowla Co-authored-by: KazuakiM Co-authored-by: César Fernández Co-authored-by: ysfbsf Co-authored-by: Olivier Co-authored-by: iprom-adserver <79305981+iprom-adserver@users.noreply.github.com> Co-authored-by: Gašper Žagar Co-authored-by: jackhsiehucf <77815341+jackhsiehucf@users.noreply.github.com> Co-authored-by: PWyrembak Co-authored-by: Justas Pupelis Co-authored-by: Justas Co-authored-by: Salomon Rada Co-authored-by: vladi-mmg Co-authored-by: JulieLorin Co-authored-by: Laura Morillo-Velarde Co-authored-by: Carlos Barreiro Mata Co-authored-by: Adam Browning <19834421+adam-browning@users.noreply.github.com> Co-authored-by: Ryan Schweitzer <50628828+r-schweitzer@users.noreply.github.com> Co-authored-by: Pierre Turpin Co-authored-by: Karim Mourra Co-authored-by: karimJWP Co-authored-by: pm-azhar-mulla <75726247+pm-azhar-mulla@users.noreply.github.com> Co-authored-by: rtuschkany <35923908+rtuschkany@users.noreply.github.com> Co-authored-by: evanmsmrtb Co-authored-by: JonGoSonobi Co-authored-by: Scott Menzer Co-authored-by: thuyhq <61451682+thuyhq@users.noreply.github.com> Co-authored-by: novatiq <79258366+novatiq@users.noreply.github.com> Co-authored-by: lasloche <62240785+lasloche@users.noreply.github.com> Co-authored-by: Nick Jacob Co-authored-by: hybrid-ai <58724131+hybrid-ai@users.noreply.github.com> Co-authored-by: Petrov Denis Co-authored-by: Yevhenii Melnyk Co-authored-by: Aleksa Trajkovic Co-authored-by: susyt Co-authored-by: Chris Huie Co-authored-by: Daniel Liebner Co-authored-by: Nick Peceniak Co-authored-by: Nick Peceniak Co-authored-by: BizzClick <73241175+BizzClick@users.noreply.github.com> Co-authored-by: pro-nsk <32703851+pro-nsk@users.noreply.github.com> Co-authored-by: Artem Kostritsa Co-authored-by: Alexander Kascheev Co-authored-by: SmartyAdsSSP <41569976+SmartyAdsSSP@users.noreply.github.com> Co-authored-by: Junus Co-authored-by: Eric Brown Co-authored-by: Eric Brown Co-authored-by: hanna Co-authored-by: hannapanova190119 <71532550+hannapanova190119@users.noreply.github.com> Co-authored-by: Jozef Bartek <31618107+jbartek25@users.noreply.github.com> Co-authored-by: massadmin <58946787+massadmin@users.noreply.github.com> Co-authored-by: César Fernández Co-authored-by: Jeremie Patonnier Co-authored-by: Gaby Co-authored-by: Léo <51166933+SublimeLeo@users.noreply.github.com> Co-authored-by: fgcloutier Co-authored-by: Léo GRAND Co-authored-by: IOTiagoFaria <76956619+IOTiagoFaria@users.noreply.github.com> Co-authored-by: invibes <51820283+invibes@users.noreply.github.com> Co-authored-by: Hai Lee Co-authored-by: punkiller Co-authored-by: Bernhard Valenti Co-authored-by: Amit Aisikowitz <7425067+pixelgroup-israel@users.noreply.github.com> Co-authored-by: h12media <65672347+h12media@users.noreply.github.com> Co-authored-by: Stephen Johnston Co-authored-by: Kenan Gillet <1706856+kenan-gillet@users.noreply.github.com> Co-authored-by: Yohan Boutin Co-authored-by: AdDefend Co-authored-by: Mitschi Co-authored-by: sourbh-doceree <65942945+sourbh-doceree@users.noreply.github.com> Co-authored-by: el-chuck Co-authored-by: Bernhard Pickenbrock Co-authored-by: onlsol <48312668+onlsol@users.noreply.github.com> Co-authored-by: vincentproxistore <56686565+vincentproxistore@users.noreply.github.com> Co-authored-by: Alexander Co-authored-by: Abimael Martinez Co-authored-by: artemiokost Co-authored-by: Rok Sušnik Co-authored-by: Kanchika - Automatad Co-authored-by: Paweł L Co-authored-by: Tim Sturtewagen Co-authored-by: Mateusz Co-authored-by: pramod pisal Co-authored-by: pm-shashank-jain Co-authored-by: Jaimin Panchal Co-authored-by: travisbeale Co-authored-by: Ankit Prakash Co-authored-by: David Andersen Co-authored-by: Index Exchange 3 Prebid Team Co-authored-by: nwlosinski Co-authored-by: Itay Nave <38345760+itaynave@users.noreply.github.com> Co-authored-by: binoy-chitale Co-authored-by: DeepthiNeeladri Co-authored-by: Valentin Souche Co-authored-by: Alex Khmelnitsky Co-authored-by: Oleg Naydenov Co-authored-by: Montu Thakore Co-authored-by: Deepak Sahu Co-authored-by: PubMatic-OpenWrap Co-authored-by: manisha Co-authored-by: Manasi Co-authored-by: Nick Co-authored-by: Rigel Cheng Co-authored-by: Michael Griego Co-authored-by: yuvalgg <57989766+yuvalgg@users.noreply.github.com> Co-authored-by: Drilon Kastrati Co-authored-by: fgcloutier Co-authored-by: Jesús Alberto Polo García Co-authored-by: Jesus Alberto Polo Garcia Co-authored-by: BrightMountainMedia <69471268+BrightMountainMediaInc@users.noreply.github.com> Co-authored-by: Stephan Brosinski Co-authored-by: Monis Qadri Co-authored-by: monis.q Co-authored-by: Dan Co-authored-by: ghguo Co-authored-by: vingood Co-authored-by: jsut Co-authored-by: Amanda Dillon <41923726+agdillon@users.noreply.github.com> Co-authored-by: Clément besse Co-authored-by: Zak Andree Co-authored-by: Ignat Khaylov Co-authored-by: Ignat Khaylov Co-authored-by: mimenet <64042452+mimenet@users.noreply.github.com> Co-authored-by: Aleksandr Štšepelin Co-authored-by: Maxime Lequain Co-authored-by: Maxime Lequain Co-authored-by: Baptiste HAUDEGAND Co-authored-by: Isaac A. Dettman Co-authored-by: Neelanjan Sen <14229985+Fawke@users.noreply.github.com> Co-authored-by: René Baudisch Co-authored-by: Hugo Duthil Co-authored-by: Hugo Duthil Co-authored-by: Renzo Toscani <7190938+rtoscani@users.noreply.github.com> Co-authored-by: liranbaruch Co-authored-by: hamper Co-authored-by: tadam75 Co-authored-by: tadam Co-authored-by: Jakub Dlouhý Co-authored-by: Jakub Dlouhý Co-authored-by: karel koule Co-authored-by: Lukáš Havrlant Co-authored-by: Niksok Co-authored-by: Thomas Ladd Co-authored-by: chammon Co-authored-by: s.shevtsov Co-authored-by: mmprebid <67095277+mmprebid@users.noreply.github.com> Co-authored-by: Nitin Kumar Co-authored-by: arnav Co-authored-by: arnav Co-authored-by: kero75 <72736014+kero75@users.noreply.github.com> Co-authored-by: Karim El Shabrawy Co-authored-by: Andrea Cannuni <57228257+ACannuniRP@users.noreply.github.com> Co-authored-by: Bret Gorsline Co-authored-by: r-ishigami <62228392+r-ishigami@users.noreply.github.com> Co-authored-by: cmertv-sishigami Co-authored-by: roygiladi <58809838+roygiladi@users.noreply.github.com> Co-authored-by: Paul Yang Co-authored-by: John Rosendahl Co-authored-by: John Rosendahl Co-authored-by: Rahul Shandilya <67756716+c3p-0@users.noreply.github.com> Co-authored-by: omerBrowsi <54346241+omerBrowsi@users.noreply.github.com> Co-authored-by: Anthony Lauzon Co-authored-by: omerdotan Co-authored-by: sdao-tl <49252703+sdao-tl@users.noreply.github.com> Co-authored-by: Sy Dao Co-authored-by: slimkrazy Co-authored-by: Mike Chowla Co-authored-by: Anand Venkatraman Co-authored-by: Scott Laufer Co-authored-by: Ivan J Co-authored-by: Michael Co-authored-by: Mike Sperone Co-authored-by: Michael Sperone Co-authored-by: Krushmedia <71434282+Krushmedia@users.noreply.github.com> Co-authored-by: etargetse <40423120+etargetse@users.noreply.github.com> Co-authored-by: Denis Logachov Co-authored-by: John Salis Co-authored-by: John Salis Co-authored-by: gpolaert Co-authored-by: Nicholas Colletti <34142758+ncolletti@users.noreply.github.com> Co-authored-by: Will Chapin Co-authored-by: colbertk <50499465+colbertk@users.noreply.github.com> Co-authored-by: colbertk Co-authored-by: Kevin Zhou Co-authored-by: kzhouTL <43545828+kzhouTL@users.noreply.github.com> Co-authored-by: OneTagDevOps <38786435+OneTagDevOps@users.noreply.github.com> Co-authored-by: francesco Co-authored-by: Kylian Deau Co-authored-by: Aparna Rao Co-authored-by: Gleb Glushtsov Co-authored-by: Gleb Glushtsov Co-authored-by: Gleb Glushtsov Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: Aparna Hegde Co-authored-by: terryc33x <64039851+terryc33x@users.noreply.github.com> Co-authored-by: Terry Chen Co-authored-by: lunamedia <73552749+lunamedia@users.noreply.github.com> Co-authored-by: Lyubomir Shishkov <61063794+lyubomirshishkov@users.noreply.github.com> Co-authored-by: redaguermas Co-authored-by: Reda Guermas Co-authored-by: Dan Bogdan <43830380+EMXDigital@users.noreply.github.com> Co-authored-by: Nick Colletti Co-authored-by: Nick Colletti Co-authored-by: Kiyoshi Hara Co-authored-by: Dan Bogdan Co-authored-by: Jherez Taylor Co-authored-by: EMXDigital Co-authored-by: Meng <5110935+edmonl@users.noreply.github.com> Co-authored-by: rimaburder-index <55195208+rimaburder-index@users.noreply.github.com> Co-authored-by: Filip Stamenkovic Co-authored-by: koji-eguchi <50477903+DAC-KOJI-EGUCHI@users.noreply.github.com> Co-authored-by: Telaria Engineering <36203956+telariaEng@users.noreply.github.com> Co-authored-by: robdubois <53589945+robdubois@users.noreply.github.com> Co-authored-by: sumit116 Co-authored-by: Artem Seryak Co-authored-by: Jonathan Mullins Co-authored-by: htang555 Co-authored-by: Bryan DeLong Co-authored-by: dpapworth-qc <50959025+dpapworth-qc@users.noreply.github.com> Co-authored-by: Roman Co-authored-by: Margaret Liu Co-authored-by: TJ Eastmond Co-authored-by: DJ Rosenbaum Co-authored-by: adxpremium <55161519+adxpremium@users.noreply.github.com> Co-authored-by: Jimmy Tu Co-authored-by: Pierre-Antoine Durgeat Co-authored-by: ujuettner Co-authored-by: Max Crawford Co-authored-by: Pascal S Co-authored-by: Léonard Labat Co-authored-by: sdbaron Co-authored-by: djaxbidder <55269794+djaxbidder@users.noreply.github.com> Co-authored-by: turktelssp <54801433+turktelssp@users.noreply.github.com> Co-authored-by: nkmt <45026101+strong-zero@users.noreply.github.com> Co-authored-by: Mutasem Aldmour Co-authored-by: Adasta Media <55529969+Adasta2019@users.noreply.github.com> Co-authored-by: Konduit <55142865+konduit-dev@users.noreply.github.com> Co-authored-by: TinchoF <50110327+TinchoF@users.noreply.github.com> Co-authored-by: Jaimin Panchal <7393273+jaiminpanchal27@users.noreply.github.com> Co-authored-by: Sergio Co-authored-by: Wayne Yang Co-authored-by: Cody Bonney Co-authored-by: hdeodhar <35999856+hdeodhar@users.noreply.github.com> Co-authored-by: Oz Weiss Co-authored-by: Janko Ulaga Co-authored-by: thomas-33across <44033452+thomas-33across@users.noreply.github.com> Co-authored-by: Finteza Analytics <45741245+finteza@users.noreply.github.com> Co-authored-by: Vadim Mazzherin Co-authored-by: Hendrik Iseke <39734979+hiseke@users.noreply.github.com> Co-authored-by: Eyas Ranjous Co-authored-by: hbanalytics <55453525+hbanalytics@users.noreply.github.com> Co-authored-by: Michael Kuryshev Co-authored-by: Roffray Co-authored-by: rumesh Co-authored-by: oasis <2394426+bmwcmw@users.noreply.github.com> Co-authored-by: romanantropov <45817046+romanantropov@users.noreply.github.com> Co-authored-by: vrtcal-dev <50931150+vrtcal-dev@users.noreply.github.com> Co-authored-by: 7XBID00 <52267720+7XBID00@users.noreply.github.com> Co-authored-by: Tomas Kovtun Co-authored-by: Jonathan Mullins Co-authored-by: ucfunnel <39581136+ucfunnel@users.noreply.github.com> Co-authored-by: skazedo Co-authored-by: 胡雨軒 Петр Co-authored-by: Konrad Dulemba Co-authored-by: Mariya Mego <31904600+mash-a@users.noreply.github.com> Co-authored-by: Daniel Cassidy Co-authored-by: kpis-msa <50609476+kpis-msa@users.noreply.github.com> Co-authored-by: Marcian123 Co-authored-by: koji-eguchi <50477903+koji-eguchi@users.noreply.github.com> Co-authored-by: sourabhg Co-authored-by: Alexis Andrieu Co-authored-by: Vlad Gurgov Co-authored-by: Richard Lee <14349+dlackty@users.noreply.github.com> Co-authored-by: Alex Co-authored-by: Vladislav Yatsun Co-authored-by: Rich Snapp Co-authored-by: Rade Popovic <32302052+nanointeractive@users.noreply.github.com> Co-authored-by: Matt Quirion Co-authored-by: rhythmonebhaines <49991465+rhythmonebhaines@users.noreply.github.com> Co-authored-by: Alex Pashkov Co-authored-by: Veronica Kim <43146383+vkimcm@users.noreply.github.com> Co-authored-by: songtungmtp <57524426+songtungmtp@users.noreply.github.com> Co-authored-by: z-sunshine <33084773+z-sunshine@users.noreply.github.com> Co-authored-by: Sander Co-authored-by: Moshe Moses Co-authored-by: mwehr-zeta <70167335+mwehr-zeta@users.noreply.github.com> Co-authored-by: jdwieland8282 Co-authored-by: Mehmet Can Kurt Co-authored-by: Udi Talias ⚛️ Co-authored-by: roman Co-authored-by: Elijah Valenciano Co-authored-by: relaido <63339139+relaido@users.noreply.github.com> Co-authored-by: ishigami_shingo Co-authored-by: t_bun Co-authored-by: SmartyAdman <59048845+SmartyAdman@users.noreply.github.com> Co-authored-by: minoru katogi Co-authored-by: minoru katogi Co-authored-by: ADman Media Co-authored-by: SmartyAdman Co-authored-by: Manasi Moghe Co-authored-by: Azhar Co-authored-by: Dmitriy Labuzov Co-authored-by: Dmitriy Labuzov Co-authored-by: fawke Co-authored-by: Garth Poitras <411908+gpoitch@users.noreply.github.com> Co-authored-by: gpoitch Co-authored-by: Jurij Sinickij Co-authored-by: haxmediagithub <74675750+haxmediagithub@users.noreply.github.com> Co-authored-by: GeoEdge-r-and-d <72186958+GeoEdge-r-and-d@users.noreply.github.com> Co-authored-by: daniel manan Co-authored-by: wojciech-bialy-wpm <67895844+wojciech-bialy-wpm@users.noreply.github.com> Co-authored-by: Wojciech Biały Co-authored-by: Tucker <72400387+MenelikTucker-districtm@users.noreply.github.com> Co-authored-by: Galphimbl Co-authored-by: atkachov Co-authored-by: mobfxoHB <74364234+mobfxoHB@users.noreply.github.com> Co-authored-by: Avimobi <34269094+Avimobi@users.noreply.github.com> Co-authored-by: Prebid Manager <49466873+Prebid-Manager@users.noreply.github.com> Co-authored-by: apuzanova Co-authored-by: Nicholas Llerandi Co-authored-by: Slind14 Co-authored-by: steve-a-districtm <56413795+steve-a-districtm@users.noreply.github.com> Co-authored-by: Menelik Tucker Co-authored-by: David Carver <54326287+ndxcarver@users.noreply.github.com> Co-authored-by: Jenine Drew <2839303+jeninedrew@users.noreply.github.com> Co-authored-by: Vinay Prasad Co-authored-by: Vinay Prasad Co-authored-by: Reinout Stevens Co-authored-by: Reinout Stevens Co-authored-by: Paul de Rosanbo Co-authored-by: jxdeveloper1 <71084096+jxdeveloper1@users.noreply.github.com> Co-authored-by: cpuBird <54024689+cpuBird@users.noreply.github.com> Co-authored-by: olafbuitelaar Co-authored-by: Hiroaki Kubota Co-authored-by: Mathieu Pheulpin Co-authored-by: Michael Duran Co-authored-by: Egor Gordeev <48566506+egsgordeev@users.noreply.github.com> Co-authored-by: Rok Sušnik Co-authored-by: Vadim Gush Co-authored-by: readpeaktuomo <66239046+readpeaktuomo@users.noreply.github.com> Co-authored-by: reemeng <29702905+reemeng@users.noreply.github.com> Co-authored-by: Newton <5769156+iamnewton@users.noreply.github.com> Co-authored-by: Lisa Benmore Co-authored-by: BertiBauer <14088844+BertiBauer@users.noreply.github.com> Co-authored-by: Scott Floam Co-authored-by: Pub-X <63354024+Pub-X@users.noreply.github.com> Co-authored-by: chino117 Co-authored-by: root Co-authored-by: Ryan Chou Co-authored-by: jack.hsieh Co-authored-by: Vidyome <35255015+vidyome@users.noreply.github.com> Co-authored-by: RAJKUMAR NATARAJAN Co-authored-by: Rajkumar Natarajan Co-authored-by: noamtzuberi Co-authored-by: Mark Co-authored-by: ksanksana Co-authored-by: Michael Moschovas Co-authored-by: Egor Gordeev Co-authored-by: Veronica Kim Co-authored-by: yegorWaardex <59033363+yegorWaardex@users.noreply.github.com> Co-authored-by: yegorheiz Co-authored-by: Maurice Roach Co-authored-by: supportGothamad <75782642+supportGothamad@users.noreply.github.com> Co-authored-by: Mike Marcus Co-authored-by: Kajan Umakanthan Co-authored-by: Bill Newman Co-authored-by: Vladislav Isaiko Co-authored-by: Rakesh Balakrishnan Co-authored-by: Julian Hollmann Co-authored-by: Herb Dombrowski <32455795+hrb-d@users.noreply.github.com> Co-authored-by: Nemanja Rajkovic Co-authored-by: Liza Kobrazova Co-authored-by: samuel-palmer-relevant-digital <77437973+samuel-palmer-relevant-digital@users.noreply.github.com> Co-authored-by: Shashank Co-authored-by: Max Duval Co-authored-by: AdmixerTech <35560933+AdmixerTech@users.noreply.github.com> Co-authored-by: Carlos Felix Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhijit Mane Co-authored-by: Alexander Clouter Co-authored-by: Giudici-a <34242194+Giudici-a@users.noreply.github.com> Co-authored-by: Jérémie Girault Co-authored-by: Phaneendra Hegde Co-authored-by: Mikael Lundin Co-authored-by: Thomas Co-authored-by: Deivydas Šabaras Co-authored-by: ym-atsymuk <81176595+ym-atsymuk@users.noreply.github.com> Co-authored-by: asurovenko-zeta <80847074+asurovenko-zeta@users.noreply.github.com> Co-authored-by: ym-dlabuzov <81709888+ym-dlabuzov@users.noreply.github.com> Co-authored-by: karentnarvaez <61426156+karentnarvaez@users.noreply.github.com> Co-authored-by: Shannon Broekhoven Co-authored-by: nouchy <33549554+nouchy@users.noreply.github.com> Co-authored-by: logicad Co-authored-by: Klaas-Jan Boon Co-authored-by: Klaas-Jan Boon Co-authored-by: Nick Duitz <42961155+nduitz@users.noreply.github.com> Co-authored-by: Albert Grandes Co-authored-by: rtbh-lotani <83652735+rtbh-lotani@users.noreply.github.com> Co-authored-by: Chris Huie <3444727+ChrisHuie@users.noreply.github.com> Co-authored-by: hdwmsconfig Co-authored-by: John Salis Co-authored-by: Javier Marín Co-authored-by: Danny Khatib Co-authored-by: Danny Khatib Co-authored-by: John Mayor Co-authored-by: ucfunnel Co-authored-by: Surovenko Alexey Co-authored-by: Stefano <50023896+bkse-stefanodechicchis@users.noreply.github.com> Co-authored-by: mjaworskiccx <50406214+mjaworskiccx@users.noreply.github.com> Co-authored-by: rcheptanariu <35690143+rcheptanariu@users.noreply.github.com> Co-authored-by: Steven Francolla Co-authored-by: Brian Schmidt Co-authored-by: pratik-synacor <64602199+pratik-synacor@users.noreply.github.com> Co-authored-by: Jonathan Nadarajah <50102657+jogury@users.noreply.github.com> Co-authored-by: Bendegúz Ács <30595431+acsbendi@users.noreply.github.com> Co-authored-by: Mike Groh Co-authored-by: Mike Groh Co-authored-by: Seba Perez Co-authored-by: mediaconsortium-develop <76139568+mediaconsortium-develop@users.noreply.github.com> Co-authored-by: jsfledd Co-authored-by: Steffen Anders Co-authored-by: Ekaterina Legostaeva Co-authored-by: onetag-dev <38786435+onetag-dev@users.noreply.github.com> Co-authored-by: Andrzej Michnowski Co-authored-by: Marcin Muras Co-authored-by: Andrzej Michnowski Co-authored-by: arasaki-yuki <35788388+arasaki-yuki@users.noreply.github.com> Co-authored-by: Roman Shevchenko Co-authored-by: Itay Nave Co-authored-by: hendrikiseke1979 <53309111+hendrikiseke1979@users.noreply.github.com> Co-authored-by: Volk, Rainer Co-authored-by: RainerVolk4014 <53347752+RainerVolk4014@users.noreply.github.com> Co-authored-by: siggi-otto <57615762+siggi-otto@users.noreply.github.com> Co-authored-by: Hendrik Iseke Co-authored-by: Arne Schulz Co-authored-by: Alexandru Co-authored-by: Jake Miller Co-authored-by: hnkhandev <57697206+hnkhandev@users.noreply.github.com> Co-authored-by: Jonas Gresens <5290643+jgresens@users.noreply.github.com> Co-authored-by: Sleiman Jneidi Co-authored-by: Estavillo Co-authored-by: Estavillo Co-authored-by: Lisa Benmore Co-authored-by: Norbert Włosiński Co-authored-by: Marco Cosentino <807030+cosenmarco@users.noreply.github.com> Co-authored-by: Marco Cosentino Co-authored-by: Vladyslav Laktionov Co-authored-by: Maxime DEYMÈS <47388595+MaxSmileWanted@users.noreply.github.com> Co-authored-by: Eugeniy Orlov Co-authored-by: Mikhail Ivanchenko Co-authored-by: Michael Callari Co-authored-by: Paris Holley Co-authored-by: Renato Aguilar <41385245+raguilar-ias@users.noreply.github.com> Co-authored-by: llays Co-authored-by: Andrew Lays Co-authored-by: yieldlift <61510052+yieldlift@users.noreply.github.com> Co-authored-by: César Fernández Co-authored-by: Mirko Rean <3244291+mirkorean@users.noreply.github.com> Co-authored-by: EddieYu <32135564+eddieyu1998@users.noreply.github.com> Co-authored-by: arkan303 Co-authored-by: PavlaKanova <47967518+PavlaKanova@users.noreply.github.com> Co-authored-by: Tobias von Klipstein Co-authored-by: Julian Hollmann Co-authored-by: Md. Abu Talha Co-authored-by: Witek Galecki <49022890+wgalecki@users.noreply.github.com> Co-authored-by: Kapil Tuptewar Co-authored-by: kapil-tuptewar <91458408+kapil-tuptewar@users.noreply.github.com> --- .babelrc.js | 2 +- .circleci/config.yml | 4 +- .eslintrc.js | 1 - .github/release-drafter.yml | 28 + .github/workflows/release-drafter.yml | 18 + CONTRIBUTING.md | 6 +- PR_REVIEW.md | 117 +- README.md | 27 +- RELEASE_SCHEDULE.md | 83 +- allowedModules.js | 4 +- browsers.json | 4 +- gulpfile.js | 39 +- integrationExamples/gpt/adUnitFloors.html | 112 + integrationExamples/gpt/adloox.html | 211 + .../gpt/audigentSegments_example.html | 257 - .../gpt/creative_rendering.html | 7 +- integrationExamples/gpt/digitrust_Full.html | 222 - integrationExamples/gpt/digitrust_Simple.html | 230 - .../gpt/digitrust_cmp_test.html | 192 - integrationExamples/gpt/gdpr_hello_world.html | 26 +- .../gpt/haloRtdProvider_example.html | 125 + .../gpt/idImportLibrary_example.html | 352 + integrationExamples/gpt/ixMultiFormat.html | 117 + .../gpt/jwplayerRtdProvider_example.html | 108 + .../gpt/optimeraRtdProvider_example.html | 152 + .../gpt/permutiveRtdProvider_example.html | 232 + .../gpt/prebidServer_example.html | 2 +- .../reconciliationRtdProvider_example.html | 102 + .../gpt/sirdataRtdProvider_example.html | 146 + integrationExamples/gpt/userId_example.html | 540 +- integrationExamples/mass/index.html | 132 + .../postbid/postbid_prebidServer_example.html | 86 + integrationExamples/reviewerTools/index.html | 40 + karma.conf.maker.js | 10 + modules.json | 2 +- modules/.submodules.json | 36 +- modules/33acrossBidAdapter.js | 587 +- modules/33acrossBidAdapter.md | 146 +- modules/a4gBidAdapter.js | 92 + modules/a4gBidAdapter.md | 18 +- modules/ablidaBidAdapter.js | 23 +- modules/ablidaBidAdapter.md | 42 +- modules/adWMGBidAdapter.js | 319 + modules/adWMGBidAdapter.md | 35 + modules/adagioBidAdapter.js | 1092 +- modules/adagioBidAdapter.md | 114 +- modules/adblender.md | 36 + modules/adbookpspBidAdapter.js | 796 + modules/adbookpspBidAdapter.md | 191 + modules/adbutlerBidAdapter.js | 11 +- modules/adbutlerBidAdapter.md | 5 +- modules/addefendBidAdapter.js | 79 + modules/addefendBidAdapter.md | 43 + ...mOpenRTBBidAdapter.js => adfBidAdapter.js} | 135 +- ...mOpenRTBBidAdapter.md => adfBidAdapter.md} | 51 +- modules/adformBidAdapter.js | 37 +- modules/adhashBidAdapter.js | 102 + modules/adhashBidAdapter.md | 43 + modules/adheseBidAdapter.js | 79 +- modules/adkernelAdnAnalyticsAdapter.js | 29 +- modules/adkernelAdnBidAdapter.js | 87 +- modules/adkernelBidAdapter.js | 112 +- modules/adlooxAnalyticsAdapter.js | 288 + modules/adlooxAnalyticsAdapter.md | 146 + modules/admanBidAdapter.js | 15 +- modules/admixerBidAdapter.js | 40 +- modules/admixerIdSystem.js | 92 + modules/adnowBidAdapter.js | 178 + modules/adnowBidAdapter.md | 46 + modules/adnuntiusBidAdapter.js | 97 +- modules/adoceanBidAdapter.js | 5 +- modules/adotBidAdapter.js | 161 +- modules/adotBidAdapter.md | 145 +- modules/adponeBidAdapter.js | 56 +- modules/adprimeBidAdapter.js | 27 +- modules/adrelevantisBidAdapter.js | 603 + modules/adrelevantisBidAdapter.md | 120 + modules/adriverBidAdapter.js | 188 + modules/adriverBidAdapter.md | 20 + modules/adtargetBidAdapter.js | 5 +- modules/adtelligentBidAdapter.js | 52 +- modules/adtrueBidAdapter.js | 639 + modules/adtrueBidAdapter.md | 36 + modules/aduptechBidAdapter.js | 374 +- modules/aduptechBidAdapter.md | 87 +- modules/adxcgBidAdapter.js | 415 +- modules/adxcgBidAdapter.md | 138 +- modules/adxpremiumAnalyticsAdapter.js | 3 +- modules/adyoulikeBidAdapter.js | 308 +- modules/adyoulikeBidAdapter.md | 66 +- modules/amxBidAdapter.js | 393 + modules/amxBidAdapter.md | 37 + modules/andbeyondBidAdapter.md | 32 - modules/aniviewBidAdapter.js | 35 +- modules/aolBidAdapter.js | 70 +- modules/apacdexBidAdapter.js | 375 + modules/apacdexBidAdapter.md | 104 + modules/appnexusAnalyticsAdapter.js | 3 +- modules/appnexusBidAdapter.js | 213 +- modules/appnexusBidAdapter.md | 2 +- modules/apstreamBidAdapter.js | 490 + modules/apstreamBidAdapter.md | 111 + modules/astraoneBidAdapter.js | 17 +- modules/astraoneBidAdapter.md | 292 +- modules/atsAnalyticsAdapter.js | 313 +- modules/atsAnalyticsAdapter.md | 1 - modules/audienceNetworkBidAdapter.js | 307 - modules/audienceNetworkBidAdapter.md | 49 - modules/audigentRtdProvider.js | 141 - modules/audigentRtdProvider.md | 52 - modules/automatadBidAdapter.js | 56 +- modules/avocetBidAdapter.js | 6 +- modules/axonixBidAdapter.js | 185 + modules/axonixBidAdapter.md | 140 + modules/beachfrontBidAdapter.js | 126 +- modules/beachfrontBidAdapter.md | 24 +- modules/betweenBidAdapter.js | 43 +- modules/bidViewability.js | 97 + modules/bidViewability.md | 49 + modules/bidglassBidAdapter.js | 60 +- modules/bidscubeBidAdapter.js | 90 + modules/bidscubeBidAdapter.md | 30 + modules/bizzclickBidAdapter.js | 326 + modules/bizzclickBidAdapter.md | 83 +- modules/bluebillywigBidAdapter.js | 202 +- modules/boldwinBidAdapter.js | 110 + modules/boldwinBidAdapter.md | 53 + modules/bridgewellBidAdapter.js | 62 +- modules/bridgewellBidAdapter.md | 6 +- modules/brightMountainMediaBidAdapter.js | 163 + modules/brightMountainMediaBidAdapter.md | 111 + modules/brightcomBidAdapter.js | 28 +- modules/britepoolIdSystem.js | 20 +- modules/britepoolIdSystem.md | 4 +- modules/browsiRtdProvider.js | 128 +- modules/browsiRtdProvider.md | 55 + modules/bucksenseBidAdapter.js | 6 +- modules/buzzoolaBidAdapter.js | 6 +- modules/buzzoolaBidAdapter.md | 42 +- modules/ccxBidAdapter.js | 17 +- modules/ccxBidAdapter.md | 58 +- modules/cleanmedianetBidAdapter.js | 3 +- modules/cointrafficBidAdapter.js | 101 + modules/cointrafficBidAdapter.md | 31 + modules/coinzillaBidAdapter.js | 6 +- modules/colombiaBidAdapter.js | 2 +- modules/colossussspBidAdapter.js | 29 +- modules/concertAnalyticsAdapter.js | 120 + modules/concertAnalyticsAdapter.md | 11 + modules/concertBidAdapter.js | 212 + modules/concertBidAdapter.md | 37 + modules/connectadBidAdapter.js | 108 +- modules/consentManagement.js | 96 +- modules/consentManagementUsp.js | 97 +- modules/consumableBidAdapter.js | 1 + modules/conversantBidAdapter.js | 38 +- modules/conversantBidAdapter.md | 10 +- modules/cpmstarBidAdapter.js | 39 +- modules/craftBidAdapter.js | 5 +- modules/criteoBidAdapter.js | 34 +- modules/criteoBidAdapter.md | 2 +- modules/criteoIdSystem.js | 34 +- modules/datablocksBidAdapter.js | 6 +- modules/decenteradsBidAdapter.js | 90 + modules/deepintentBidAdapter.js | 12 + modules/deepintentDpesIdSystem.js | 45 + modules/deepintentDpesIdSystem.md | 43 + modules/dfpAdServerVideo.js | 43 +- modules/dgkeywordRtdProvider.js | 134 + modules/dgkeywordRtdProvider.md | 29 + modules/digiTrustIdSystem.js | 460 - modules/digiTrustIdSystem.md | 156 - modules/districtmDMXBidAdapter.js | 183 +- modules/districtmDmxBidAdapter.md | 61 +- modules/dmdIdSystem.js | 58 + modules/dmdIdSystem.md | 26 + modules/docereeBidAdapter.js | 65 + modules/docereeBidAdapter.md | 33 + modules/dspxBidAdapter.js | 129 +- modules/emx_digitalBidAdapter.js | 54 +- modules/engageyaBidAdapter.js | 133 + modules/engageyaBidAdapter.md | 68 + modules/enrichmentFpdModule.js | 107 + modules/eplanningBidAdapter.js | 68 +- modules/etargetBidAdapter.js | 40 +- modules/fabrickIdSystem.js | 183 + modules/fabrickIdSystem.md | 24 + modules/feedadBidAdapter.js | 16 +- modules/feedadBidAdapter.md | 3 - modules/flocIdSystem.js | 110 + modules/flocIdSystem.md | 34 + modules/fpdModule/index.js | 58 + modules/fpdModule/index.md | 46 + modules/freewheel-sspBidAdapter.js | 68 +- modules/gamoshiBidAdapter.js | 46 +- modules/gamoshiBidAdapter.md | 2 +- modules/gdprEnforcement.js | 321 +- modules/geoedgeRtdProvider.js | 213 + modules/geoedgeRtdProvider.md | 67 + modules/gjirafaBidAdapter.js | 119 + modules/gjirafaBidAdapter.md | 89 +- modules/glimpseBidAdapter.js | 15 +- modules/glomexBidAdapter.js | 89 + modules/glomexBidAdapter.md | 32 + modules/gmosspBidAdapter.js | 36 +- modules/gnetBidAdapter.js | 101 + modules/gnetBidAdapter.md | 33 + modules/gothamadsBidAdapter.js | 342 + modules/gothamadsBidAdapter.md | 104 + modules/gptPreAuction.js | 103 + modules/gridBidAdapter.js | 388 +- modules/gridBidAdapter.md | 3 +- modules/gridNMBidAdapter.js | 38 +- modules/gumgumBidAdapter.js | 178 +- modules/gumgumBidAdapter.md | 92 +- modules/h12mediaBidAdapter.js | 208 +- modules/haloIdSystem.js | 77 + modules/haloIdSystem.md | 32 + modules/haloRtdProvider.js | 192 + modules/haloRtdProvider.md | 123 + modules/haxmediaBidAdapter.js | 107 + modules/haxmediaBidAdapter.md | 72 + modules/hybridBidAdapter.js | 64 +- modules/hybridBidAdapter.md | 184 + modules/iasRtdProvider.js | 124 + modules/iasRtdProvider.md | 9 + modules/id5AnalyticsAdapter.js | 304 + modules/id5AnalyticsAdapter.md | 42 + modules/id5IdSystem.js | 284 +- modules/id5IdSystem.md | 68 + modules/idImportLibrary.js | 243 + modules/idImportLibrary.md | 22 + modules/idLibrary.js | 243 + modules/idLibrary.md | 22 + modules/identityLinkIdSystem.js | 64 +- modules/idxIdSystem.js | 61 + modules/idxIdSystem.md | 22 + modules/impactifyBidAdapter.js | 260 + modules/impactifyBidAdapter.md | 35 + modules/improvedigitalBidAdapter.js | 83 +- modules/inmarBidAdapter.js | 110 + modules/inmarBidAdapter.md | 44 + modules/inskinBidAdapter.js | 16 +- modules/instreamTracking.js | 114 + modules/intentIqIdSystem.js | 168 + modules/interactiveOffersBidAdapter.js | 162 + modules/interactiveOffersBidAdapter.md | 12 +- modules/invamiaBidAdapter.js | 88 + modules/invamiaBidAdapter.md | 30 + modules/invibesBidAdapter.js | 436 +- modules/ipromBidAdapter.js | 79 + modules/ipromBidAdapter.md | 34 + modules/ironsourceBidAdapter.js | 251 + modules/ironsourceBidAdapter.md | 51 + modules/ixBidAdapter.js | 725 +- modules/ixBidAdapter.md | 166 +- modules/jixieBidAdapter.js | 264 + modules/jixieBidAdapter.md | 73 + modules/justpremiumBidAdapter.js | 7 +- modules/jwplayerRtdProvider.js | 282 + modules/jwplayerRtdProvider.md | 125 + modules/kargoBidAdapter.js | 41 +- modules/koblerBidAdapter.js | 238 + modules/koblerBidAdapter.md | 67 + modules/krushmediaBidAdapter.js | 123 + modules/krushmediaBidAdapter.md | 80 + modules/kubientBidAdapter.js | 111 + modules/kubientBidAdapter.md | 26 + modules/lemmaBidAdapter.js | 65 +- modules/liveIntentIdSystem.js | 112 +- modules/livewrappedAnalyticsAdapter.js | 120 +- modules/livewrappedAnalyticsAdapter.md | 22 + modules/livewrappedBidAdapter.js | 56 +- modules/livewrappedBidAdapter.md | 4 +- modules/lkqdBidAdapter.js | 10 + modules/lockerdomeBidAdapter.js | 5 +- modules/loganBidAdapter.js | 118 + modules/loganBidAdapter.md | 72 + modules/logicadBidAdapter.js | 5 +- modules/logicadBidAdapter.md | 55 +- modules/lotamePanoramaIdSystem.js | 84 +- modules/lunamediaBidAdapter.js | 28 +- modules/lunamediaBidAdapter.md | 6 +- modules/lunamediahbBidAdapter.js | 107 + modules/lunamediahbBidAdapter.md | 72 + modules/luponmediaBidAdapter.js | 21 +- modules/malltvBidAdapter.js | 119 + modules/malltvBidAdapter.md | 68 + modules/mantisBidAdapter.js | 102 +- modules/marsmediaBidAdapter.js | 171 +- modules/mass.js | 184 + modules/mass.md | 137 + modules/mediaforceBidAdapter.js | 310 +- modules/mediaforceBidAdapter.md | 33 + modules/mediagoBidAdapter.js | 375 + modules/mediagoBidAdapter.md | 33 + modules/medianetAnalyticsAdapter.js | 338 +- modules/medianetBidAdapter.js | 123 +- modules/medianetBidAdapter.md | 214 +- modules/mediasquareBidAdapter.js | 26 +- modules/merkleIdSystem.js | 125 + modules/missenaBidAdapter.js | 94 + modules/missenaBidAdapter.md | 70 + modules/mobfoxpbBidAdapter.js | 99 + modules/mobfoxpbBidAdapter.md | 72 + modules/multibid/index.js | 234 + modules/multibid/index.md | 40 + modules/mwOpenLinkIdSystem.js | 142 + modules/mwOpenLinkIdSystem.md | 43 + modules/nativoBidAdapter.js | 322 + modules/nativoBidAdapter.md | 40 + modules/netIdSystem.js | 4 +- modules/nextMillenniumBidAdapter.js | 72 +- modules/nextMillenniumBidAdapter.md | 4 +- modules/nextrollBidAdapter.js | 2 +- modules/nextrollIdSystem.js | 50 + modules/nobidBidAdapter.js | 56 +- modules/novatiqIdSystem.js | 88 + modules/novatiqIdSystem.md | 36 + modules/oguryBidAdapter.js | 135 + modules/oguryBidAdapter.md | 35 + modules/oneVideoBidAdapter.js | 208 +- modules/oneVideoBidAdapter.md | 336 +- modules/onetagBidAdapter.js | 146 +- modules/onomagicBidAdapter.js | 23 +- modules/ooloAnalyticsAdapter.js | 547 + modules/ooloAnalyticsAdapter.md | 24 + modules/openxAnalyticsAdapter.js | 863 +- modules/openxAnalyticsAdapter.md | 10 +- modules/openxBidAdapter.js | 147 +- modules/openxBidAdapter.md | 4 +- modules/optimeraRtdProvider.js | 188 + modules/optimeraRtdProvider.md | 44 + modules/optimonAnalyticsAdapter.js | 25 + modules/optimonAnalyticsAdapter.md | 13 + modules/orbidderBidAdapter.js | 46 +- modules/outbrainBidAdapter.js | 288 + modules/outbrainBidAdapter.md | 111 + modules/ozoneBidAdapter.js | 678 +- modules/ozoneBidAdapter.md | 4 +- modules/parrableIdSystem.js | 165 +- modules/performaxBidAdapter.js | 56 + modules/performaxBidAdapter.md | 36 + modules/permutiveRtdProvider.js | 189 + modules/permutiveRtdProvider.md | 103 + modules/prebidJSDebugUI.js | 161 + modules/prebidServerBidAdapter/config.js | 33 +- modules/prebidServerBidAdapter/index.js | 521 +- modules/prebidmanagerAnalyticsAdapter.js | 19 +- modules/priceFloors.js | 39 +- modules/priceFloors.md | 4 +- modules/projectLimeLightBidAdapter.js | 71 +- modules/projectLimeLightBidAdapter.md | 2 + modules/proxistoreBidAdapter.js | 121 +- modules/pubCommonId.js | 8 +- modules/pubCommonIdSystem.js | 303 +- modules/pubProvidedIdSystem.js | 54 + modules/pubgeniusBidAdapter.js | 157 +- modules/pubgeniusBidAdapter.md | 37 +- modules/pubmaticAnalyticsAdapter.js | 184 +- modules/pubmaticAutoRefresh.js | 395 + modules/pubmaticAutoRefresh.md | 232 + modules/pubmaticBidAdapter.js | 355 +- modules/pubmaticBidAdapter.md | 5 +- modules/pubmaticServerBidAdapter.js | 191 +- modules/pubperfAnalyticsAdapter.js | 36 + modules/pubperfAnalyticsAdapter.md | 27 + modules/pubwiseAnalyticsAdapter.js | 294 +- modules/pubwiseBidAdapter.js | 777 + modules/pubwiseBidAdapter.md | 78 + modules/pubxBidAdapter.js | 94 + modules/pubxBidAdapter.md | 32 + modules/pubxaiAnalyticsAdapter.js | 182 + modules/pubxaiAnalyticsAdapter.md | 27 + modules/pulsepointBidAdapter.js | 44 +- modules/pulsepointBidAdapter.md | 35 +- modules/quantcastBidAdapter.js | 83 +- modules/quantcastIdSystem.js | 224 + modules/quantcastIdSystem.md | 46 + modules/quantumBidAdapter.js | 320 - modules/quantumBidAdapter.md | 94 - modules/quantumdexBidAdapter.md | 16 +- modules/qwarryBidAdapter.js | 102 + modules/qwarryBidAdapter.md | 28 + modules/radsBidAdapter.js | 54 +- modules/readpeakBidAdapter.js | 32 +- modules/readpeakBidAdapter.md | 5 +- modules/reconciliationRtdProvider.js | 295 + modules/reconciliationRtdProvider.md | 49 + modules/relaidoBidAdapter.js | 134 +- modules/relevantAnalyticsAdapter.js | 33 + modules/relevantAnalyticsAdapter.md | 13 + modules/resetdigitalBidAdapter.js | 138 + modules/resetdigitalBidAdapter.md | 37 + modules/rhythmoneBidAdapter.js | 3 + modules/richaudienceBidAdapter.js | 132 +- modules/richaudienceBidAdapter.md | 1 + modules/riseBidAdapter.js | 251 + modules/riseBidAdapter.md | 51 + modules/rtbhouseBidAdapter.js | 53 +- modules/rtbsapeBidAdapter.js | 142 + modules/rtbsapeBidAdapter.md | 51 + modules/rtdModule/index.js | 374 +- modules/rtdModule/provider.md | 28 +- modules/rtdModule/realTimeData.md | 32 - modules/rubiconAnalyticsAdapter.js | 372 +- modules/rubiconBidAdapter.js | 518 +- modules/rubiconBidAdapter.md | 6 +- modules/s2sTesting.js | 37 +- modules/saambaaBidAdapter.js | 401 + modules/saambaaBidAdapter.md | 69 + modules/seedingAllianceBidAdapter.js | 20 +- modules/seedtagBidAdapter.js | 155 +- modules/seedtagBidAdapter.md | 21 +- modules/serverbidBidAdapter.md | 44 - modules/sharedIdSystem.js | 52 +- modules/sharedIdSystem.md | 2 +- modules/sharethroughBidAdapter.js | 69 +- modules/sharethroughBidAdapter.md | 8 +- modules/shinezBidAdapter.js | 83 + modules/shinezBidAdapter.md | 33 + modules/sirdataRtdProvider.js | 402 + modules/sirdataRtdProvider.md | 169 + modules/sizeMappingV2.js | 277 +- modules/smaatoBidAdapter.js | 255 + modules/smaatoBidAdapter.md | 64 + modules/smartadserverBidAdapter.js | 49 +- modules/smartadserverBidAdapter.md | 39 + modules/smarticoBidAdapter.js | 116 + modules/smarticoBidAdapter.md | 32 + modules/smartrtbBidAdapter.js | 6 +- modules/smartxBidAdapter.js | 434 + modules/smartxBidAdapter.md | 173 + modules/smartyadsBidAdapter.js | 2 + modules/smilewantedBidAdapter.js | 70 +- modules/sonobiBidAdapter.js | 66 +- modules/sortableBidAdapter.js | 9 + modules/sovrnBidAdapter.js | 87 +- modules/spotxBidAdapter.js | 104 +- modules/sspBCBidAdapter.js | 417 + modules/sspBCBidAdapter.md | 46 + modules/stroeerCoreBidAdapter.js | 199 + modules/stroeerCoreBidAdapter.md | 31 + modules/sublimeBidAdapter.js | 57 +- modules/sublimeBidAdapter.md | 9 +- modules/synacormediaBidAdapter.js | 95 +- modules/synacormediaBidAdapter.md | 4 +- modules/tapadIdSystem.js | 61 + modules/tapadIdSystem.md | 43 + modules/tappxBidAdapter.js | 492 + modules/tappxBidAdapter.md | 84 + modules/teadsBidAdapter.js | 35 + modules/telariaBidAdapter.js | 8 +- modules/temedyaBidAdapter.js | 144 + modules/temedyaBidAdapter.md | 64 + modules/trionBidAdapter.js | 3 + modules/tripleliftBidAdapter.js | 174 +- modules/tripleliftBidAdapter.md | 20 + modules/truereachBidAdapter.js | 148 + modules/truereachBidAdapter.md | 44 + modules/trustxBidAdapter.js | 587 +- modules/trustxBidAdapter.md | 14 +- modules/ucfunnelBidAdapter.js | 184 +- modules/uid2IdSystem.js | 97 + modules/uid2IdSystem.md | 24 + modules/underdogmediaBidAdapter.js | 3 + modules/undertoneBidAdapter.js | 24 +- modules/unicornBidAdapter.js | 18 +- modules/unifiedIdSystem.js | 9 +- modules/unrulyBidAdapter.js | 1 + modules/userId/eids.js | 192 +- modules/userId/eids.md | 128 +- modules/userId/index.js | 530 +- modules/userId/userId.md | 185 +- modules/userIdTargeting.js | 14 +- modules/userIdTargeting.md | 2 +- modules/validationFpdModule/config.js | 125 + modules/validationFpdModule/index.js | 232 + modules/vdoaiBidAdapter.js | 30 +- modules/vdoaiBidAdapter.md | 27 +- modules/verizonMediaIdSystem.js | 105 + modules/verizonMediaSystemId.md | 33 + modules/vidazooBidAdapter.js | 143 +- modules/viewdeosDXBidAdapter.js | 6 +- modules/visxBidAdapter.js | 201 +- modules/visxBidAdapter.md | 86 +- modules/voxBidAdapter.js | 250 + modules/voxBidAdapter.md | 237 + modules/vuukleBidAdapter.js | 67 + modules/vuukleBidAdapter.md | 26 + modules/waardexBidAdapter.js | 433 +- modules/waardexBidAdapter.md | 107 +- modules/welectBidAdapter.js | 106 + modules/welectBidAdapter.md | 30 + modules/widespaceBidAdapter.js | 9 +- modules/widespaceBidAdapter.md | 5 +- modules/yieldlabBidAdapter.js | 93 +- modules/yieldlabBidAdapter.md | 4 +- modules/yieldliftBidAdapter.js | 3 + modules/yieldmoBidAdapter.js | 616 +- modules/yieldmoBidAdapter.md | 107 +- modules/yieldoneAnalyticsAdapter.js | 8 +- modules/yieldoneBidAdapter.js | 29 +- modules/yuktamediaAnalyticsAdapter.js | 337 +- modules/yuktamediaAnalyticsAdapter.md | 9 +- modules/zemantaBidAdapter.js | 281 + modules/zemantaBidAdapter.md | 111 + modules/zeotapIdPlusIdSystem.js | 64 + modules/zetaBidAdapter.js | 186 + modules/zetaBidAdapter.md | 45 + modules/zetaSspBidAdapter.js | 193 + modules/zetaSspBidAdapter.md | 42 + package-lock.json | 13159 +++++++--------- package.json | 40 +- src/AnalyticsAdapter.js | 2 + src/Renderer.js | 39 +- src/adapterManager.js | 361 +- src/adapters/bidderFactory.js | 27 +- src/adloader.js | 4 +- src/auction.js | 55 +- src/auctionManager.js | 14 + src/config.js | 192 +- src/constants.json | 41 +- src/events.js | 3 +- src/native.js | 105 +- src/prebid.js | 315 +- src/refererDetection.js | 260 +- src/secureCreatives.js | 27 +- src/storageManager.js | 15 +- src/targeting.js | 144 +- src/userSync.js | 2 +- src/utils.js | 105 +- src/video.js | 2 +- src/videoCache.js | 1 + test/fixtures/fixtures.js | 8 +- test/fixtures/video/adUnit.json | 8 +- test/mocks/adloaderStub.js | 6 +- test/mocks/fabrickId.json | 3 + test/spec/AnalyticsAdapter_spec.js | 18 +- test/spec/adUnits_spec.js | 11 + test/spec/adapters/adbutler_spec.js | 0 test/spec/api_spec.js | 10 +- test/spec/auctionmanager_spec.js | 216 + test/spec/config_spec.js | 71 + test/spec/integration/faker/googletag.js | 64 +- test/spec/modules/33acrossBidAdapter_spec.js | 1079 +- test/spec/modules/a4gBidAdapter_spec.js | 235 + test/spec/modules/ablidaBidAdapter_spec.js | 86 +- test/spec/modules/adWMGBidAdapter_spec.js | 335 + test/spec/modules/adagioBidAdapter_spec.js | 2100 ++- test/spec/modules/adbookpspBidAdapter_spec.js | 1323 ++ test/spec/modules/adbutlerBidAdapter_spec.js | 12 +- test/spec/modules/addefendBidAdapter_spec.js | 184 + ...dAdapter_spec.js => adfBidAdapter_spec.js} | 301 +- test/spec/modules/adformBidAdapter_spec.js | 40 + test/spec/modules/adhashBidAdapter_spec.js | 155 + test/spec/modules/adheseBidAdapter_spec.js | 180 +- .../spec/modules/adkernelAdnAnalytics_spec.js | 21 +- .../modules/adkernelAdnBidAdapter_spec.js | 43 +- test/spec/modules/adkernelBidAdapter_spec.js | 90 +- .../modules/adlooxAnalyticsAdapter_spec.js | 229 + test/spec/modules/admixerBidAdapter_spec.js | 93 +- test/spec/modules/admixerIdSystem_spec.js | 81 + test/spec/modules/adnowBidAdapter_spec.js | 163 + test/spec/modules/adnuntiusBidAdapter_spec.js | 113 +- test/spec/modules/adoceanBidAdapter_spec.js | 10 +- test/spec/modules/adotBidAdapter_spec.js | 299 +- test/spec/modules/adponeBidAdapter_spec.js | 203 +- test/spec/modules/adprimeBidAdapter_spec.js | 29 +- .../modules/adrelevantisBidAdapter_spec.js | 771 + test/spec/modules/adriverBidAdapter_spec.js | 323 + test/spec/modules/adtargetBidAdapter_spec.js | 13 +- .../modules/adtelligentBidAdapter_spec.js | 60 +- test/spec/modules/adtrueBidAdapter_spec.js | 431 + test/spec/modules/aduptechBidAdapter_spec.js | 780 +- test/spec/modules/adxcgBidAdapter_spec.js | 351 +- test/spec/modules/adyoulikeBidAdapter_spec.js | 281 +- test/spec/modules/amxBidAdapter_spec.js | 563 + test/spec/modules/aniviewBidAdapter_spec.js | 54 +- test/spec/modules/aolBidAdapter_spec.js | 79 +- test/spec/modules/apacdexBidAdapter_spec.js | 759 + test/spec/modules/appnexusBidAdapter_spec.js | 166 +- test/spec/modules/apstreamBidAdapter_spec.js | 346 + test/spec/modules/astraoneBidAdapter_spec.js | 34 +- test/spec/modules/atsAnalyticsAdapter_spec.js | 50 +- .../modules/audienceNetworkBidAdapter_spec.js | 568 - test/spec/modules/automatadBidAdapter_spec.js | 61 + test/spec/modules/avocetBidAdapter_spec.js | 4 +- test/spec/modules/axonixBidAdapter_spec.js | 378 + .../spec/modules/beachfrontBidAdapter_spec.js | 273 +- test/spec/modules/betweenBidAdapter_spec.js | 97 +- test/spec/modules/bidViewability_spec.js | 297 + test/spec/modules/bidglassAdapter_spec.js | 10 +- test/spec/modules/bidscubeBidAdapter_spec.js | 226 + test/spec/modules/bizzclickBidAdapter_spec.js | 396 + .../modules/bluebillywigBidAdapter_spec.js | 200 +- test/spec/modules/boldwinBidAdapter_spec.js | 281 + .../spec/modules/bridgewellBidAdapter_spec.js | 106 +- .../brightMountainMediaBidAdapter_spec.js | 235 + test/spec/modules/brightcomBidAdapter_spec.js | 38 +- test/spec/modules/britepoolIdSystem_spec.js | 68 +- test/spec/modules/browsiRtdProvider_spec.js | 83 + test/spec/modules/bucksenseBidAdapter_spec.js | 5 +- test/spec/modules/buzzoolaBidAdapter_spec.js | 148 +- test/spec/modules/ccxBidAdapter_spec.js | 69 +- .../modules/cointrafficBidAdapter_spec.js | 277 + test/spec/modules/coinzillaBidAdapter_spec.js | 9 +- .../modules/colossussspBidAdapter_spec.js | 6 +- .../modules/concertAnalyticsAdapter_spec.js | 157 + test/spec/modules/concertBidAdapter_spec.js | 219 + test/spec/modules/connectadBidAdapter_spec.js | 70 +- .../spec/modules/consentManagementUsp_spec.js | 14 +- test/spec/modules/consentManagement_spec.js | 102 +- .../spec/modules/consumableBidAdapter_spec.js | 1 + .../spec/modules/conversantBidAdapter_spec.js | 76 +- test/spec/modules/cpmstarBidAdapter_spec.js | 113 +- test/spec/modules/craftBidAdapter_spec.js | 2 +- test/spec/modules/criteoBidAdapter_spec.js | 150 +- test/spec/modules/criteoIdSystem_spec.js | 3 +- .../modules/decenteradsBidAdapter_spec.js | 207 + .../spec/modules/deepintentBidAdapter_spec.js | 1 + .../modules/deepintentDpesIdsystem_spec.js | 76 + test/spec/modules/dfpAdServerVideo_spec.js | 143 +- .../spec/modules/dgkeywordRtdProvider_spec.js | 351 + test/spec/modules/digitrustIdSystem_spec.js | 131 - .../modules/districtmDmxBidAdapter_spec.js | 203 +- test/spec/modules/dmdIdSystem_spec.js | 48 + test/spec/modules/docereeBidAdapter_spec.js | 97 + test/spec/modules/dspxBidAdapter_spec.js | 91 +- test/spec/modules/eids_spec.js | 203 +- .../modules/emx_digitalBidAdapter_spec.js | 96 +- test/spec/modules/engageyaBidAdapter_spec.js | 161 + test/spec/modules/enrichmentFpdModule_spec.js | 97 + test/spec/modules/eplanningBidAdapter_spec.js | 201 +- test/spec/modules/etargetBidAdapter_spec.js | 6 + test/spec/modules/fabrickIdSystem_spec.js | 134 + test/spec/modules/feedadBidAdapter_spec.js | 41 +- .../modules/fintezaAnalyticsAdapter_spec.js | 10 +- test/spec/modules/fpdModule_spec.js | 464 + .../modules/freewheel-sspBidAdapter_spec.js | 62 +- test/spec/modules/gamoshiBidAdapter_spec.js | 83 +- test/spec/modules/gdprEnforcement_spec.js | 796 +- test/spec/modules/geoedgeRtdProvider_spec.js | 111 + test/spec/modules/gjirafaBidAdapter_spec.js | 185 + test/spec/modules/glimpseBidAdapter_spec.js | 34 +- test/spec/modules/glomexBidAdapter_spec.js | 135 + test/spec/modules/gmosspBidAdapter_spec.js | 32 +- test/spec/modules/gnetBidAdapter_spec.js | 145 + test/spec/modules/gothamadsBidAdapter_spec.js | 416 + test/spec/modules/gptPreAuction_spec.js | 191 + test/spec/modules/gridBidAdapter_spec.js | 704 +- test/spec/modules/gridNMBidAdapter_spec.js | 87 +- test/spec/modules/gumgumBidAdapter_spec.js | 330 +- test/spec/modules/h12mediaBidAdapter_spec.js | 135 +- test/spec/modules/haloIdSystem_spec.js | 42 + test/spec/modules/haloRtdProvider_spec.js | 374 + test/spec/modules/haxmediaBidAdapter_spec.js | 304 + test/spec/modules/hybridBidAdapter_spec.js | 74 +- test/spec/modules/iasRtdProvider_spec.js | 74 + test/spec/modules/id5AnalyticsAdapter_spec.js | 452 + test/spec/modules/id5IdSystem_spec.js | 538 +- test/spec/modules/idImportLibrary_spec.js | 61 + test/spec/modules/idLibrary_spec.js | 61 + .../spec/modules/identityLinkIdSystem_spec.js | 85 +- test/spec/modules/idxIdSystem_spec.js | 117 + test/spec/modules/impactifyBidAdapter_spec.js | 398 + .../modules/improvedigitalBidAdapter_spec.js | 128 +- test/spec/modules/inmarBidAdapter_spec.js | 240 + test/spec/modules/inskinBidAdapter_spec.js | 3 +- test/spec/modules/instreamTracking_spec.js | 221 + test/spec/modules/intentIqIdSystem_spec.js | 181 + .../interactiveOffersBidAdapter_spec.js | 43 + test/spec/modules/invamiaBidAdapter_spec.js | 169 + test/spec/modules/invibesBidAdapter_spec.js | 344 +- test/spec/modules/ipromBidAdapter_spec.js | 195 + .../spec/modules/ironsourceBidAdapter_spec.js | 381 + test/spec/modules/ixBidAdapter_spec.js | 1504 +- test/spec/modules/jixieBidAdapter_spec.js | 604 + .../modules/justpremiumBidAdapter_spec.js | 15 +- test/spec/modules/jwplayerRtdProvider_spec.js | 751 + test/spec/modules/kargoBidAdapter_spec.js | 68 +- test/spec/modules/koblerBidAdapter_spec.js | 705 + .../spec/modules/krushmediaBidAdapter_spec.js | 329 + test/spec/modules/kubientBidAdapter_spec.js | 259 + test/spec/modules/lemmaBidAdapter_spec.js | 91 + .../modules/liveIntentIdMinimalSystem_spec.js | 188 + test/spec/modules/liveIntentIdSystem_spec.js | 168 +- .../livewrappedAnalyticsAdapter_spec.js | 176 +- .../modules/livewrappedBidAdapter_spec.js | 236 +- test/spec/modules/lkqdBidAdapter_spec.js | 29 +- .../spec/modules/lockerdomeBidAdapter_spec.js | 12 +- test/spec/modules/loganBidAdapter_spec.js | 329 + test/spec/modules/logicadBidAdapter_spec.js | 124 +- .../modules/lotamePanoramaIdSystem_spec.js | 287 +- test/spec/modules/lunamediaBidAdapter_spec.js | 4 +- .../modules/lunamediahbBidAdapter_spec.js | 304 + .../spec/modules/luponmediaBidAdapter_spec.js | 45 + test/spec/modules/malltvBidAdapter_spec.js | 185 + test/spec/modules/mantisBidAdapter_spec.js | 115 +- test/spec/modules/marsmediaBidAdapter_spec.js | 400 +- test/spec/modules/mass_spec.js | 151 + .../spec/modules/mediaforceBidAdapter_spec.js | 396 +- test/spec/modules/mediagoBidAdapter_spec.js | 101 + .../modules/medianetAnalyticsAdapter_spec.js | 72 +- test/spec/modules/medianetBidAdapter_spec.js | 150 + .../modules/mediasquareBidAdapter_spec.js | 72 +- test/spec/modules/missenaBidAdapter_spec.js | 131 + test/spec/modules/mobfoxpbBidAdapter_spec.js | 304 + test/spec/modules/multibid_spec.js | 845 + test/spec/modules/mwOpenLinkIdSystem_spec.js | 20 + test/spec/modules/nativoBidAdapter_spec.js | 229 + .../modules/nextMillenniumBidAdapter_spec.js | 44 +- test/spec/modules/nextrollIdSystem_spec.js | 56 + test/spec/modules/nobidBidAdapter_spec.js | 181 +- test/spec/modules/novatiqIdSystem_spec.js | 70 + test/spec/modules/oguryBidAdapter_spec.js | 312 + test/spec/modules/oneVideoBidAdapter_spec.js | 622 +- test/spec/modules/onetagBidAdapter_spec.js | 46 +- test/spec/modules/onomagicBidAdapter_spec.js | 13 +- .../spec/modules/ooloAnalyticsAdapter_spec.js | 793 + .../modules/openxAnalyticsAdapter_spec.js | 746 +- test/spec/modules/openxBidAdapter_spec.js | 380 +- test/spec/modules/optimeraRtdProvider_spec.js | 84 + .../modules/optimonAnalyticsAdapter_spec.js | 40 + test/spec/modules/orbidderBidAdapter_spec.js | 47 +- test/spec/modules/outbrainBidAdapter_spec.js | 562 + test/spec/modules/ozoneBidAdapter_spec.js | 780 +- test/spec/modules/parrableIdSystem_spec.js | 681 +- test/spec/modules/performaxBidAdapter_spec.js | 274 + .../spec/modules/permutiveRtdProvider_spec.js | 397 + .../modules/prebidServerBidAdapter_spec.js | 939 +- .../prebidmanagerAnalyticsAdapter_spec.js | 44 +- test/spec/modules/priceFloors_spec.js | 422 +- .../projectLimeLightBidAdapter_spec.js | 163 +- .../spec/modules/proxistoreBidAdapter_spec.js | 169 +- test/spec/modules/pubCommonId_spec.js | 2 +- test/spec/modules/pubgeniusBidAdapter_spec.js | 135 +- .../modules/pubmaticAnalyticsAdapter_spec.js | 768 +- test/spec/modules/pubmaticBidAdapter_spec.js | 4122 +++-- .../modules/pubmaticServerBidAdapter_spec.js | 71 +- .../modules/pubperfAnalyticsAdapter_spec.js | 55 + .../modules/pubwiseAnalyticsAdapter_spec.js | 159 +- test/spec/modules/pubwiseBidAdapter_spec.js | 575 + test/spec/modules/pubxBidAdapter_spec.js | 189 + .../modules/pubxaiAnalyticsAdapter_spec.js | 683 + .../spec/modules/pulsepointBidAdapter_spec.js | 147 +- test/spec/modules/quantcastBidAdapter_spec.js | 142 +- test/spec/modules/quantcastIdSystem_spec.js | 383 + test/spec/modules/quantumBidAdapter_spec.js | 325 - .../spec/modules/quantumdexBidAdapter_spec.js | 190 +- test/spec/modules/qwarryBidAdapter_spec.js | 164 + test/spec/modules/radsBidAdapter_spec.js | 83 + test/spec/modules/readpeakBidAdapter_spec.js | 90 +- test/spec/modules/realTimeDataModule_spec.js | 160 + test/spec/modules/realTimeModule_spec.js | 282 - .../modules/reconciliationRtdProvider_spec.js | 221 + test/spec/modules/relaidoBidAdapter_spec.js | 104 +- .../modules/relevantAnalyticsAdapter_spec.js | 43 + .../modules/resetdigitalBidAdapter_spec.js | 158 + test/spec/modules/rhythmoneBidAdapter_spec.js | 1 + .../modules/richaudienceBidAdapter_spec.js | 605 +- test/spec/modules/riseBidAdapter_spec.js | 381 + test/spec/modules/rtbhouseBidAdapter_spec.js | 98 +- test/spec/modules/rtbsapeBidAdapter_spec.js | 166 + .../modules/rubiconAnalyticsAdapter_spec.js | 1160 +- test/spec/modules/rubiconAnalyticsSchema.json | 84 +- test/spec/modules/rubiconBidAdapter_spec.js | 1474 +- test/spec/modules/s2sTesting_spec.js | 82 +- test/spec/modules/saambaaBidAdapter_spec.js | 139 + .../modules/seedingAllianceAdapter_spec.js | 2 +- test/spec/modules/seedtagBidAdapter_spec.js | 152 +- test/spec/modules/shareUserIds_spec.js | 10 + test/spec/modules/sharedIdSystem_spec.js | 77 + .../modules/sharethroughBidAdapter_spec.js | 272 +- test/spec/modules/shinezBidAdapter_spec.js | 152 + .../modules/sigmoidAnalyticsAdapter_spec.js | 2 +- test/spec/modules/sirdataRtdProvider_spec.js | 94 + test/spec/modules/sizeMappingV2_spec.js | 149 +- test/spec/modules/smaatoBidAdapter_spec.js | 692 + .../modules/smartadserverBidAdapter_spec.js | 423 +- test/spec/modules/smarticoBidAdapter_spec.js | 118 + test/spec/modules/smartrtbBidAdapter_spec.js | 7 +- test/spec/modules/smartxBidAdapter_spec.js | 612 + test/spec/modules/smartyadsBidAdapter_spec.js | 21 +- .../modules/smilewantedBidAdapter_spec.js | 16 +- test/spec/modules/sonobiBidAdapter_spec.js | 191 +- test/spec/modules/sortableBidAdapter_spec.js | 35 +- test/spec/modules/sovrnBidAdapter_spec.js | 340 +- test/spec/modules/spotxBidAdapter_spec.js | 128 +- test/spec/modules/sspBCBidAdapter_spec.js | 477 + .../modules/stroeerCoreBidAdapter_spec.js | 542 + test/spec/modules/sublimeBidAdapter_spec.js | 125 +- .../modules/synacormediaBidAdapter_spec.js | 476 +- test/spec/modules/tapadIdSystem_spec.js | 65 + test/spec/modules/tappxBidAdapter_spec.js | 417 + test/spec/modules/teadsBidAdapter_spec.js | 40 + test/spec/modules/telariaBidAdapter_spec.js | 2 +- test/spec/modules/temedyaBidAdapter_spec.js | 177 + test/spec/modules/trionBidAdapter_spec.js | 91 +- .../spec/modules/tripleliftBidAdapter_spec.js | 603 +- test/spec/modules/truereachBidAdapter_spec.js | 105 + test/spec/modules/trustxBidAdapter_spec.js | 523 +- test/spec/modules/ucfunnelBidAdapter_spec.js | 74 +- .../modules/underdogmediaBidAdapter_spec.js | 2 + test/spec/modules/undertoneBidAdapter_spec.js | 81 +- test/spec/modules/unicornBidAdapter_spec.js | 51 +- test/spec/modules/unrulyBidAdapter_spec.js | 1 + test/spec/modules/userId_spec.js | 1923 ++- test/spec/modules/validationFpdModule_spec.js | 313 + test/spec/modules/vdoaiBidAdapter_spec.js | 40 +- .../spec/modules/verizonMediaIdSystem_spec.js | 204 + test/spec/modules/vidazooBidAdapter_spec.js | 142 +- .../spec/modules/viewdeosDXBidAdapter_spec.js | 16 +- test/spec/modules/visxBidAdapter_spec.js | 311 +- test/spec/modules/voxBidAdapter_spec.js | 322 + test/spec/modules/vuukleBidAdapter_spec.js | 61 + test/spec/modules/waardexBidAdapter_spec.js | 343 +- test/spec/modules/welectBidAdapter_spec.js | 211 + test/spec/modules/widespaceBidAdapter_spec.js | 12 +- test/spec/modules/yieldlabBidAdapter_spec.js | 104 +- test/spec/modules/yieldliftBidAdapter_spec.js | 1 + test/spec/modules/yieldmoBidAdapter_spec.js | 657 +- .../yuktamediaAnalyticsAdapter_spec.js | 713 + .../yuktamediaAnalyticsAdaptor_spec.js | 788 - test/spec/modules/zemantaBidAdapter_spec.js | 558 + .../spec/modules/zeotapIdPlusIdSystem_spec.js | 197 + test/spec/modules/zetaBidAdapter_spec.js | 84 + test/spec/modules/zetaSspBidAdapter_spec.js | 158 + test/spec/native_spec.js | 414 +- test/spec/refererDetection_spec.js | 422 +- test/spec/renderer_spec.js | 53 + test/spec/unit/core/adapterManager_spec.js | 1647 +- test/spec/unit/core/bidderFactory_spec.js | 54 +- test/spec/unit/core/storageManager_spec.js | 52 + test/spec/unit/core/targeting_spec.js | 208 +- test/spec/unit/pbjs_api_spec.js | 216 +- test/spec/unit/secureCreatives_spec.js | 331 +- test/spec/userSync_spec.js | 18 + test/spec/utils_spec.js | 83 + test/spec/videoCache_spec.js | 16 +- test/spec/video_spec.js | 23 + webpack.conf.js | 3 +- 842 files changed, 124038 insertions(+), 28037 deletions(-) create mode 100644 .github/release-drafter.yml create mode 100644 .github/workflows/release-drafter.yml create mode 100644 integrationExamples/gpt/adUnitFloors.html create mode 100644 integrationExamples/gpt/adloox.html delete mode 100644 integrationExamples/gpt/audigentSegments_example.html delete mode 100644 integrationExamples/gpt/digitrust_Full.html delete mode 100644 integrationExamples/gpt/digitrust_Simple.html delete mode 100644 integrationExamples/gpt/digitrust_cmp_test.html create mode 100644 integrationExamples/gpt/haloRtdProvider_example.html create mode 100644 integrationExamples/gpt/idImportLibrary_example.html create mode 100644 integrationExamples/gpt/ixMultiFormat.html create mode 100644 integrationExamples/gpt/jwplayerRtdProvider_example.html create mode 100644 integrationExamples/gpt/optimeraRtdProvider_example.html create mode 100644 integrationExamples/gpt/permutiveRtdProvider_example.html create mode 100644 integrationExamples/gpt/reconciliationRtdProvider_example.html create mode 100644 integrationExamples/gpt/sirdataRtdProvider_example.html create mode 100644 integrationExamples/mass/index.html create mode 100644 integrationExamples/postbid/postbid_prebidServer_example.html create mode 100755 integrationExamples/reviewerTools/index.html create mode 100644 modules/a4gBidAdapter.js create mode 100644 modules/adWMGBidAdapter.js create mode 100644 modules/adWMGBidAdapter.md create mode 100644 modules/adblender.md create mode 100644 modules/adbookpspBidAdapter.js create mode 100644 modules/adbookpspBidAdapter.md create mode 100644 modules/addefendBidAdapter.js create mode 100644 modules/addefendBidAdapter.md rename modules/{adformOpenRTBBidAdapter.js => adfBidAdapter.js} (59%) rename modules/{adformOpenRTBBidAdapter.md => adfBidAdapter.md} (51%) create mode 100644 modules/adhashBidAdapter.js create mode 100644 modules/adhashBidAdapter.md create mode 100644 modules/adlooxAnalyticsAdapter.js create mode 100644 modules/adlooxAnalyticsAdapter.md create mode 100644 modules/admixerIdSystem.js create mode 100644 modules/adnowBidAdapter.js create mode 100644 modules/adnowBidAdapter.md create mode 100644 modules/adrelevantisBidAdapter.js create mode 100644 modules/adrelevantisBidAdapter.md create mode 100644 modules/adriverBidAdapter.js create mode 100644 modules/adriverBidAdapter.md create mode 100644 modules/adtrueBidAdapter.js create mode 100644 modules/adtrueBidAdapter.md create mode 100644 modules/amxBidAdapter.js create mode 100644 modules/amxBidAdapter.md delete mode 100644 modules/andbeyondBidAdapter.md create mode 100644 modules/apacdexBidAdapter.js create mode 100644 modules/apacdexBidAdapter.md create mode 100644 modules/apstreamBidAdapter.js create mode 100644 modules/apstreamBidAdapter.md delete mode 100644 modules/audienceNetworkBidAdapter.js delete mode 100644 modules/audienceNetworkBidAdapter.md delete mode 100644 modules/audigentRtdProvider.js delete mode 100644 modules/audigentRtdProvider.md create mode 100644 modules/axonixBidAdapter.js create mode 100644 modules/axonixBidAdapter.md create mode 100644 modules/bidViewability.js create mode 100644 modules/bidViewability.md create mode 100644 modules/bidscubeBidAdapter.js create mode 100644 modules/bidscubeBidAdapter.md create mode 100644 modules/bizzclickBidAdapter.js create mode 100644 modules/boldwinBidAdapter.js create mode 100644 modules/boldwinBidAdapter.md create mode 100644 modules/brightMountainMediaBidAdapter.js create mode 100644 modules/brightMountainMediaBidAdapter.md create mode 100644 modules/browsiRtdProvider.md create mode 100644 modules/cointrafficBidAdapter.js create mode 100644 modules/cointrafficBidAdapter.md create mode 100644 modules/concertAnalyticsAdapter.js create mode 100644 modules/concertAnalyticsAdapter.md create mode 100644 modules/concertBidAdapter.js create mode 100644 modules/concertBidAdapter.md create mode 100644 modules/decenteradsBidAdapter.js create mode 100644 modules/deepintentDpesIdSystem.js create mode 100644 modules/deepintentDpesIdSystem.md create mode 100644 modules/dgkeywordRtdProvider.js create mode 100644 modules/dgkeywordRtdProvider.md delete mode 100644 modules/digiTrustIdSystem.js delete mode 100644 modules/digiTrustIdSystem.md create mode 100644 modules/dmdIdSystem.js create mode 100644 modules/dmdIdSystem.md create mode 100644 modules/docereeBidAdapter.js create mode 100644 modules/docereeBidAdapter.md create mode 100644 modules/engageyaBidAdapter.js create mode 100644 modules/engageyaBidAdapter.md create mode 100644 modules/enrichmentFpdModule.js create mode 100644 modules/fabrickIdSystem.js create mode 100644 modules/fabrickIdSystem.md create mode 100644 modules/flocIdSystem.js create mode 100644 modules/flocIdSystem.md create mode 100644 modules/fpdModule/index.js create mode 100644 modules/fpdModule/index.md create mode 100644 modules/geoedgeRtdProvider.js create mode 100644 modules/geoedgeRtdProvider.md create mode 100644 modules/gjirafaBidAdapter.js create mode 100644 modules/glomexBidAdapter.js create mode 100644 modules/glomexBidAdapter.md create mode 100644 modules/gnetBidAdapter.js create mode 100644 modules/gnetBidAdapter.md create mode 100644 modules/gothamadsBidAdapter.js create mode 100644 modules/gothamadsBidAdapter.md create mode 100644 modules/gptPreAuction.js create mode 100644 modules/haloIdSystem.js create mode 100644 modules/haloIdSystem.md create mode 100644 modules/haloRtdProvider.js create mode 100644 modules/haloRtdProvider.md create mode 100644 modules/haxmediaBidAdapter.js create mode 100644 modules/haxmediaBidAdapter.md create mode 100644 modules/iasRtdProvider.js create mode 100644 modules/iasRtdProvider.md create mode 100644 modules/id5AnalyticsAdapter.js create mode 100644 modules/id5AnalyticsAdapter.md create mode 100644 modules/id5IdSystem.md create mode 100644 modules/idImportLibrary.js create mode 100644 modules/idImportLibrary.md create mode 100644 modules/idLibrary.js create mode 100644 modules/idLibrary.md create mode 100644 modules/idxIdSystem.js create mode 100644 modules/idxIdSystem.md create mode 100644 modules/impactifyBidAdapter.js create mode 100644 modules/impactifyBidAdapter.md create mode 100755 modules/inmarBidAdapter.js create mode 100644 modules/inmarBidAdapter.md create mode 100644 modules/instreamTracking.js create mode 100644 modules/intentIqIdSystem.js create mode 100644 modules/interactiveOffersBidAdapter.js create mode 100644 modules/invamiaBidAdapter.js create mode 100644 modules/invamiaBidAdapter.md create mode 100644 modules/ipromBidAdapter.js create mode 100644 modules/ipromBidAdapter.md create mode 100644 modules/ironsourceBidAdapter.js create mode 100644 modules/ironsourceBidAdapter.md create mode 100644 modules/jixieBidAdapter.js create mode 100644 modules/jixieBidAdapter.md create mode 100644 modules/jwplayerRtdProvider.js create mode 100644 modules/jwplayerRtdProvider.md create mode 100644 modules/koblerBidAdapter.js create mode 100644 modules/koblerBidAdapter.md create mode 100644 modules/krushmediaBidAdapter.js create mode 100644 modules/krushmediaBidAdapter.md create mode 100644 modules/kubientBidAdapter.js create mode 100644 modules/kubientBidAdapter.md create mode 100644 modules/livewrappedAnalyticsAdapter.md create mode 100644 modules/loganBidAdapter.js create mode 100644 modules/loganBidAdapter.md create mode 100644 modules/lunamediahbBidAdapter.js create mode 100644 modules/lunamediahbBidAdapter.md create mode 100644 modules/malltvBidAdapter.js create mode 100644 modules/malltvBidAdapter.md create mode 100644 modules/mass.js create mode 100644 modules/mass.md create mode 100644 modules/mediagoBidAdapter.js create mode 100644 modules/mediagoBidAdapter.md create mode 100644 modules/merkleIdSystem.js create mode 100644 modules/missenaBidAdapter.js create mode 100644 modules/missenaBidAdapter.md create mode 100644 modules/mobfoxpbBidAdapter.js create mode 100644 modules/mobfoxpbBidAdapter.md create mode 100644 modules/multibid/index.js create mode 100644 modules/multibid/index.md create mode 100644 modules/mwOpenLinkIdSystem.js create mode 100644 modules/mwOpenLinkIdSystem.md create mode 100644 modules/nativoBidAdapter.js create mode 100644 modules/nativoBidAdapter.md create mode 100644 modules/nextrollIdSystem.js create mode 100644 modules/novatiqIdSystem.js create mode 100644 modules/novatiqIdSystem.md create mode 100644 modules/oguryBidAdapter.js create mode 100644 modules/oguryBidAdapter.md create mode 100644 modules/ooloAnalyticsAdapter.js create mode 100644 modules/ooloAnalyticsAdapter.md create mode 100644 modules/optimeraRtdProvider.js create mode 100644 modules/optimeraRtdProvider.md create mode 100644 modules/optimonAnalyticsAdapter.js create mode 100644 modules/optimonAnalyticsAdapter.md create mode 100644 modules/outbrainBidAdapter.js create mode 100644 modules/outbrainBidAdapter.md create mode 100644 modules/performaxBidAdapter.js create mode 100644 modules/performaxBidAdapter.md create mode 100644 modules/permutiveRtdProvider.js create mode 100644 modules/permutiveRtdProvider.md create mode 100644 modules/prebidJSDebugUI.js create mode 100644 modules/pubProvidedIdSystem.js create mode 100644 modules/pubmaticAutoRefresh.js create mode 100644 modules/pubmaticAutoRefresh.md create mode 100644 modules/pubperfAnalyticsAdapter.js create mode 100644 modules/pubperfAnalyticsAdapter.md create mode 100644 modules/pubwiseBidAdapter.js create mode 100644 modules/pubwiseBidAdapter.md create mode 100644 modules/pubxBidAdapter.js create mode 100644 modules/pubxBidAdapter.md create mode 100644 modules/pubxaiAnalyticsAdapter.js create mode 100644 modules/pubxaiAnalyticsAdapter.md create mode 100644 modules/quantcastIdSystem.js create mode 100644 modules/quantcastIdSystem.md delete mode 100644 modules/quantumBidAdapter.js delete mode 100644 modules/quantumBidAdapter.md create mode 100644 modules/qwarryBidAdapter.js create mode 100644 modules/qwarryBidAdapter.md create mode 100644 modules/reconciliationRtdProvider.js create mode 100644 modules/reconciliationRtdProvider.md create mode 100644 modules/relevantAnalyticsAdapter.js create mode 100644 modules/relevantAnalyticsAdapter.md create mode 100644 modules/resetdigitalBidAdapter.js create mode 100644 modules/resetdigitalBidAdapter.md create mode 100644 modules/riseBidAdapter.js create mode 100644 modules/riseBidAdapter.md create mode 100644 modules/rtbsapeBidAdapter.js create mode 100644 modules/rtbsapeBidAdapter.md delete mode 100644 modules/rtdModule/realTimeData.md create mode 100755 modules/saambaaBidAdapter.js create mode 100755 modules/saambaaBidAdapter.md delete mode 100644 modules/serverbidBidAdapter.md create mode 100644 modules/shinezBidAdapter.js create mode 100644 modules/shinezBidAdapter.md create mode 100644 modules/sirdataRtdProvider.js create mode 100644 modules/sirdataRtdProvider.md create mode 100644 modules/smaatoBidAdapter.js create mode 100644 modules/smaatoBidAdapter.md create mode 100644 modules/smarticoBidAdapter.js create mode 100644 modules/smarticoBidAdapter.md create mode 100644 modules/smartxBidAdapter.js create mode 100644 modules/smartxBidAdapter.md create mode 100644 modules/sspBCBidAdapter.js create mode 100644 modules/sspBCBidAdapter.md create mode 100644 modules/stroeerCoreBidAdapter.js create mode 100644 modules/stroeerCoreBidAdapter.md create mode 100644 modules/tapadIdSystem.js create mode 100644 modules/tapadIdSystem.md create mode 100644 modules/tappxBidAdapter.js create mode 100644 modules/tappxBidAdapter.md create mode 100644 modules/temedyaBidAdapter.js create mode 100644 modules/temedyaBidAdapter.md create mode 100755 modules/truereachBidAdapter.js create mode 100644 modules/truereachBidAdapter.md create mode 100644 modules/uid2IdSystem.js create mode 100644 modules/uid2IdSystem.md create mode 100644 modules/validationFpdModule/config.js create mode 100644 modules/validationFpdModule/index.js create mode 100644 modules/verizonMediaIdSystem.js create mode 100644 modules/verizonMediaSystemId.md create mode 100644 modules/voxBidAdapter.js create mode 100644 modules/voxBidAdapter.md create mode 100644 modules/vuukleBidAdapter.js create mode 100644 modules/vuukleBidAdapter.md create mode 100644 modules/welectBidAdapter.js create mode 100644 modules/welectBidAdapter.md create mode 100644 modules/zemantaBidAdapter.js create mode 100644 modules/zemantaBidAdapter.md create mode 100644 modules/zeotapIdPlusIdSystem.js create mode 100644 modules/zetaBidAdapter.js create mode 100644 modules/zetaBidAdapter.md create mode 100644 modules/zetaSspBidAdapter.js create mode 100644 modules/zetaSspBidAdapter.md create mode 100644 test/mocks/fabrickId.json delete mode 100644 test/spec/adapters/adbutler_spec.js create mode 100644 test/spec/modules/a4gBidAdapter_spec.js create mode 100644 test/spec/modules/adWMGBidAdapter_spec.js create mode 100755 test/spec/modules/adbookpspBidAdapter_spec.js create mode 100644 test/spec/modules/addefendBidAdapter_spec.js rename test/spec/modules/{adformOpenRTBBidAdapter_spec.js => adfBidAdapter_spec.js} (73%) create mode 100644 test/spec/modules/adhashBidAdapter_spec.js create mode 100644 test/spec/modules/adlooxAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/admixerIdSystem_spec.js create mode 100644 test/spec/modules/adnowBidAdapter_spec.js create mode 100644 test/spec/modules/adrelevantisBidAdapter_spec.js create mode 100644 test/spec/modules/adriverBidAdapter_spec.js create mode 100644 test/spec/modules/adtrueBidAdapter_spec.js create mode 100644 test/spec/modules/amxBidAdapter_spec.js create mode 100644 test/spec/modules/apacdexBidAdapter_spec.js create mode 100644 test/spec/modules/apstreamBidAdapter_spec.js delete mode 100644 test/spec/modules/audienceNetworkBidAdapter_spec.js create mode 100644 test/spec/modules/axonixBidAdapter_spec.js create mode 100644 test/spec/modules/bidViewability_spec.js create mode 100644 test/spec/modules/bidscubeBidAdapter_spec.js create mode 100644 test/spec/modules/bizzclickBidAdapter_spec.js create mode 100644 test/spec/modules/boldwinBidAdapter_spec.js create mode 100644 test/spec/modules/brightMountainMediaBidAdapter_spec.js create mode 100644 test/spec/modules/browsiRtdProvider_spec.js create mode 100644 test/spec/modules/cointrafficBidAdapter_spec.js create mode 100644 test/spec/modules/concertAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/concertBidAdapter_spec.js mode change 100755 => 100644 test/spec/modules/cpmstarBidAdapter_spec.js create mode 100644 test/spec/modules/decenteradsBidAdapter_spec.js create mode 100644 test/spec/modules/deepintentDpesIdsystem_spec.js create mode 100644 test/spec/modules/dgkeywordRtdProvider_spec.js delete mode 100644 test/spec/modules/digitrustIdSystem_spec.js create mode 100644 test/spec/modules/dmdIdSystem_spec.js create mode 100644 test/spec/modules/docereeBidAdapter_spec.js create mode 100644 test/spec/modules/engageyaBidAdapter_spec.js create mode 100644 test/spec/modules/enrichmentFpdModule_spec.js create mode 100644 test/spec/modules/fabrickIdSystem_spec.js create mode 100644 test/spec/modules/fpdModule_spec.js create mode 100644 test/spec/modules/geoedgeRtdProvider_spec.js create mode 100644 test/spec/modules/gjirafaBidAdapter_spec.js create mode 100644 test/spec/modules/glomexBidAdapter_spec.js create mode 100644 test/spec/modules/gnetBidAdapter_spec.js create mode 100644 test/spec/modules/gothamadsBidAdapter_spec.js create mode 100644 test/spec/modules/gptPreAuction_spec.js create mode 100644 test/spec/modules/haloIdSystem_spec.js create mode 100644 test/spec/modules/haloRtdProvider_spec.js create mode 100644 test/spec/modules/haxmediaBidAdapter_spec.js create mode 100644 test/spec/modules/iasRtdProvider_spec.js create mode 100644 test/spec/modules/id5AnalyticsAdapter_spec.js create mode 100644 test/spec/modules/idImportLibrary_spec.js create mode 100644 test/spec/modules/idLibrary_spec.js create mode 100644 test/spec/modules/idxIdSystem_spec.js create mode 100644 test/spec/modules/impactifyBidAdapter_spec.js create mode 100644 test/spec/modules/inmarBidAdapter_spec.js create mode 100644 test/spec/modules/instreamTracking_spec.js create mode 100644 test/spec/modules/intentIqIdSystem_spec.js create mode 100644 test/spec/modules/interactiveOffersBidAdapter_spec.js create mode 100644 test/spec/modules/invamiaBidAdapter_spec.js create mode 100644 test/spec/modules/ipromBidAdapter_spec.js create mode 100644 test/spec/modules/ironsourceBidAdapter_spec.js create mode 100644 test/spec/modules/jixieBidAdapter_spec.js create mode 100644 test/spec/modules/jwplayerRtdProvider_spec.js create mode 100644 test/spec/modules/koblerBidAdapter_spec.js create mode 100644 test/spec/modules/krushmediaBidAdapter_spec.js create mode 100644 test/spec/modules/kubientBidAdapter_spec.js create mode 100644 test/spec/modules/liveIntentIdMinimalSystem_spec.js create mode 100644 test/spec/modules/loganBidAdapter_spec.js create mode 100644 test/spec/modules/lunamediahbBidAdapter_spec.js create mode 100644 test/spec/modules/malltvBidAdapter_spec.js create mode 100644 test/spec/modules/mass_spec.js create mode 100644 test/spec/modules/mediagoBidAdapter_spec.js create mode 100644 test/spec/modules/missenaBidAdapter_spec.js create mode 100644 test/spec/modules/mobfoxpbBidAdapter_spec.js create mode 100644 test/spec/modules/multibid_spec.js create mode 100644 test/spec/modules/mwOpenLinkIdSystem_spec.js create mode 100644 test/spec/modules/nativoBidAdapter_spec.js create mode 100644 test/spec/modules/nextrollIdSystem_spec.js create mode 100644 test/spec/modules/novatiqIdSystem_spec.js create mode 100644 test/spec/modules/oguryBidAdapter_spec.js create mode 100644 test/spec/modules/ooloAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/optimeraRtdProvider_spec.js create mode 100644 test/spec/modules/optimonAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/outbrainBidAdapter_spec.js create mode 100644 test/spec/modules/performaxBidAdapter_spec.js create mode 100644 test/spec/modules/permutiveRtdProvider_spec.js create mode 100644 test/spec/modules/pubperfAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/pubwiseBidAdapter_spec.js create mode 100644 test/spec/modules/pubxBidAdapter_spec.js create mode 100644 test/spec/modules/pubxaiAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/quantcastIdSystem_spec.js delete mode 100644 test/spec/modules/quantumBidAdapter_spec.js create mode 100644 test/spec/modules/qwarryBidAdapter_spec.js create mode 100644 test/spec/modules/realTimeDataModule_spec.js delete mode 100644 test/spec/modules/realTimeModule_spec.js create mode 100644 test/spec/modules/reconciliationRtdProvider_spec.js create mode 100644 test/spec/modules/relevantAnalyticsAdapter_spec.js create mode 100644 test/spec/modules/resetdigitalBidAdapter_spec.js create mode 100644 test/spec/modules/riseBidAdapter_spec.js create mode 100644 test/spec/modules/rtbsapeBidAdapter_spec.js create mode 100755 test/spec/modules/saambaaBidAdapter_spec.js create mode 100644 test/spec/modules/sharedIdSystem_spec.js create mode 100644 test/spec/modules/shinezBidAdapter_spec.js create mode 100644 test/spec/modules/sirdataRtdProvider_spec.js create mode 100644 test/spec/modules/smaatoBidAdapter_spec.js create mode 100644 test/spec/modules/smarticoBidAdapter_spec.js create mode 100644 test/spec/modules/smartxBidAdapter_spec.js create mode 100644 test/spec/modules/sspBCBidAdapter_spec.js create mode 100644 test/spec/modules/stroeerCoreBidAdapter_spec.js create mode 100644 test/spec/modules/tapadIdSystem_spec.js create mode 100644 test/spec/modules/tappxBidAdapter_spec.js create mode 100644 test/spec/modules/temedyaBidAdapter_spec.js create mode 100644 test/spec/modules/truereachBidAdapter_spec.js create mode 100644 test/spec/modules/validationFpdModule_spec.js create mode 100644 test/spec/modules/verizonMediaIdSystem_spec.js create mode 100644 test/spec/modules/voxBidAdapter_spec.js create mode 100644 test/spec/modules/vuukleBidAdapter_spec.js create mode 100644 test/spec/modules/welectBidAdapter_spec.js create mode 100644 test/spec/modules/yuktamediaAnalyticsAdapter_spec.js delete mode 100644 test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js create mode 100644 test/spec/modules/zemantaBidAdapter_spec.js create mode 100644 test/spec/modules/zeotapIdPlusIdSystem_spec.js create mode 100644 test/spec/modules/zetaBidAdapter_spec.js create mode 100644 test/spec/modules/zetaSspBidAdapter_spec.js diff --git a/.babelrc.js b/.babelrc.js index bece57ec4a5..2fa95d0716e 100644 --- a/.babelrc.js +++ b/.babelrc.js @@ -20,7 +20,7 @@ module.exports = { "safari >=8", "edge >= 14", "ff >= 57", - "ie >= 10", + "ie >= 11", "ios >= 8" ] } diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ea5e87218c..ea5fb916a91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ aliases: docker: # specify the version you desire here - image: circleci/node:12.16.1 - + resource_class: xlarge # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images # documented at https://circleci.com/docs/2.0/circleci-images/ @@ -94,4 +94,4 @@ workflows: - e2etest experimental: - pipelines: true \ No newline at end of file + pipelines: true diff --git a/.eslintrc.js b/.eslintrc.js index c64ab379c52..3a3210cec67 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,7 +28,6 @@ module.exports = { "comma-dangle": "off", "semi": "off", "space-before-function-paren": "off", - "import/extensions": ["error", "ignorePackages"], // Exceptions below this line are temporary, so that eslint can be added into the CI process. // Violations of these styles should be fixed, and the exceptions removed over time. diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 00000000000..a3246cffd6d --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,28 @@ + +name-template: 'Prebid $RESOLVED_VERSION Release' +tag-template: '$RESOLVED_VERSION' +categories: + - title: '🚀 New Features' + label: 'feature' + - title: '🛠 Maintenance' + label: 'maintenance' + - title: '🐛 Bug Fixes' + labels: + - 'fix' + - 'bugfix' + - 'bug' +change-template: '- $TITLE (#$NUMBER)' +version-resolver: + major: + labels: + - 'major' + minor: + labels: + - 'minor' + patch: + labels: + - 'patch' + default: minor +template: | + ## In This Release + $CHANGES diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 00000000000..8152b61275d --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,18 @@ +name: Release Drafter + +on: + push: + # branches to consider in the event; optional, defaults to all + branches: + - master + +jobs: + update_release_draft: + runs-on: ubuntu-latest + steps: + # Drafts your next Release notes as Pull Requests are merged into "master" + - uses: release-drafter/release-drafter@v5 + with: + config-name: release-drafter.yml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 016f4055216..606d26cd25a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,9 +3,11 @@ Contributions are always welcome. To contribute, [fork](https://help.github.com/ commit your changes, and [open a pull request](https://help.github.com/articles/using-pull-requests/) against the master branch. -Pull requests must have 80% code coverage before beign considered for merge. +Pull requests must have 80% code coverage before being considered for merge. Additional details about the process can be found [here](./PR_REVIEW.md). +There are more details available if you'd like to contribute a [bid adapter](https://docs.prebid.org/dev-docs/bidder-adaptor.html) or [analytics adapter](https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html). + ## Issues [prebid.org](http://prebid.org/) contains documentation that may help answer questions you have about using Prebid.js. If you can't find the answer there, try searching for a similar issue on the [issues page](https://github.com/prebid/Prebid.js/issues). @@ -57,7 +59,7 @@ When you are adding code to Prebid.js, or modifying code that isn't covered by a Prebid.js already has many tests. Read them to see how Prebid.js is tested, and for inspiration: - Look in `test/spec` and its subdirectories -- Tests for bidder adaptors are located in `test/spec/modules` +- Tests for bidder adapters are located in `test/spec/modules` A test module might have the following general structure: diff --git a/PR_REVIEW.md b/PR_REVIEW.md index dac50593d6e..84131c177a3 100644 --- a/PR_REVIEW.md +++ b/PR_REVIEW.md @@ -5,16 +5,55 @@ If the PR is for a standard bid adapter or a standard analytics adapter, just th For modules and core platform updates, the initial reviewer should request an additional team member to review as a sanity check. Merge should only happen when the PR has 2 `LGTM` from the core team and a documentation PR if required. +### Running Tests and Verifying Integrations + +General gulp commands include separate commands for serving the codebase on a built in webserver, creating code coverage reports and allowing serving integration examples. The `review-start` gulp command combinese those into one command. + +- Run `gulp review-start`, adding the host parameter `gulp review-start --host=0.0.0.0` will bind to all IPs on the machine + - A page will open which provides a hub for common reviewer tools. + - If you need to manually acceess the tools: + - Navigate to build/coverage/lcov-report/index.html to view coverage + - Navigate to integrationExamples/gpt/hellow_world.html for basic integration testing + - The hello_world.html and other exampls can be edited and used as needed to verify functionality + ### General PR review Process +- All required global and bidder-adapter rules defined in the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html) must be followed. Please review these rules often - we depend on reviewers to enforce them. - 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 has no unit test coverage, ask for unit tests to be included in the PR. +- 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 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. - 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. - - Below are some examples of bidder specific updates that should require docs update (in their dev-docs/bidders/bidder.md file): +- 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. +- Once there are 2 `LGTM` on the PR, merge to master +- The [draft release](https://github.com/prebid/Prebid.js/releases) notes are managed by [release drafter](https://github.com/release-drafter/release-drafter). To get the PR added to the release notes do the steps below. A github action will use that information to build the release notes. + - Adjust the PR Title to be appropriate for release notes + - Add a label for `feature`, `maintenance`, `fix`, `bugfix` or `bug` to categorize the PR + - Add a semver label of `major`, `minor` or `patch` to indicate the scope of change + +### Reviewing a New or Updated Bid Adapter +Documentation they're supposed to be following is https://docs.prebid.org/dev-docs/bidder-adaptor.html + +Follow steps above for general review process. In addition, please verify the following: +- Verify the biddercode and aliases are valid: + - Lower case alphanumeric with the only special character allowed is underscore. + - The bidder code should be unique for the first 6 characters + - Reserved words that cannot be used as bidder names: all, context, data, general, prebid, and skadn +- Verify that bidder has submitted valid bid params and that bids are being received. +- Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead. +- Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders. +- 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 [`fpd.context` and `fpd.user`](https://docs.prebid.org/dev-docs/publisher-api-reference.html#setConfig-fpd). + - 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 bidRequest page referrer must checked in addition to any bidder-specific parameter. + - If they're getting the COPPA flag, it must come from config.getConfig('coppa'); +- 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 US Privacy consentManagementUsp module, add `usp_supported: true` @@ -23,30 +62,60 @@ For modules and core platform updates, the initial reviewer should request an ad - If they support COPPA, add `coppa_supported: true` - If they support SChain, add `schain_supported: true` - If their bidder doesn't work well with safeframed creatives, add `safeframes_ok: false`. This will alert publishers to not use safeframed creatives when creating the ad server entries for their bidder. - - If they're a member of Prebid.org, add `prebid_member: true` -- If all above is good, add a `LGTM` comment and request 1 additional core member to review. -- Once there is 2 `LGTM` on the PR, merge to master -- Ask the submitter to add a PR for documentation if applicable. -- Add a line into the [draft release](https://github.com/prebid/Prebid.js/releases) notes for this submission. If no draft release is available, create one using [this template]( https://gist.github.com/mkendall07/c3af6f4691bed8a46738b3675cb5a479) -- Add the PR to the appropriate project board (I.E. 1.23.0 Release) for the week, [see](https://github.com/prebid/Prebid.js/projects) - -### New Adapter or updates to adapter process -- Follow steps above for general review process. In addition, please verify the following: -- Verify that bidder has submitted valid bid params and that bids are being received. -- Verify that bidder is not manipulating the prebid.js auction in any way or doing things that go against the principles of the project. If unsure check with the Tech Lead. -- Verify that the bidder is being as efficient as possible, ideally not loading an external library, however if they do load a library it should be cached. -- Verify that code re-use is being done properly and that changes introduced by a bidder don't impact other bidders. -- If the adapter being submitted is an alias type, check with the bidder contact that is being aliased to make sure it's allowed. -- If the adapter is triggering any user syncs make sure they are using the user sync module in the Prebid.js core. -- Requests to the bidder should support HTTPS -- Responses from the bidder should be compressed (such as gzip, compress, deflate) -- Bid responses may not use JSONP: All requests must be AJAX with JSON responses -- All user-sync (aka pixel) activity must be registered via the provided functions -- Adapters may not use the $$PREBID_GLOBAL$$ variable -- All adapters must support the creation of multiple concurrent instances. This means, for example, that adapters cannot rely on mutable global variables. -- Adapters may not globally override or default the standard ad server targeting values: hb_adid, hb_bidder, hb_pb, hb_deal, or hb_size, hb_source, hb_format. + - If they're setting a deal ID in some scenarios, add `bidder_supports_deals: true` + - If they have an IAB Global Vendor List ID, add `gvl_id: ID`. There's no default. - After a new adapter is approved, let the submitter know they may open a PR in the [headerbid-expert repository](https://github.com/prebid/headerbid-expert) to have their adapter recognized by the [Headerbid Expert extension](https://chrome.google.com/webstore/detail/headerbid-expert/cgfkddgbnfplidghapbbnngaogeldmop). The PR should be to the [bidder patterns file](https://github.com/prebid/headerbid-expert/blob/master/bidderPatterns.js), adding an entry with their adapter's name and the url the adapter uses to send and receive bid responses. +### Reviewing a New or Updated Analytics Adapter +Documentation they're supposed to be following is https://docs.prebid.org/dev-docs/integrate-with-the-prebid-analytics-api.html + +No additional steps above the general review process and making sure it conforms to the [Module Rules](https://docs.prebid.org/dev-docs/module-rules.html). + +Make sure there's a docs pull request + +### Reviewing a New or Updated User ID Sub-Module +Documentation they're supposed to be following is https://docs.prebid.org/dev-docs/modules/userId.html#id-providers + +Follow steps above for general review process. In addition: +- Try running the new user ID module with a basic config and confirm it hits the endpoint and stores the results. +- the filename should be camel case ending with `IdSystem` (e.g. `myCompanyIdSystem.js`) +- the `const MODULE_NAME` value should be camel case ending with `Id` (e.g. `myCompanyId` ) +- the response of the `decode` method should be an object with the key being ideally camel case similar to the module name and ending in `id` or `Id`, but in some cases this value is a shortened name and sometimes with the `id` part being all lowercase, provided there are no other uppercase letters. if there's no id or it's an invalid object, the response should be `undefined`. example "valid" values (although this is more style than a requirement) + - `mcid` + - `mcId` + - `myCompanyId` +- make sure they've added references of their new module everywhere required: + - modules/.submodules.json + - modules/userId/eids.js + - modules/userId/eids.md + - 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) +- 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 + - getId (required method) should be the only method that gets a new ID (from ajax calls or a cookie/local storage). this ensures that decode and extend do not unnecessarily delay the auction in places where it is not expected. +- in the eids.js file, the source should be the actual domain of the provider, not a made up domain. +- in the eids.js file, the key in the array should be the same value as the key in the decode function +- make sure all supported config params align in the submodule js file and the docs / examples +- make sure there's a docs pull request + +### Reviewing a New or Updated Real-Time-Data Sub-Module +Documentation they're supposed to be following is https://docs.prebid.org/dev-docs/add-rtd-submodule.html + +Follow steps above for general review process. In addition: +- The RTD Provider must include a `providerRtdProvider.md` file. This file must have example parameters and document a sense of what to expect: what should change in the bidrequest, or what targeting data should be added? +- Try running the new sub-module and confirm the provided test parameters. +- 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 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. +- Consider whether the kind of data the module is obtaining could have privacy implications. If so, make sure they're utilizing the `consent` data passed to them. +- Make sure there's a docs pull request + ## Ticket Coordinator Each week, Prebid Org assigns one person to keep an eye on incoming issues and PRs. Every Monday morning a reminder is diff --git a/README.md b/README.md index 0dd5b25a50f..a220dd69f66 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ 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). +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. + **Table of Contents** - [Usage](#Usage) @@ -91,12 +93,12 @@ Or for Babel 6: Then you can use Prebid.js as any other npm depedendency ```javascript -import prebid from 'prebid.js'; +import pbjs from 'prebid.js'; import 'prebid.js/modules/rubiconBidAdapter'; // imported modules will register themselves automatically with prebid import 'prebid.js/modules/appnexusBidAdapter'; -prebid.processQueue(); // required to process existing pbjs.queue blocks and setup any further pbjs.queue execution +pbjs.processQueue(); // required to process existing pbjs.queue blocks and setup any further pbjs.queue execution -prebid.requestBids({ +pbjs.requestBids({ ... }) @@ -110,11 +112,11 @@ prebid.requestBids({ $ git clone https://github.com/prebid/Prebid.js.git $ cd Prebid.js - $ npm install + $ npm ci *Note:* You need to have `NodeJS` 12.16.1 or greater installed. -*Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1. To comply with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm install`. This shouldn't impact any other projects you may work on that use an earlier version of gulp in its setup. +*Note:* In the 1.24.0 release of Prebid.js we have transitioned to using gulp 4.0 from using gulp 3.9.1. To comply with gulp's recommended setup for 4.0, you'll need to have `gulp-cli` installed globally prior to running the general `npm ci`. This shouldn't impact any other projects you may work on that use an earlier version of gulp in its setup. If you have a previous version of `gulp` installed globally, you'll need to remove it before installing `gulp-cli`. You can check if this is installed by running `gulp -v` and seeing the version that's listed in the `CLI` field of the output. If you have the `gulp` package installed globally, it's likely the same version that you'll see in the `Local` field. If you already have `gulp-cli` installed, it should be a lower major version (it's at version `2.0.1` at the time of the transition). @@ -140,7 +142,7 @@ This runs some code quality checks, starts a web server at `http://localhost:999 ### Build Optimization -The standard build output contains all the available modules from within the `modules` folder. +The standard build output contains all the available modules from within the `modules` folder. Note, however that there are bid adapters which support multiple bidders through aliases, so if you don't see a file in modules for a bid adapter, you may need to grep the repository to find the name of the module you need to include. You might want to exclude some/most of them from the final bundle. To make sure the build only includes the modules you want, you can specify the modules to be included with the `--modules` CLI argument. @@ -200,6 +202,11 @@ To run the unit tests: 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" +``` + To generate and view the code coverage reports: ```bash @@ -258,7 +265,7 @@ directory you will have sourcemaps available in your browser's developer tools. To run the example file, go to: -+ `http://localhost:9999/integrationExamples/gpt/pbjs_example_gpt.html` ++ `http://localhost:9999/integrationExamples/gpt/hello_world.html` As you make code changes, the bundles will be rebuilt and the page reloaded automatically. @@ -266,7 +273,7 @@ As you make code changes, the bundles will be rebuilt and the page reloaded auto ## Contribute -Many SSPs, bidders, and publishers have contributed to this project. [60+ Bidders](https://github.com/prebid/Prebid.js/tree/master/src/adapters) are supported by Prebid.js. +Many SSPs, bidders, and publishers have contributed to this project. [Hundreds of bidders](https://github.com/prebid/Prebid.js/tree/master/src/adapters) are supported by Prebid.js. For guidelines, see [Contributing](./CONTRIBUTING.md). @@ -274,9 +281,7 @@ Our PR review process can be found [here](https://github.com/prebid/Prebid.js/tr ### Add a Bidder Adapter -To add a bidder adapter module, see the instructions in [How to add a bidder adaptor](http://prebid.org/dev-docs/bidder-adaptor.html). - -Please **do NOT load Prebid.js inside your adapter**. If you do this, we will reject or remove your adapter as appropriate. +To add a bidder adapter module, see the instructions in [How to add a bidder adapter](https://docs.prebid.org/dev-docs/bidder-adaptor.html). ### Code Quality diff --git a/RELEASE_SCHEDULE.md b/RELEASE_SCHEDULE.md index 7b2c6244bd7..bfbd0772c3e 100644 --- a/RELEASE_SCHEDULE.md +++ b/RELEASE_SCHEDULE.md @@ -1,6 +1,14 @@ **Table of Contents** - [Release Schedule](#release-schedule) - [Release Process](#release-process) + - [1. Make sure that all PRs have been named and labeled properly per the PR Process](#1-make-sure-that-all-prs-have-been-named-and-labeled-properly-per-the-pr-process) + - [2. Make sure all browserstack tests are passing](#2-make-sure-all-browserstack-tests-are-passing) + - [3. Prepare Prebid Code](#3-prepare-prebid-code) + - [4. Verify the Release](#4-verify-the-release) + - [5. Create a GitHub release](#5-create-a-github-release) + - [6. Update coveralls _(skip for legacy)_](#6-update-coveralls-skip-for-legacy) + - [7. Distribute the code](#7-distribute-the-code) + - [8. Increment Version for Next Release](#8-increment-version-for-next-release) - [Beta Releases](#beta-releases) - [FAQs](#faqs) @@ -9,7 +17,7 @@ We aim to push a new release of Prebid.js every week on Tuesday. 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](http://prebid.org/download.html) will be updated. +it will be about a week before the Prebid Org [Download Page](http://prebid.org/download.html) will be updated. You can determine what is in a given build using the [releases page](https://github.com/prebid/Prebid.js/releases) @@ -19,14 +27,20 @@ Announcements regarding releases will be made to the #headerbidding-dev channel _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for your repo, all of the following git commands will have to be modified to reference the proper remote (e.g. `upstream`)_ -1. Make Sure all browserstack tests are passing. On PR merge to master CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results. - - In case of failure do following, +### 1. Make sure that all PRs have been named and labeled properly per the [PR Process](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md#general-pr-review-process) + * Do this by checking the latest draft release from the [releases page](https://github.com/prebid/Prebid.js/releases) and make sure nothing appears in the first section called "In This Release". If they do, please open the PRs and add the appropriate labels. + * Do a quick check that all the titles/descriptions look ok, and if not, adjust the PR title. + +### 2. Make sure all browserstack tests are passing + + On PR merge to master, CircleCI will run unit tests on browserstack. Checking the last CircleCI build [here](https://circleci.com/gh/prebid/Prebid.js) for master branch will show you detailed results.** + + In case of failure do following, - Try to fix the failing tests. - If you are not able to fix tests in time. Skip the test, create issue and tag contributor. - #### How to run tests in browserstack - + **How to run tests in browserstack** + _Note: the following browserstack information is only relevant for debugging purposes, if you will not be debugging then it can be skipped._ Set the environment variables. You may want to add these to your `~/.bashrc` for convenience. @@ -35,40 +49,40 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for export BROWSERSTACK_USERNAME="my browserstack username" export BROWSERSTACK_ACCESS_KEY="my browserstack access key" ``` - + ``` gulp test --browserstack >> prebid_test.log - + vim prebid_test.log // Will show the test results ``` -2. Prepare Prebid Code +### 3. Prepare Prebid Code Update the package.json version to become the current release. Then commit your changes. ``` - git commit -m "Prebid 1.x.x Release" + git commit -m "Prebid 4.x.x Release" git push ``` -3. Verify Release +### 4. Verify the Release Make sure your there are no more merges to master branch. Prebid code is clean and up to date. -4. Create a GitHub release +### 5. Create a GitHub release + + Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct version is set and the master branch is selected in the dropdown. Click `Publish release`. GitHub will create release tag. - Edit the most recent [release notes](https://github.com/prebid/Prebid.js/releases) draft and make sure the correct tag is in the dropdown. Click `Publish`. GitHub will create release tag. - - Pull these changes locally by running command + Pull these changes locally by running command ``` git pull git fetch --tags - ``` - + ``` + and verify the tag. -5. Update coveralls _(skip for legacy)_ +### 6. Update coveralls _(skip for legacy)_ We use https://coveralls.io/ to show parts of code covered by unit tests. @@ -80,35 +94,23 @@ _Note: If `github.com/prebid/Prebid.js` is not configured as the git origin for Run `gulp coveralls` to update code coverage history. -6. Distribute the code +### 7. Distribute the code - _Note: do not go to step 7 until step 6 has been verified completed._ + _Note: do not go to step 8 until step 7 has been verified completed._ Reach out to any of the Appnexus folks to trigger the jenkins job. - // TODO + // TODO: Jenkins job is moving files to appnexus cdn, pushing prebid.js to npm, purging cache and sending notification to slack. Move all the files from Appnexus CDN to jsDelivr and create bash script to do above tasks. -7. Post Release Version - - Update the version - Manually edit Prebid's package.json to become "1.x.x-pre" (using the values for the next release). Then commit your changes. +### 8. Increment Version for Next Release + + Update the version by manually editing Prebid's `package.json` to become "4.x.x-pre" (using the values for the next release). Then commit your changes. ``` git commit -m "Increment pre version" git push ``` - -8. Create new release draft - - Go to [github releases](https://github.com/prebid/Prebid.js/releases) and add a new draft for the next version of Prebid.js with the following template: -``` -## 🚀New Features - -## 🛠Maintenance - -## 🐛Bug Fixes -``` ## Beta Releases @@ -129,11 +131,8 @@ Characteristics of a `GA` release: ## FAQs **1. Is there flexibility in the schedule?** - -If a major bug is found in the current release, a maintenance patch will be done as soon as possible. - -It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner. +* If a major bug is found in the current release, a maintenance patch will be done as soon as possible. +* It is unlikely that we will put out a maintenance patch at the request of a given bid adapter or module owner. **2. What Pull Requests make it into a release?** - -Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md). +* Every PR that's merged into master will be part of a release. Here are the [PR review guidelines](https://github.com/prebid/Prebid.js/blob/master/PR_REVIEW.md). diff --git a/allowedModules.js b/allowedModules.js index 2a521f781f9..2d23b35c501 100644 --- a/allowedModules.js +++ b/allowedModules.js @@ -12,7 +12,6 @@ module.exports = { 'modules': [ ...sharedWhiteList, 'criteo-direct-rsa-validate', - 'jsencrypt', 'crypto-js', 'live-connect' // Maintained by LiveIntent : https://github.com/liveintent-berlin/live-connect/ ], @@ -21,7 +20,6 @@ module.exports = { 'fun-hooks/no-eval', 'just-clone', 'dlv', - 'dset', - 'deep-equal' + 'dset' ] }; diff --git a/browsers.json b/browsers.json index 91e0548d78a..f73bbbb8aac 100644 --- a/browsers.json +++ b/browsers.json @@ -23,11 +23,11 @@ "device": null, "os": "Windows" }, - "bs_chrome_80_windows_10": { + "bs_chrome_89_windows_10": { "base": "BrowserStack", "os_version": "10", "browser": "chrome", - "browser_version": "80.0", + "browser_version": "89.0", "device": null, "os": "Windows" }, diff --git a/gulpfile.js b/gulpfile.js index e9c0f3ebd05..1386fa63e5e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -30,7 +30,7 @@ const execa = require('execa'); var prebid = require('./package.json'); var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10); -var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + ' */\n'; +var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + '*/\n'; var port = 9999; console.timeEnd('Loading Plugins in Prebid'); const FAKE_SERVER_HOST = argv.host ? argv.host : 'localhost'; @@ -95,7 +95,8 @@ function viewCoverage(done) { connect.server({ port: coveragePort, root: 'build/coverage/lcov-report', - livereload: false + livereload: false, + debug: true }); opens('http://' + mylocalhost + ':' + coveragePort); done(); @@ -103,6 +104,19 @@ function viewCoverage(done) { viewCoverage.displayName = 'view-coverage'; +// View the reviewer tools page +function viewReview(done) { + var mylocalhost = (argv.host) ? argv.host : 'localhost'; + var reviewUrl = 'http://' + mylocalhost + ':' + port + '/integrationExamples/reviewerTools/index.html'; // reuse the main port from 9999 + + // console.log(`stdout: opening` + reviewUrl); + + opens(reviewUrl); + done(); +}; + +viewReview.displayName = 'view-review'; + // Watch Task with Live Reload function watch(done) { var connect = require('gulp-connect'); @@ -121,6 +135,7 @@ function watch(done) { connect.server({ https: argv.https, port: port, + host: FAKE_SERVER_HOST, root: './', livereload: true }); @@ -130,6 +145,12 @@ function watch(done) { done(); }; +function makeModuleList(modules) { + return modules.map(module => { + return '"' + module + '"' + }); +} + function makeDevpackPkg() { var _ = require('lodash'); var connect = require('gulp-connect'); @@ -148,6 +169,7 @@ function makeDevpackPkg() { return gulp.src([].concat(moduleSources, analyticsSources, 'src/prebid.js')) .pipe(helpers.nameModules(externalModules)) .pipe(webpackStream(cloned, webpack)) + .pipe(replace(/('|")v\$prebid\.modulesList\$('|")/g, makeModuleList(externalModules))) .pipe(gulp.dest('build/dev')) .pipe(connect.reload()); } @@ -174,10 +196,15 @@ function makeWebpackPkg() { .pipe(helpers.nameModules(externalModules)) .pipe(webpackStream(cloned, webpack)) .pipe(uglify()) + .pipe(replace(/('|")v\$prebid\.modulesList\$('|")/g, makeModuleList(externalModules))) .pipe(gulpif(file => file.basename === 'prebid-core.js', header(banner, { prebid: prebid }))) .pipe(gulp.dest('build/dist')); } +function getModulesListToAddInBanner(modules) { + return (modules.length > 0) ? modules.join(', ') : 'All available modules in current version.'; +} + function gulpBundle(dev) { return bundle(dev).pipe(gulp.dest('build/' + (dev ? 'dev' : 'dist'))); } @@ -238,6 +265,8 @@ function bundle(dev, moduleArr) { return gulp.src( entries ) + // Need to uodate the "Modules: ..." section in comment with the current modules list + .pipe(replace(/(Modules: )(.*?)(\*\/)/, ('$1' + getModulesListToAddInBanner(helpers.getArgModules()) + ' $3'))) .pipe(gulpif(dev, sourcemaps.init({ loadMaps: true }))) .pipe(concat(outputFileName)) .pipe(gulpif(!argv.manualEnable, footer('\n<%= global %>.processQueue();', { @@ -306,7 +335,7 @@ function test(done) { } else { var karmaConf = karmaConfMaker(false, argv.browserstack, argv.watch, argv.file); - var browserOverride = helpers.parseBrowserArgs(argv).map(helpers.toCapitalCase); + var browserOverride = helpers.parseBrowserArgs(argv); if (browserOverride.length > 0) { karmaConf.browsers = browserOverride; } @@ -433,4 +462,8 @@ gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-p gulp.task(bundleToStdout); gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step +// build task for reviewers, runs test-coverage, serves, without watching +gulp.task(viewReview); +gulp.task('review-start', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, testCoverage), viewReview)); + module.exports = nodeBundle; diff --git a/integrationExamples/gpt/adUnitFloors.html b/integrationExamples/gpt/adUnitFloors.html new file mode 100644 index 00000000000..bb48a20ef78 --- /dev/null +++ b/integrationExamples/gpt/adUnitFloors.html @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + +

Prebid.js Test

+
Div-1
+
+ +
+ + + + diff --git a/integrationExamples/gpt/adloox.html b/integrationExamples/gpt/adloox.html new file mode 100644 index 00000000000..33f8b9be6a2 --- /dev/null +++ b/integrationExamples/gpt/adloox.html @@ -0,0 +1,211 @@ + + + + Prebid Display/Video Merged Auction with Adloox Integration + + + + + + + + +

Prebid Display/Video Merged Auction with Adloox Integration

+ +

div-1

+
+ +
+ +

div-2

+
+ +
+ +

video-1

+
+ + + + diff --git a/integrationExamples/gpt/audigentSegments_example.html b/integrationExamples/gpt/audigentSegments_example.html deleted file mode 100644 index 7739b558327..00000000000 --- a/integrationExamples/gpt/audigentSegments_example.html +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - - - - - - - - - -

Audigent Segments Prebid

- -
- -
-TDID: -
-
- -Audigent Segments: -
-
- - diff --git a/integrationExamples/gpt/creative_rendering.html b/integrationExamples/gpt/creative_rendering.html index aef8b7f1654..04d4736c631 100644 --- a/integrationExamples/gpt/creative_rendering.html +++ b/integrationExamples/gpt/creative_rendering.html @@ -1,9 +1,4 @@ - - - - + - - - - - - - - - - - - -

DigiTrust Prebid Full Sample

- - -

- This sample shows the simplest integration path for using DigiTrust ID with Prebid. - You can use DigiTrust ID without integrating the entire DigiTrust suite. -

- -
- -
- -
- - - - diff --git a/integrationExamples/gpt/digitrust_Simple.html b/integrationExamples/gpt/digitrust_Simple.html deleted file mode 100644 index 2581c6ce7cc..00000000000 --- a/integrationExamples/gpt/digitrust_Simple.html +++ /dev/null @@ -1,230 +0,0 @@ - - - Simple DigiTrust Prebid - No Framework - - - - - - - - - - - - - - -

DigiTrust Prebid Sample - No Framework

- -

- This sample shows the simplest integration path for using DigiTrust ID with Prebid. - You can use DigiTrust ID without integrating the entire DigiTrust suite. -

-
- -
- -
- - diff --git a/integrationExamples/gpt/digitrust_cmp_test.html b/integrationExamples/gpt/digitrust_cmp_test.html deleted file mode 100644 index 6f0a70188f3..00000000000 --- a/integrationExamples/gpt/digitrust_cmp_test.html +++ /dev/null @@ -1,192 +0,0 @@ - - - CMP Simple DigiTrust Prebid - No Framework - - - - - - - - - - - - - -

DigiTrust Prebid Sample - No Framework

- -

- This sample tests cmp behavior with simple integration path for using DigiTrust ID with Prebid. - You can use DigiTrust ID without integrating the entire DigiTrust suite. -

-
- -
- -
- - - diff --git a/integrationExamples/gpt/gdpr_hello_world.html b/integrationExamples/gpt/gdpr_hello_world.html index de0630178f1..2d70af8d34f 100644 --- a/integrationExamples/gpt/gdpr_hello_world.html +++ b/integrationExamples/gpt/gdpr_hello_world.html @@ -82,7 +82,7 @@ - + + + - +

Prebid.js Test

Div-1
diff --git a/integrationExamples/gpt/haloRtdProvider_example.html b/integrationExamples/gpt/haloRtdProvider_example.html new file mode 100644 index 00000000000..14debbd2698 --- /dev/null +++ b/integrationExamples/gpt/haloRtdProvider_example.html @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + +

Halo RTD Prebid

+ +
+ +
+ +Halo Id: +
+
+ +Halo Real-Time Data: +
+
+ + diff --git a/integrationExamples/gpt/idImportLibrary_example.html b/integrationExamples/gpt/idImportLibrary_example.html new file mode 100644 index 00000000000..f35b571e8f9 --- /dev/null +++ b/integrationExamples/gpt/idImportLibrary_example.html @@ -0,0 +1,352 @@ + + + + + + + + + + + + + +Prebid + +

ID Import Library Example

+

Steps before logging in:

+ +
    +
  • Open console +
      +
    • For Mac, Command+Option+J
      • +
    • Windows/Linux, Control+Shift+J
      • +
    +
    • +
  • Search for 'ID-Library' in console
    • +
+ + + + + + + + + diff --git a/integrationExamples/gpt/ixMultiFormat.html b/integrationExamples/gpt/ixMultiFormat.html new file mode 100644 index 00000000000..c4ed5bb9b1e --- /dev/null +++ b/integrationExamples/gpt/ixMultiFormat.html @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + +

Prebid.js Test

+
Div-1
+
+ +
+ + + + diff --git a/integrationExamples/gpt/jwplayerRtdProvider_example.html b/integrationExamples/gpt/jwplayerRtdProvider_example.html new file mode 100644 index 00000000000..75eb85a2d8c --- /dev/null +++ b/integrationExamples/gpt/jwplayerRtdProvider_example.html @@ -0,0 +1,108 @@ + + + + + + + JW Player RTD Provider Example + + + + + + + + +
Div-1
+
+ +
+ + diff --git a/integrationExamples/gpt/optimeraRtdProvider_example.html b/integrationExamples/gpt/optimeraRtdProvider_example.html new file mode 100644 index 00000000000..109a4c2b366 --- /dev/null +++ b/integrationExamples/gpt/optimeraRtdProvider_example.html @@ -0,0 +1,152 @@ + + + + + + + + + Optimera RTD Example + + + + + + + + + + +

Basic Prebid.js Example

+
Div-1
+
+ +
+ +
+ +
Div-0
+
+ +
+ + + + \ No newline at end of file diff --git a/integrationExamples/gpt/permutiveRtdProvider_example.html b/integrationExamples/gpt/permutiveRtdProvider_example.html new file mode 100644 index 00000000000..a06430bcdfa --- /dev/null +++ b/integrationExamples/gpt/permutiveRtdProvider_example.html @@ -0,0 +1,232 @@ + + + + + + + + + + + +

+

Basic Prebid.js Example

+
Div-1
+
+ +
+ +
+ +
Div-2
+
+ +
+ + + + diff --git a/integrationExamples/gpt/prebidServer_example.html b/integrationExamples/gpt/prebidServer_example.html index 7761178efa8..37902edd979 100644 --- a/integrationExamples/gpt/prebidServer_example.html +++ b/integrationExamples/gpt/prebidServer_example.html @@ -56,10 +56,10 @@ s2sConfig : { accountId : '1', enabled : true, //default value set to false + defaultVendor: 'appnexus', bidders : ['appnexus'], timeout : 1000, //default value is 1000 adapter : 'prebidServer', //if we have any other s2s adapter, default value is s2s - endpoint : 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction' } }); diff --git a/integrationExamples/gpt/reconciliationRtdProvider_example.html b/integrationExamples/gpt/reconciliationRtdProvider_example.html new file mode 100644 index 00000000000..4f9b663c22d --- /dev/null +++ b/integrationExamples/gpt/reconciliationRtdProvider_example.html @@ -0,0 +1,102 @@ + + + + + + + Reconciliation RTD Provider Example + + + + + + + + +
Div-1
+
+ +
+ + diff --git a/integrationExamples/gpt/sirdataRtdProvider_example.html b/integrationExamples/gpt/sirdataRtdProvider_example.html new file mode 100644 index 00000000000..444c9133905 --- /dev/null +++ b/integrationExamples/gpt/sirdataRtdProvider_example.html @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + +
+

+Give consent or make a choice in Europe. Module will add key/value pairs in ad calls. Check out for sd_rtd key in Google Ad call (https://securepubads.g.doubleclick.net/gampad/ads...) and in the payload sent to Xandr to endpoint https://ib.adnxs.com/ut/v3/prebid : tags[0].keywords.key[sd_rtd] should have an array of string as value. This array will mix user segments and/or page categories based on user's choices. +

+
+

Basic Prebid.js Example

+
Div-1
+
+ +
+ + + \ No newline at end of file diff --git a/integrationExamples/gpt/userId_example.html b/integrationExamples/gpt/userId_example.html index 69e2c713fb8..6fbdd69aea7 100644 --- a/integrationExamples/gpt/userId_example.html +++ b/integrationExamples/gpt/userId_example.html @@ -1,265 +1,321 @@ - + + + - + } + ] + } + ]; - + - var adUnits = [ - { - code: 'test-div', - sizes: [[300,250],[300,600],[728,90]], - bids: [ - { - bidder: 'rubicon', - params: { - accountId: '1001', - siteId: '113932', - zoneId: '535510' - } - } - ] - } - ]; + - - - + function sendAdserverRequest() { + if (pbjs.adserverRequestSent) return; + pbjs.adserverRequestSent = true; + googletag.cmd.push(function () { + pbjs.que.push(function () { + pbjs.setTargetingForGPTAsync(); + googletag.pubads().refresh(); + }); + }); + } - + setTimeout(function () { + sendAdserverRequest(); + }, FAILSAFE_TIMEOUT); + - + + + -

Rubicon Project Prebid

+

User ID Modules Example

+ +

Generated EIDs

+ + 

 
-

+  
Ad Slot

+  

     
-

+  

 
+
 
diff --git a/integrationExamples/mass/index.html b/integrationExamples/mass/index.html
new file mode 100644
index 00000000000..3b034957d13
--- /dev/null
+++ b/integrationExamples/mass/index.html
@@ -0,0 +1,132 @@
+
+  
+      
+
+      
+  
+      
+      
+  
+      
+  
+      
+  
+  
+  
+    

+      
Note: for this example to work, you need access to a bid simulation tool from your MASS enabled Exchange partner.

+      

+        
+      

+    

+  
+
diff --git a/integrationExamples/postbid/postbid_prebidServer_example.html b/integrationExamples/postbid/postbid_prebidServer_example.html
new file mode 100644
index 00000000000..3af7b010872
--- /dev/null
+++ b/integrationExamples/postbid/postbid_prebidServer_example.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+    
+
+
+
diff --git a/integrationExamples/reviewerTools/index.html b/integrationExamples/reviewerTools/index.html
new file mode 100755
index 00000000000..2732cb4fd88
--- /dev/null
+++ b/integrationExamples/reviewerTools/index.html
@@ -0,0 +1,40 @@
+
+
+    
+    
+    
+
+    Prebid Reviewer Tools
+    
+
+
+
+    

+        
            
+            

+                
Reviewer Tools

+                
Below are links to the most common tool used by Prebid reviewers. For more info on PR review processes check out the General PR Review Process page on Github.

+                
Common

+                
+                
Other Tools

+                
+                
Documentation & Training Material

+                
+            

+        

+    

+
+
\ No newline at end of file
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
index 712ef14caa1..8af216d6262 100644
--- a/karma.conf.maker.js
+++ b/karma.conf.maker.js
@@ -170,6 +170,16 @@ module.exports = function(codeCoverage, browserstack, watchMode, file) {
 
     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/modules.json b/modules.json
index 28379a12962..4eb4fa3d08d 100644
--- a/modules.json
+++ b/modules.json
@@ -1 +1 @@
-["appnexusBidAdapter","consentManagement","sekindoUMBidAdapter","pulsepointBidAdapter","audienceNetworkBidAdapter","openxBidAdapter","rubiconBidAdapter","sovrnBidAdapter","pubmaticBidAdapter","adgenerationBidAdapter","pubmaticServerBidAdapter","ixBidAdapter","criteoBidAdapter"]
+["appnexusBidAdapter"]
diff --git a/modules/.submodules.json b/modules/.submodules.json
index db93e3f58da..3714f0933a2 100644
--- a/modules/.submodules.json
+++ b/modules/.submodules.json
@@ -2,23 +2,53 @@
   "userId": [
     "unifiedIdSystem",
     "pubCommonIdSystem",
-    "digiTrustIdSystem",
     "id5IdSystem",
     "criteortusIdSystem",
     "parrableIdSystem",
     "britepoolIdSystem",
     "liveIntentIdSystem",
     "lotamePanoramaId",
+    "merkleIdSystem",
     "criteoIdSystem",
     "netIdSystem",
     "identityLinkIdSystem",
-    "sharedIdSystem"
+    "sharedIdSystem",
+    "intentIqIdSystem",
+    "zeotapIdPlusIdSystem",
+    "haloIdSystem",
+    "quantcastIdSystem",
+    "deepintentDpesIdSystem",
+    "nextrollIdSystem",
+    "idxIdSystem",
+    "fabrickIdSystem",
+    "verizonMediaIdSystem",
+    "pubProvidedIdSystem",
+    "mwOpenLinkIdSystem",
+    "tapadIdSystem",
+    "novatiqIdSystem",
+    "uid2IdSystem",
+    "admixerIdSystem",
+    "dmdIdSystem",
+    "flocIdSystem"
   ],
   "adpod": [
     "freeWheelAdserverVideo",
     "dfpAdServerVideo"
   ],
   "rtdModule": [
-    "browsiRtdProvider"
+    "browsiRtdProvider",
+    "dgkeywordRtdProvider",
+    "geoedgeRtdProvider",
+    "haloRtdProvider",
+    "iasRtdProvider",
+    "jwplayerRtdProvider",
+    "optimeraRtdProvider",
+    "permutiveRtdProvider",
+    "reconciliationRtdProvider",
+    "sirdataRtdProvider"
+  ],
+  "fpdModule": [
+    "enrichmentFpdModule",
+    "validationFpdModule"
   ]
 }
diff --git a/modules/33acrossBidAdapter.js b/modules/33acrossBidAdapter.js
index 5df2af7f32e..4b8028d97fd 100644
--- a/modules/33acrossBidAdapter.js
+++ b/modules/33acrossBidAdapter.js
@@ -1,12 +1,37 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import * as utils from '../src/utils.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = '33across';
 const END_POINT = 'https://ssc.33across.com/api/v1/hb';
 const SYNC_ENDPOINT = 'https://ssc-cms.33across.com/ps/?m=xch&rt=html&ru=deb';
-const MEDIA_TYPE = 'banner';
+
 const CURRENCY = 'USD';
+const GUID_PATTERN = /^[a-zA-Z0-9_-]{22}$/;
+
+const PRODUCT = {
+  SIAB: 'siab',
+  INVIEW: 'inview',
+  INSTREAM: 'instream'
+};
+
+const VIDEO_ORTB_PARAMS = [
+  'mimes',
+  'minduration',
+  'maxduration',
+  'placement',
+  'protocols',
+  'startdelay',
+  'skip',
+  'skipafter',
+  'minbitrate',
+  'maxbitrate',
+  'delivery',
+  'playbackmethod',
+  'api',
+  'linearity'
+];
 
 const adapterState = {
   uniqueSiteIds: []
@@ -14,57 +39,122 @@ const adapterState = {
 
 const NON_MEASURABLE = 'nm';
 
-// All this assumes that only one bid is ever returned by ttx
-function _createBidResponse(response) {
-  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,
-    netRevenue: true
+// **************************** VALIDATION *************************** //
+function isBidRequestValid(bid) {
+  return (
+    _validateBasic(bid) &&
+    _validateBanner(bid) &&
+    _validateVideo(bid)
+  );
+}
+
+function _validateBasic(bid) {
+  if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
+    return false;
+  }
+
+  if (!_validateGUID(bid)) {
+    return false;
   }
+
+  return true;
 }
 
-function _isViewabilityMeasurable(element) {
-  return !_isIframe() && element !== null;
+function _validateGUID(bid) {
+  const siteID = utils.deepAccess(bid, 'params.siteId', '') || '';
+  if (siteID.trim().match(GUID_PATTERN) === null) {
+    return false;
+  }
+
+  return true;
 }
 
-function _getViewability(element, topWin, { w, h } = {}) {
-  return topWin.document.visibilityState === 'visible'
-    ? _getPercentInView(element, topWin, { w, h })
-    : 0;
+function _validateBanner(bid) {
+  const banner = utils.deepAccess(bid, 'mediaTypes.banner');
+  // If there's no banner no need to validate against banner rules
+  if (banner === undefined) {
+    return true;
+  }
+
+  if (!Array.isArray(banner.sizes)) {
+    return false;
+  }
+
+  return true;
 }
 
-function _mapAdUnitPathToElementId(adUnitCode) {
-  if (utils.isGptPubadsDefined()) {
-    // eslint-disable-next-line no-undef
-    const adSlots = googletag.pubads().getSlots();
-    const isMatchingAdSlot = utils.isSlotMatchingAdUnitCode(adUnitCode);
+function _validateVideo(bid) {
+  const videoAdUnit = utils.deepAccess(bid, 'mediaTypes.video');
+  const videoBidderParams = utils.deepAccess(bid, 'params.video', {});
 
-    for (let i = 0; i < adSlots.length; i++) {
-      if (isMatchingAdSlot(adSlots[i])) {
-        const id = adSlots[i].getSlotElementId();
+  // If there's no video no need to validate against video rules
+  if (videoAdUnit === undefined) {
+    return true;
+  }
 
-        utils.logInfo(`[33Across Adapter] Map ad unit path to HTML element id: '${adUnitCode}' -> ${id}`);
+  if (!Array.isArray(videoAdUnit.playerSize)) {
+    return false;
+  }
 
-        return id;
-      }
-    }
+  if (!videoAdUnit.context) {
+    return false;
   }
 
-  utils.logWarn(`[33Across Adapter] Unable to locate element for ad unit code: '${adUnitCode}'`);
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams
+  };
 
-  return null;
+  if (!Array.isArray(videoParams.mimes) || videoParams.mimes.length === 0) {
+    return false;
+  }
+
+  if (!Array.isArray(videoParams.protocols) || videoParams.protocols.length === 0) {
+    return false;
+  }
+
+  // If placement if defined, it must be a number
+  if (
+    typeof videoParams.placement !== 'undefined' &&
+    typeof videoParams.placement !== 'number'
+  ) {
+    return false;
+  }
+
+  // If startdelay is defined it must be a number
+  if (
+    videoAdUnit.context === 'instream' &&
+    typeof videoParams.startdelay !== 'undefined' &&
+    typeof videoParams.startdelay !== 'number'
+  ) {
+    return false;
+  }
+
+  return true;
 }
 
-function _getAdSlotHTMLElement(adUnitCode) {
-  return document.getElementById(adUnitCode) ||
-    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
+// **************************** BUILD REQUESTS *************************** //
+// NOTE: With regards to gdrp consent data, the server will independently
+// infer the gdpr applicability therefore, setting the default value to false
+function buildRequests(bidRequests, bidderRequest) {
+  const gdprConsent = Object.assign({
+    consentString: undefined,
+    gdprApplies: false
+  }, bidderRequest && bidderRequest.gdprConsent);
+
+  const uspConsent = bidderRequest && bidderRequest.uspConsent;
+  const pageUrl = (bidderRequest && bidderRequest.refererInfo) ? (bidderRequest.refererInfo.referer) : (undefined);
+
+  adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(utils.uniques);
+
+  return bidRequests.map(bidRequest => _createServerRequest(
+    {
+      bidRequest,
+      gdprConsent,
+      uspConsent,
+      pageUrl
+    })
+  );
 }
 
 // Infer the necessary data from valid bid for a minimal ttxRequest and create HTTP request
@@ -72,46 +162,28 @@ function _getAdSlotHTMLElement(adUnitCode) {
 function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl}) {
   const ttxRequest = {};
   const params = bidRequest.params;
-  const element = _getAdSlotHTMLElement(bidRequest.adUnitCode);
-  const sizes = _transformSizes(bidRequest.sizes);
 
-  let format;
-
-  // We support size based bidfloors so obtain one if there's a rule associated
-  if (typeof bidRequest.getFloor === 'function') {
-    let getFloor = bidRequest.getFloor.bind(bidRequest);
-
-    format = sizes.map((size) => {
-      const formatExt = _getBidFloors(getFloor, size);
+  /*
+   * Infer data for the request payload
+   */
+  ttxRequest.imp = [{}];
 
-      return Object.assign({}, size, formatExt);
-    });
-  } else {
-    format = sizes;
+  if (utils.deepAccess(bidRequest, 'mediaTypes.banner')) {
+    ttxRequest.imp[0].banner = {
+      ..._buildBannerORTB(bidRequest)
+    }
   }
 
-  const minSize = _getMinSize(sizes);
-
-  const viewabilityAmount = _isViewabilityMeasurable(element)
-    ? _getViewability(element, utils.getWindowTop(), minSize)
-    : NON_MEASURABLE;
-
-  const contributeViewability = ViewabilityContributor(viewabilityAmount);
+  if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
+    ttxRequest.imp[0].video = _buildVideoORTB(bidRequest);
+  }
 
-  /*
-   * Infer data for the request payload
-   */
-  ttxRequest.imp = [];
-  ttxRequest.imp[0] = {
-    banner: {
-      format
-    },
-    ext: {
-      ttx: {
-        prod: params.productId
-      }
+  ttxRequest.imp[0].ext = {
+    ttx: {
+      prod: _getProduct(bidRequest)
     }
   };
+
   ttxRequest.site = { id: params.siteId };
 
   if (pageUrl) {
@@ -122,18 +194,36 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
   // therefore in ad targetting process
   ttxRequest.id = bidRequest.bidId;
 
-  // Set GDPR related fields
-  ttxRequest.user = {
-    ext: {
-      consent: gdprConsent.consentString
-    }
-  };
-  ttxRequest.regs = {
-    ext: {
-      gdpr: (gdprConsent.gdprApplies === true) ? 1 : 0,
-      us_privacy: uspConsent || null
-    }
-  };
+  if (gdprConsent.consentString) {
+    ttxRequest.user = setExtension(
+      ttxRequest.user,
+      'consent',
+      gdprConsent.consentString
+    )
+  }
+
+  if (Array.isArray(bidRequest.userIdAsEids) && bidRequest.userIdAsEids.length > 0) {
+    ttxRequest.user = setExtension(
+      ttxRequest.user,
+      'eids',
+      bidRequest.userIdAsEids
+    )
+  }
+
+  ttxRequest.regs = setExtension(
+    ttxRequest.regs,
+    'gdpr',
+    Number(gdprConsent.gdprApplies)
+  );
+
+  if (uspConsent) {
+    ttxRequest.regs = setExtension(
+      ttxRequest.regs,
+      'us_privacy',
+      uspConsent
+    )
+  }
+
   ttxRequest.ext = {
     ttx: {
       prebidStartedAt: Date.now(),
@@ -145,11 +235,11 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
   };
 
   if (bidRequest.schain) {
-    ttxRequest.source = {
-      ext: {
-        schain: bidRequest.schain
-      }
-    }
+    ttxRequest.source = setExtension(
+      ttxRequest.source,
+      'schain',
+      bidRequest.schain
+    )
   }
 
   // Finally, set the openRTB 'test' param if this is to be a test bid
@@ -167,59 +257,202 @@ function _createServerRequest({bidRequest, gdprConsent = {}, uspConsent, pageUrl
 
   // Allow the ability to configure the HB endpoint for testing purposes.
   const ttxSettings = config.getConfig('ttxSettings');
-  const url = (ttxSettings && ttxSettings.url) || END_POINT;
+  const url = (ttxSettings && ttxSettings.url) || `${END_POINT}?guid=${params.siteId}`;
 
   // Return the server request
   return {
     'method': 'POST',
     'url': url,
-    'data': JSON.stringify(contributeViewability(ttxRequest)),
+    'data': JSON.stringify(ttxRequest),
     'options': options
   }
 }
 
-// Sync object will always be of type iframe for TTX
-function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConsent }) {
-  const ttxSettings = config.getConfig('ttxSettings');
-  const syncUrl = (ttxSettings && ttxSettings.syncUrl) || SYNC_ENDPOINT;
+// BUILD REQUESTS: SET EXTENSIONS
+function setExtension(obj = {}, key, value) {
+  return Object.assign({}, obj, {
+    ext: Object.assign({}, obj.ext, {
+      [key]: value
+    })
+  });
+}
 
-  const { consentString, gdprApplies } = gdprConsent;
+// BUILD REQUESTS: SIZE INFERENCE
+function _transformSizes(sizes) {
+  if (utils.isArray(sizes) && sizes.length === 2 && !utils.isArray(sizes[0])) {
+    return [ _getSize(sizes) ];
+  }
 
-  const sync = {
-    type: 'iframe',
-    url: `${syncUrl}&id=${siteId}&gdpr_consent=${encodeURIComponent(consentString)}&us_privacy=${encodeURIComponent(uspConsent)}`
-  };
+  return sizes.map(_getSize);
+}
 
-  if (typeof gdprApplies === 'boolean') {
-    sync.url += `&gdpr=${Number(gdprApplies)}`;
+function _getSize(size) {
+  return {
+    w: parseInt(size[0], 10),
+    h: parseInt(size[1], 10)
   }
+}
 
-  return sync;
+// BUILD REQUESTS: PRODUCT INFERENCE
+function _getProduct(bidRequest) {
+  const { params, mediaTypes } = bidRequest;
+
+  const { banner, video } = mediaTypes;
+
+  if ((video && !banner) && video.context === 'instream') {
+    return PRODUCT.INSTREAM;
+  }
+
+  return (params.productId === PRODUCT.INVIEW) ? (params.productId) : PRODUCT.SIAB;
 }
 
-function _getBidFloors(getFloor, size) {
-  const bidFloors = getFloor({
+// BUILD REQUESTS: BANNER
+function _buildBannerORTB(bidRequest) {
+  const bannerAdUnit = utils.deepAccess(bidRequest, 'mediaTypes.banner', {});
+  const element = _getAdSlotHTMLElement(bidRequest.adUnitCode);
+
+  const sizes = _transformSizes(bannerAdUnit.sizes);
+
+  let format;
+
+  // We support size based bidfloors so obtain one if there's a rule associated
+  if (typeof bidRequest.getFloor === 'function') {
+    format = sizes.map((size) => {
+      const bidfloors = _getBidFloors(bidRequest, size, BANNER);
+
+      let formatExt;
+      if (bidfloors) {
+        formatExt = {
+          ext: {
+            ttx: {
+              bidfloors: [ bidfloors ]
+            }
+          }
+        }
+      }
+
+      return Object.assign({}, size, formatExt);
+    });
+  } else {
+    format = sizes;
+  }
+
+  const minSize = _getMinSize(sizes);
+
+  const viewabilityAmount = _isViewabilityMeasurable(element)
+    ? _getViewability(element, utils.getWindowTop(), minSize)
+    : NON_MEASURABLE;
+
+  const ext = contributeViewability(viewabilityAmount);
+
+  return {
+    format,
+    ext
+  }
+}
+
+// BUILD REQUESTS: VIDEO
+// eslint-disable-next-line no-unused-vars
+function _buildVideoORTB(bidRequest) {
+  const videoAdUnit = utils.deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = utils.deepAccess(bidRequest, 'params.video', {});
+
+  const videoParams = {
+    ...videoAdUnit,
+    ...videoBidderParams // Bidder Specific overrides
+  };
+
+  const video = {}
+
+  const {w, h} = _getSize(videoParams.playerSize[0]);
+  video.w = w;
+  video.h = h;
+
+  // Obtain all ORTB params related video from Ad Unit
+  VIDEO_ORTB_PARAMS.forEach((param) => {
+    if (videoParams.hasOwnProperty(param)) {
+      video[param] = videoParams[param];
+    }
+  });
+
+  const product = _getProduct(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 (product === PRODUCT.INSTREAM) {
+    video.startdelay = video.startdelay || 0;
+    video.placement = 1;
+  };
+
+  // bidfloors
+  if (typeof bidRequest.getFloor === 'function') {
+    const bidfloors = _getBidFloors(bidRequest, {w: video.w, h: video.h}, VIDEO);
+
+    if (bidfloors) {
+      Object.assign(video, {
+        ext: {
+          ttx: {
+            bidfloors: [ bidfloors ]
+          }
+        }
+      });
+    }
+  }
+  return video;
+}
+
+// BUILD REQUESTS: BIDFLOORS
+function _getBidFloors(bidRequest, size, mediaType) {
+  const bidFloors = bidRequest.getFloor({
     currency: CURRENCY,
-    mediaType: MEDIA_TYPE,
+    mediaType,
     size: [ size.w, size.h ]
   });
 
   if (!isNaN(bidFloors.floor) && (bidFloors.currency === CURRENCY)) {
-    return {
-      ext: {
-        ttx: {
-          bidfloors: [ bidFloors.floor ]
-        }
+    return bidFloors.floor;
+  }
+}
+
+// BUILD REQUESTS: VIEWABILITY
+function _isViewabilityMeasurable(element) {
+  return !_isIframe() && element !== null;
+}
+
+function _getViewability(element, topWin, { w, h } = {}) {
+  return topWin.document.visibilityState === 'visible'
+    ? _getPercentInView(element, topWin, { w, h })
+    : 0;
+}
+
+function _mapAdUnitPathToElementId(adUnitCode) {
+  if (utils.isGptPubadsDefined()) {
+    // eslint-disable-next-line no-undef
+    const adSlots = googletag.pubads().getSlots();
+    const isMatchingAdSlot = utils.isSlotMatchingAdUnitCode(adUnitCode);
+
+    for (let i = 0; i < adSlots.length; i++) {
+      if (isMatchingAdSlot(adSlots[i])) {
+        const id = adSlots[i].getSlotElementId();
+
+        utils.logInfo(`[33Across Adapter] Map ad unit path to HTML element id: '${adUnitCode}' -> ${id}`);
+
+        return id;
       }
     }
   }
+
+  utils.logWarn(`[33Across Adapter] Unable to locate element for ad unit code: '${adUnitCode}'`);
+
+  return null;
 }
 
-function _getSize(size) {
-  return {
-    w: parseInt(size[0], 10),
-    h: parseInt(size[1], 10)
-  }
+function _getAdSlotHTMLElement(adUnitCode) {
+  return document.getElementById(adUnitCode) ||
+    document.getElementById(_mapAdUnitPathToElementId(adUnitCode));
 }
 
 function _getMinSize(sizes) {
@@ -239,14 +472,6 @@ function _getBoundingBox(element, { w, h } = {}) {
   return { width, height, left, top, right, bottom };
 }
 
-function _transformSizes(sizes) {
-  if (utils.isArray(sizes) && sizes.length === 2 && !utils.isArray(sizes[0])) {
-    return [ _getSize(sizes) ];
-  }
-
-  return sizes.map(_getSize);
-}
-
 function _getIntersectionOfRects(rects) {
   const bbox = {
     left: rects[0].left,
@@ -307,20 +532,16 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
 /**
  * Viewability contribution to request..
  */
-function ViewabilityContributor(viewabilityAmount) {
-  function contributeViewability(ttxRequest) {
-    const req = Object.assign({}, ttxRequest);
-    const imp = req.imp = req.imp.map(impItem => Object.assign({}, impItem));
-    const banner = imp[0].banner = Object.assign({}, imp[0].banner);
-    const ext = banner.ext = Object.assign({}, banner.ext);
-    const ttx = ext.ttx = Object.assign({}, ext.ttx);
+function contributeViewability(viewabilityAmount) {
+  const amount = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
 
-    ttx.viewability = { amount: isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount) };
-
-    return req;
-  }
-
-  return contributeViewability;
+  return {
+    ttx: {
+      viewability: {
+        amount
+      }
+    }
+  };
 }
 
 function _isIframe() {
@@ -331,53 +552,58 @@ function _isIframe() {
   }
 }
 
-function isBidRequestValid(bid) {
-  if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
-    return false;
-  }
+// **************************** INTERPRET RESPONSE ******************************** //
+// NOTE: At this point, the response from 33exchange will only ever contain one bid
+// i.e. the highest bid
+function interpretResponse(serverResponse, bidRequest) {
+  const bidResponses = [];
 
-  if (typeof bid.params.siteId === 'undefined' || typeof bid.params.productId === 'undefined') {
-    return false;
+  // If there are bids, look at the first bid of the first seatbid (see NOTE above for assumption about ttx)
+  if (serverResponse.body.seatbid.length > 0 && serverResponse.body.seatbid[0].bid.length > 0) {
+    bidResponses.push(_createBidResponse(serverResponse.body));
   }
 
-  return true;
+  return bidResponses;
 }
 
-// NOTE: With regards to gdrp consent data,
-// - the server independently infers gdpr applicability therefore, setting the default value to false
-function buildRequests(bidRequests, bidderRequest) {
-  const gdprConsent = Object.assign({
-    consentString: undefined,
-    gdprApplies: false
-  }, bidderRequest && bidderRequest.gdprConsent);
-
-  const uspConsent = bidderRequest && bidderRequest.uspConsent;
-  const pageUrl = (bidderRequest && bidderRequest.refererInfo) ? (bidderRequest.refererInfo.referer) : (undefined);
-
-  adapterState.uniqueSiteIds = bidRequests.map(req => req.params.siteId).filter(utils.uniques);
+// All this assumes that only one bid is ever returned by ttx
+function _createBidResponse(response) {
+  const isADomainPresent =
+    response.seatbid[0].bid[0].adomain && response.seatbid[0].bid[0].adomain.length;
+  const bid = {
+    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,
+    mediaType: utils.deepAccess(response.seatbid[0].bid[0], 'ext.ttx.mediaType', BANNER),
+    currency: response.cur,
+    netRevenue: true
+  }
 
-  return bidRequests.map(bidRequest => _createServerRequest(
-    {
-      bidRequest,
-      gdprConsent,
-      uspConsent,
-      pageUrl
-    })
-  );
-}
+  if (isADomainPresent) {
+    bid.meta = {
+      advertiserDomains: response.seatbid[0].bid[0].adomain
+    };
+  }
 
-// NOTE: At this point, the response from 33exchange will only ever contain one bid i.e. the highest bid
-function interpretResponse(serverResponse, bidRequest) {
-  const bidResponses = [];
+  if (bid.mediaType === VIDEO) {
+    const vastType = utils.deepAccess(response.seatbid[0].bid[0], 'ext.ttx.vastType', 'xml');
 
-  // If there are bids, look at the first bid of the first seatbid (see NOTE above for assumption about ttx)
-  if (serverResponse.body.seatbid.length > 0 && serverResponse.body.seatbid[0].bid.length > 0) {
-    bidResponses.push(_createBidResponse(serverResponse.body));
+    if (vastType === 'xml') {
+      bid.vastXml = bid.ad;
+    } else {
+      bid.vastUrl = bid.ad;
+    }
   }
 
-  return bidResponses;
+  return bid;
 }
 
+// **************************** USER SYNC *************************** //
 // Register one sync per unique guid so long as iframe is enable
 // Else no syncs
 // For logic on how we handle gdpr data see _createSyncs and module's unit tests
@@ -395,11 +621,30 @@ function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
   return syncUrls;
 }
 
+// Sync object will always be of type iframe for TTX
+function _createSync({ siteId = 'zzz000000000003zzz', gdprConsent = {}, uspConsent }) {
+  const ttxSettings = config.getConfig('ttxSettings');
+  const syncUrl = (ttxSettings && ttxSettings.syncUrl) || SYNC_ENDPOINT;
+
+  const { consentString, gdprApplies } = gdprConsent;
+
+  const sync = {
+    type: 'iframe',
+    url: `${syncUrl}&id=${siteId}&gdpr_consent=${encodeURIComponent(consentString)}&us_privacy=${encodeURIComponent(uspConsent)}`
+  };
+
+  if (typeof gdprApplies === 'boolean') {
+    sync.url += `&gdpr=${Number(gdprApplies)}`;
+  }
+
+  return sync;
+}
+
 export const spec = {
   NON_MEASURABLE,
 
   code: BIDDER_CODE,
-
+  supportedMediaTypes: [ BANNER, VIDEO ],
   isBidRequestValid,
   buildRequests,
   interpretResponse,
diff --git a/modules/33acrossBidAdapter.md b/modules/33acrossBidAdapter.md
index c313f3b6e0b..c01c04251e5 100644
--- a/modules/33acrossBidAdapter.md
+++ b/modules/33acrossBidAdapter.md
@@ -10,23 +10,145 @@ Maintainer: headerbidding@33across.com
 
 Connects to 33Across's exchange for bids.
 
-33Across bid adapter supports only Banner at present and follows MRA
+33Across bid adapter supports Banner and Video at present and follows MRA
 
 # Sample Ad Unit: For Publishers
+## Sample Banner only Ad Unit
 ```
 var adUnits = [
 {
-    code: '33across-hb-ad-123456-1', // ad slot HTML element ID   
-    sizes: [
-        [300, 250], 
-        [728, 90]
-    ],     
-    bids: [{
-        bidder: '33across',
-        params: {
-            siteId: 'cxBE0qjUir6iopaKkGJozW',     
-            productId: 'siab'     
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250], 
+          [728, 90]
+      ]
+    }   
+  } 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Video only Ad Unit: Outstream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    video: {  
+      playerSize: [300, 250],
+      context: 'outstream',
+      placement: 2
+      ... // Aditional ORTB video params
+    }   
+  },
+  renderer: {
+    url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+    render: function (bid) {
+        adResponse = {
+            ad: {
+                video: {
+                    content: bid.vastXml,
+                    player_height: bid.playerHeight,
+                    player_width: bid.playerWidth
+                }
+            }
         }
-    }]
+        // push to render queue because ANOutstreamVideo may not be loaded yet.
+        bid.renderer.push(() => {
+            ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode, // target div id to render video.
+                adResponse: adResponse
+            });
+        });
+    }
+  }, 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Multi-Format Ad Unit: Outstream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    banner: {  
+      sizes: [
+          [300, 250], 
+          [728, 90]
+      ]
+    },
+    video: {  
+      playerSize: [300, 250],
+      context: 'outstream',
+      placement: 2
+      ... // Aditional ORTB video params
+    }   
+  },
+  renderer: {
+    url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+    render: function (bid) {
+        adResponse = {
+            ad: {
+                video: {
+                    content: bid.vastXml,
+                    player_height: bid.playerHeight,
+                    player_width: bid.playerWidth
+                }
+            }
+        }
+        // push to render queue because ANOutstreamVideo may not be loaded yet.
+        bid.renderer.push(() => {
+            ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode, // target div id to render video.
+                adResponse: adResponse
+            });
+        });
+    }
+  },
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'siab'     
+    }
+  }]
+}
+```
+
+## Sample Video only Ad Unit: Instream
+```
+var adUnits = [
+{
+  code: '33across-hb-ad-123456-1', // ad slot HTML element ID  
+  mediaTypes: {
+    video: {  
+      playerSize: [300, 250],
+      context: 'intstream',
+      placement: 1
+      ... // Aditional ORTB video params
+    }   
+  } 
+  bids: [{
+    bidder: '33across',
+    params: {
+        siteId: 'sample33xGUID123456789',     
+        productId: 'instream'     
+    }
+  }]
 }
 ```
diff --git a/modules/a4gBidAdapter.js b/modules/a4gBidAdapter.js
new file mode 100644
index 00000000000..01c59616dc0
--- /dev/null
+++ b/modules/a4gBidAdapter.js
@@ -0,0 +1,92 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+
+const A4G_BIDDER_CODE = 'a4g';
+const A4G_CURRENCY = 'USD';
+const A4G_DEFAULT_BID_URL = 'https://ads.ad4game.com/v1/bid';
+const A4G_TTL = 120;
+
+const LOCATION_PARAM_NAME = 'siteurl';
+const ID_PARAM_NAME = 'id';
+const IFRAME_PARAM_NAME = 'if';
+const ZONE_ID_PARAM_NAME = 'zoneId';
+const SIZE_PARAM_NAME = 'size';
+
+const ARRAY_PARAM_SEPARATOR = ';';
+const ARRAY_SIZE_SEPARATOR = ',';
+const SIZE_SEPARATOR = 'x';
+
+export const spec = {
+  code: A4G_BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    return bid.params && !!bid.params.zoneId;
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let deliveryUrl = '';
+    const idParams = [];
+    const sizeParams = [];
+    const zoneIds = [];
+
+    utils._each(validBidRequests, function(bid) {
+      if (!deliveryUrl && typeof bid.params.deliveryUrl === 'string') {
+        deliveryUrl = bid.params.deliveryUrl;
+      }
+      idParams.push(bid.bidId);
+      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+      sizeParams.push(bidSizes.map(size => size.join(SIZE_SEPARATOR)).join(ARRAY_SIZE_SEPARATOR));
+      zoneIds.push(bid.params.zoneId);
+    });
+
+    if (!deliveryUrl) {
+      deliveryUrl = A4G_DEFAULT_BID_URL;
+    }
+
+    let data = {
+      [IFRAME_PARAM_NAME]: 0,
+      [LOCATION_PARAM_NAME]: (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : window.location.href,
+      [SIZE_PARAM_NAME]: sizeParams.join(ARRAY_PARAM_SEPARATOR),
+      [ID_PARAM_NAME]: idParams.join(ARRAY_PARAM_SEPARATOR),
+      [ZONE_ID_PARAM_NAME]: zoneIds.join(ARRAY_PARAM_SEPARATOR)
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      data.gdpr = {
+        applies: bidderRequest.gdprConsent.gdprApplies,
+        consent: bidderRequest.gdprConsent.consentString
+      };
+    }
+
+    return {
+      method: 'GET',
+      url: deliveryUrl,
+      data: data
+    };
+  },
+
+  interpretResponse: function(serverResponses, request) {
+    const bidResponses = [];
+    utils._each(serverResponses.body, function(response) {
+      if (response.cpm > 0) {
+        const bidResponse = {
+          requestId: response.id,
+          creativeId: response.crid || response.id,
+          cpm: response.cpm,
+          width: response.width,
+          height: response.height,
+          currency: A4G_CURRENCY,
+          netRevenue: true,
+          ttl: A4G_TTL,
+          ad: response.ad,
+          meta: {
+            advertiserDomains: response.adomain && response.adomain.length > 0 ? response.adomain : []
+          }
+        };
+        bidResponses.push(bidResponse);
+      }
+    });
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/a4gBidAdapter.md b/modules/a4gBidAdapter.md
index dcab312ed29..70f110724b0 100644
--- a/modules/a4gBidAdapter.md
+++ b/modules/a4gBidAdapter.md
@@ -6,32 +6,40 @@ Maintainer: devops@ad4game.com
 
 # Description
 
-Ad4Game Bidder Adapter for Prebid.js. It should be tested on real domain. `localhost` should be rewritten (ex. example.com). 
+Ad4Game Bidder Adapter for Prebid.js. It should be tested on real domain. `localhost` should be rewritten (ex. example.com).
 
 # Test Parameters
 ```
     var adUnits = [
        {
            code: 'test-div',
-           sizes: [[300, 250]],  // a display size
+           mediaTypes: {
+               banner: {
+                   sizes: [[300, 250]],  // a display size
+               }
+           },
            bids: [
                {
                     bidder: 'a4g',
                     params: {
                         zoneId: 59304,
-                        deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+                        deliveryUrl: 'https://dev01.ad4game.com/v1/bid'
                     }
                }
            ]
        },{
            code: 'test-div',
-           sizes: [[300, 50]],   // a mobile size
+           mediaTypes: {
+              banner: {
+                  sizes: [[300, 50]],  // a mobile size
+              }
+          },
            bids: [
                {
                     bidder: 'a4g',
                     params: {
                         zoneId: 59354,
-                        deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+                        deliveryUrl: 'https://dev01.ad4game.com/v1/bid'
                     }
                }
            ]
diff --git a/modules/ablidaBidAdapter.js b/modules/ablidaBidAdapter.js
index 9bd22ef1f0d..2400952367f 100644
--- a/modules/ablidaBidAdapter.js
+++ b/modules/ablidaBidAdapter.js
@@ -1,13 +1,14 @@
 import * as utils from '../src/utils.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {ajax} from '../src/ajax.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'ablida';
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -31,20 +32,25 @@ export const spec = {
       return [];
     }
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.sizes)[0];
-      const size = sizes.split('x');
+      let sizes = []
+      if (bidRequest.mediaTypes && bidRequest.mediaTypes[BANNER] && bidRequest.mediaTypes[BANNER].sizes) {
+        sizes = bidRequest.mediaTypes[BANNER].sizes;
+      } else if (bidRequest.mediaTypes[VIDEO] && bidRequest.mediaTypes[VIDEO].playerSize) {
+        sizes = bidRequest.mediaTypes[VIDEO].playerSize
+      }
       const jaySupported = 'atob' in window && 'currentScript' in document;
       const device = getDevice();
       const payload = {
         placementId: bidRequest.params.placementId,
-        width: size[0],
-        height: size[1],
+        sizes: sizes,
         bidId: bidRequest.bidId,
         categories: bidRequest.params.categories,
         referer: bidderRequest.refererInfo.referer,
         jaySupported: jaySupported,
         device: device,
-        adapterVersion: 2
+        adapterVersion: 5,
+        mediaTypes: bidRequest.mediaTypes,
+        gdprConsent: bidderRequest.gdprConsent
       };
       return {
         method: 'POST',
@@ -72,9 +78,8 @@ export const spec = {
     return bidResponses;
   },
   onBidWon: function (bid) {
-    if (!bid['nurl']) { return false; }
-    ajax(bid['nurl'], null);
-    return true;
+    if (!bid['nurl']) { return; }
+    utils.triggerPixel(bid['nurl']);
   }
 };
 
diff --git a/modules/ablidaBidAdapter.md b/modules/ablidaBidAdapter.md
index 70e6576cd30..e0a9f3f9405 100644
--- a/modules/ablidaBidAdapter.md
+++ b/modules/ablidaBidAdapter.md
@@ -27,6 +27,46 @@ Module that connects to Ablida's bidder for bids.
                        }
                    }
                ]
+           }, {
+               code: 'native-ad-div',
+               mediaTypes: {
+                   native: {
+                       image: {
+                           sendId: true,
+                           required: true
+                       },
+                       title: {
+                           required: true
+                       },
+                       body: {
+                           required: true
+                       }
+                   }
+               },
+               bids: [
+                   {
+                       bidder: 'ablida',
+                       params: {
+                           placementId: 'native-demo'
+                       }
+                   }
+               ]
+           }, {
+               code: 'video-ad',
+               mediaTypes: {
+                   video: {
+                       playerSize: [[640, 360]],
+                       context: 'instream'
+                  }
+               },
+               bids: [
+                   {
+                       bidder: 'ablida',
+                       params: {
+                           placementId: 'instream-demo'
+                       }
+                   }
+               ]
            }
-       ];
+    ];
 ```
diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
new file mode 100644
index 00000000000..a3d78a69d91
--- /dev/null
+++ b/modules/adWMGBidAdapter.js
@@ -0,0 +1,319 @@
+'use strict';
+
+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';
+
+const BIDDER_CODE = 'adWMG';
+const ENDPOINT = 'https://hb.adwmg.com/hb';
+let SYNC_ENDPOINT = 'https://hb.adwmg.com/cphb.html?';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wmg'],
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: (bid) => {
+    if (bid.bidder !== BIDDER_CODE) {
+      return false;
+    }
+
+    if (!(bid.params.publisherId)) {
+      return false;
+    }
+
+    return true;
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const timeout = bidderRequest.timeout || 0;
+    const debug = config.getConfig('debug') || false;
+    const referrer = bidderRequest.refererInfo.referer;
+    const locale = window.navigator.language && window.navigator.language.length > 0 ? window.navigator.language.substr(0, 2) : '';
+    const domain = config.getConfig('publisherDomain') || (window.location && window.location.host ? window.location.host : '');
+    const ua = window.navigator.userAgent.toLowerCase();
+    const additional = spec.parseUserAgent(ua);
+
+    return validBidRequests.map(bidRequest => {
+      const checkFloorValue = (value) => {
+        if (isNaN(parseFloat(value))) {
+          return 0;
+        } else return parseFloat(value);
+      }
+
+      const adUnit = {
+        code: bidRequest.adUnitCode,
+        bids: {
+          bidder: bidRequest.bidder,
+          params: {
+            publisherId: bidRequest.params.publisherId,
+            IABCategories: bidRequest.params.IABCategories || [],
+            floorCPM: bidRequest.params.floorCPM ? checkFloorValue(bidRequest.params.floorCPM) : 0
+          }
+        },
+        mediaTypes: bidRequest.mediaTypes
+      };
+
+      if (bidRequest.hasOwnProperty('sizes') && bidRequest.sizes.length > 0) {
+        adUnit.sizes = bidRequest.sizes;
+      }
+
+      const request = {
+        auctionId: bidRequest.auctionId,
+        requestId: bidRequest.bidId,
+        bidRequestsCount: bidRequest.bidRequestsCount,
+        bidderRequestId: bidRequest.bidderRequestId,
+        transactionId: bidRequest.transactionId,
+        referrer: referrer,
+        timeout: timeout,
+        adUnit: adUnit,
+        locale: locale,
+        domain: domain,
+        os: additional.os,
+        osv: additional.osv,
+        devicetype: additional.devicetype
+      };
+
+      if (bidderRequest.gdprConsent) {
+        request.gdpr = {
+          applies: bidderRequest.gdprConsent.gdprApplies,
+          consentString: bidderRequest.gdprConsent.consentString
+        };
+      }
+
+      /*       if (bidderRequest.uspConsent) {
+        request.uspConsent = bidderRequest.uspConsent;
+      }
+ */
+      if (bidRequest.userId && bidRequest.userId.pubcid) {
+        request.userId = {
+          pubcid: bidRequest.userId.pubcid
+        };
+      }
+
+      if (debug) {
+        request.debug = debug;
+      }
+
+      return {
+        method: 'POST',
+        url: ENDPOINT,
+        data: JSON.stringify(request)
+      }
+    });
+  },
+  interpretResponse: (serverResponse) => {
+    const bidResponses = [];
+
+    if (serverResponse.body) {
+      const response = serverResponse.body;
+      const bidResponse = {
+        requestId: response.requestId,
+        cpm: response.cpm,
+        width: response.width,
+        height: response.height,
+        creativeId: response.creativeId,
+        currency: response.currency,
+        netRevenue: response.netRevenue,
+        ttl: response.ttl,
+        ad: response.ad,
+        meta: {
+          advertiserDomains: response.adomain && response.adomain.length ? response.adomain : [],
+          mediaType: 'banner'
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    if (gdprConsent && SYNC_ENDPOINT.indexOf('gdpr') === -1) {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr', (gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    if (gdprConsent && typeof gdprConsent.consentString === 'string' && SYNC_ENDPOINT.indexOf('gdpr_consent') === -1) {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'gdpr_consent', gdprConsent.consentString);
+    }
+
+    if (SYNC_ENDPOINT.slice(-1) === '&') {
+      SYNC_ENDPOINT = SYNC_ENDPOINT.slice(0, -1);
+    }
+
+    /*     if (uspConsent) {
+      SYNC_ENDPOINT = utils.tryAppendQueryString(SYNC_ENDPOINT, 'us_privacy', uspConsent);
+    } */
+    let syncs = [];
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: SYNC_ENDPOINT
+      });
+    }
+    return syncs;
+  },
+  parseUserAgent: (ua) => {
+    function detectDevice() {
+      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 2;
+    }
+
+    function detectOs() {
+      const module = {
+        options: [],
+        header: [navigator.platform, ua, navigator.appVersion, navigator.vendor, window.opera],
+        dataos: [{
+          name: 'Windows Phone',
+          value: 'Windows Phone',
+          version: 'OS'
+        },
+        {
+          name: 'Windows',
+          value: 'Win',
+          version: 'NT'
+        },
+        {
+          name: 'iOS',
+          value: 'iPhone',
+          version: 'OS'
+        },
+        {
+          name: 'iOS',
+          value: 'iPad',
+          version: 'OS'
+        },
+        {
+          name: 'Kindle',
+          value: 'Silk',
+          version: 'Silk'
+        },
+        {
+          name: 'Android',
+          value: 'Android',
+          version: 'Android'
+        },
+        {
+          name: 'PlayBook',
+          value: 'PlayBook',
+          version: 'OS'
+        },
+        {
+          name: 'BlackBerry',
+          value: 'BlackBerry',
+          version: '/'
+        },
+        {
+          name: 'Macintosh',
+          value: 'Mac',
+          version: 'OS X'
+        },
+        {
+          name: 'Linux',
+          value: 'Linux',
+          version: 'rv'
+        },
+        {
+          name: 'Palm',
+          value: 'Palm',
+          version: 'PalmOS'
+        }
+        ],
+        init: function () {
+          var agent = this.header.join(' ');
+          var os = this.matchItem(agent, this.dataos);
+          return {
+            os
+          };
+        },
+
+        getVersion: function (name, version) {
+          if (name === 'Windows') {
+            switch (parseFloat(version).toFixed(1)) {
+              case '5.0':
+                return '2000';
+              case '5.1':
+                return 'XP';
+              case '5.2':
+                return 'Server 2003';
+              case '6.0':
+                return 'Vista';
+              case '6.1':
+                return '7';
+              case '6.2':
+                return '8';
+              case '6.3':
+                return '8.1';
+              default:
+                return version || 'other';
+            }
+          } else return version || 'other';
+        },
+
+        matchItem: function (string, data) {
+          var i = 0;
+          var j = 0;
+          var regex, regexv, match, matches, version;
+
+          for (i = 0; i < data.length; i += 1) {
+            regex = new RegExp(data[i].value, 'i');
+            match = regex.test(string);
+            if (match) {
+              regexv = new RegExp(data[i].version + '[- /:;]([\\d._]+)', 'i');
+              matches = string.match(regexv);
+              version = '';
+              if (matches) {
+                if (matches[1]) {
+                  matches = matches[1];
+                }
+              }
+              if (matches) {
+                matches = matches.split(/[._]+/);
+                for (j = 0; j < matches.length; j += 1) {
+                  if (j === 0) {
+                    version += matches[j] + '.';
+                  } else {
+                    version += matches[j];
+                  }
+                }
+              } else {
+                version = 'other';
+              }
+              return {
+                name: data[i].name,
+                version: this.getVersion(data[i].name, version)
+              };
+            }
+          }
+          return {
+            name: 'unknown',
+            version: 'other'
+          };
+        }
+      };
+
+      var e = module.init();
+
+      return {
+        os: e.os.name || '',
+        osv: e.os.version || ''
+      }
+    }
+
+    return {
+      devicetype: detectDevice(),
+      os: detectOs().os,
+      osv: detectOs().osv
+    }
+  }
+};
+registerBidder(spec);
diff --git a/modules/adWMGBidAdapter.md b/modules/adWMGBidAdapter.md
new file mode 100644
index 00000000000..ec5541e6168
--- /dev/null
+++ b/modules/adWMGBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: adWMG Adapter
+Module Type: Bidder Adapter
+Maintainer: wbid@adwmg.com
+```
+
+# Description
+
+Module that connects to adWMG demand sources to fetch bids. Supports 'banner' ad format.
+
+# Bid Parameters
+
+| Key             | Required | Example                      | Description                     |
+| --------------- | -------- | -----------------------------| ------------------------------- |
+| `publisherId`   | yes      | `'5cebea3c9eea646c7b623d5e'` | publisher ID from WMG Dashboard |
+| `IABCategories` | no       | `['IAB1', 'IAB5']`           | IAB ad categories for adUnit    |
+| `floorCPM`      | no       | `0.5`                        | Floor price for adUnit          |
+
+
+# Test Parameters
+
+```javascript
+var adUnits = [{
+  code: 'wmg-test-div',
+  sizes: [[300, 250]],
+  bids: [{
+    bidder: 'adWMG',
+    params: {
+      publisherId: '5cebea3c9eea646c7b623d5e',
+      IABCategories: ['IAB1', 'IAB5']
+    },
+  }]
+}]
\ No newline at end of file
diff --git a/modules/adagioBidAdapter.js b/modules/adagioBidAdapter.js
index b2ef5dafb41..5598dc5d224 100644
--- a/modules/adagioBidAdapter.js
+++ b/modules/adagioBidAdapter.js
@@ -1,64 +1,112 @@
 import find from 'core-js-pure/features/array/find.js';
 import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { loadExternalScript } from '../src/adloader.js'
-import JSEncrypt from 'jsencrypt/bin/jsencrypt.js';
-import sha256 from 'crypto-js/sha256.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 } from '../src/refererDetection.js';
+import { createEidsArray } from './userId/eids.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { Renderer } from '../src/Renderer.js';
+import { OUTSTREAM } from '../src/video.js';
 const BIDDER_CODE = 'adagio';
-const VERSION = '2.2.2';
+const LOG_PREFIX = 'Adagio:';
+export const VERSION = '2.11.0';
 const FEATURES_VERSION = '1';
-const ENDPOINT = 'https://mp.4dex.io/prebid';
-const SUPPORTED_MEDIA_TYPES = ['banner'];
+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;
-const storage = getStorageManager(GVLID, 'adagio');
+export const storage = getStorageManager(GVLID, 'adagio');
+export const RENDERER_URL = 'https://script.4dex.io/outstream-player.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';
+const DEFAULT_FLOOR = 0.1;
+
+// This provide a whitelist and a basic validation
+// of OpenRTB 2.5 options used by the Adagio SSP.
+// https://www.iab.com/wp-content/uploads/2016/03/OpenRTB-API-Specification-Version-2-5-FINAL.pdf
+export const ORTB_VIDEO_PARAMS = {
+  'mimes': (value) => Array.isArray(value) && value.length > 0 && value.every(v => typeof v === 'string'),
+  'minduration': (value) => utils.isInteger(value),
+  'maxduration': (value) => utils.isInteger(value),
+  'protocols': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].indexOf(v) !== -1),
+  'w': (value) => utils.isInteger(value),
+  'h': (value) => utils.isInteger(value),
+  'startdelay': (value) => utils.isInteger(value),
+  'placement': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5].indexOf(v) !== -1),
+  'linearity': (value) => [1, 2].indexOf(value) !== -1,
+  'skip': (value) => [0, 1].indexOf(value) !== -1,
+  'skipmin': (value) => utils.isInteger(value),
+  'skipafter': (value) => utils.isInteger(value),
+  'sequence': (value) => utils.isInteger(value),
+  'battr': (value) => Array.isArray(value) && value.every(v => Array.from({length: 17}, (_, i) => i + 1).indexOf(v) !== -1),
+  'maxextended': (value) => utils.isInteger(value),
+  'minbitrate': (value) => utils.isInteger(value),
+  'maxbitrate': (value) => utils.isInteger(value),
+  'boxingallowed': (value) => [0, 1].indexOf(value) !== -1,
+  'playbackmethod': (value) => Array.isArray(value) && value.every(v => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1),
+  'playbackend': (value) => [1, 2, 3].indexOf(value) !== -1,
+  '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 => [1, 2, 3, 4, 5, 6].indexOf(v) !== -1)
+};
+
+let currentWindow;
 
-export const ADAGIO_PUBKEY = `-----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9el0+OEn6fvEh1RdVHQu4cnT0
-jFSzIbGJJyg3cKqvtE6A0iaz9PkIdJIvSSSNrmJv+lRGKPEyRA/VnzJIieL39Ngl
-t0b0lsHN+W4n9kitS/DZ/xnxWK/9vxhv0ZtL1LL/rwR5Mup7rmJbNtDoNBw4TIGj
-pV6EP3MTLosuUEpLaQIDAQAB
------END PUBLIC KEY-----`;
+const EXT_DATA = {}
 
 export function adagioScriptFromLocalStorageCb(ls) {
   try {
     if (!ls) {
-      utils.logWarn('Adagio Script not found');
+      utils.logWarn(`${LOG_PREFIX} script not found.`);
       return;
     }
 
     const hashRgx = /^(\/\/ hash: (.+)\n)(.+\n)$/;
 
     if (!hashRgx.test(ls)) {
-      utils.logWarn('No hash found in Adagio script');
+      utils.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];
 
-      var jsEncrypt = new JSEncrypt();
-      jsEncrypt.setPublicKey(ADAGIO_PUBKEY);
-
-      if (jsEncrypt.verify(content, hash, sha256)) {
-        utils.logInfo('Start Adagio script');
+      if (verify(content, hash, ADAGIO_PUBKEY, ADAGIO_PUBKEY_E)) {
+        utils.logInfo(`${LOG_PREFIX} start script.`);
         Function(ls)(); // eslint-disable-line no-new-func
       } else {
-        utils.logWarn('Invalid Adagio script found');
+        utils.logWarn(`${LOG_PREFIX} invalid script found.`);
         storage.removeDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY);
       }
     }
   } catch (err) {
-    //
+    utils.logError(LOG_PREFIX, err);
   }
 }
 
 export function getAdagioScript() {
   storage.getDataFromLocalStorage(ADAGIO_LOCALSTORAGE_KEY, (ls) => {
-    adagioScriptFromLocalStorageCb(ls)
+    internal.adagioScriptFromLocalStorageCb(ls);
+  });
+
+  storage.localStorageIsEnabled(isValid => {
+    if (isValid) {
+      loadExternalScript(ADAGIO_TAG_URL, BIDDER_CODE);
+    } else {
+      // 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');
+    }
   });
 }
 
@@ -72,113 +120,236 @@ function canAccessTopWindow() {
   }
 }
 
+function getCurrentWindow() {
+  return currentWindow || utils.getWindowSelf();
+}
+
+function isSafeFrameWindow() {
+  const ws = utils.getWindowSelf();
+  return !!(ws.$sf && ws.$sf.ext);
+}
+
+// Get localStorage "adagio" data to be passed to the request
+export function prepareExchange(storageValue) {
+  const adagioStorage = JSON.parse(storageValue, function(name, value) {
+    if (!name.startsWith('_') || name === '') {
+      return value;
+    }
+  });
+  let random = utils.deepAccess(adagioStorage, 'session.rnd');
+  let newSession = false;
+
+  if (internal.isNewSession(adagioStorage)) {
+    newSession = true;
+    random = Math.random();
+  }
+
+  const data = {
+    session: {
+      new: newSession,
+      rnd: random
+    }
+  }
+
+  utils.mergeDeep(EXT_DATA, adagioStorage, data);
+
+  internal.enqueue({
+    action: 'session',
+    ts: Date.now(),
+    data: EXT_DATA
+  });
+}
+
 function initAdagio() {
-  const w = utils.getWindowTop();
+  if (canAccessTopWindow()) {
+    currentWindow = (canAccessTopWindow()) ? utils.getWindowTop() : utils.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.adagioBidderAdapter = VERSION;
+  w.ADAGIO.isSafeFrameWindow = isSafeFrameWindow();
 
-  getAdagioScript();
-
-  loadExternalScript(ADAGIO_TAG_URL, BIDDER_CODE)
-}
+  storage.getDataFromLocalStorage('adagio', (storageData) => {
+    try {
+      internal.prepareExchange(storageData);
+    } catch (e) {
+      utils.logError(LOG_PREFIX, e);
+    }
+  });
 
-if (canAccessTopWindow()) {
-  initAdagio();
+  getAdagioScript();
 }
 
 export const _features = {
-  getPrintNumber: function (adUnitCode) {
-    const adagioAdUnit = _getOrAddAdagioAdUnit(adUnitCode);
+  getPrintNumber(adUnitCode) {
+    const adagioAdUnit = internal.getOrAddAdagioAdUnit(adUnitCode);
     return adagioAdUnit.printNumber || 1;
   },
 
-  getPageDimensions: function () {
-    const viewportDims = _features.getViewPortDimensions().split('x');
-    const w = utils.getWindowTop();
-    const body = w.document.body;
+  getPageDimensions() {
+    if (isSafeFrameWindow() || !canAccessTopWindow()) {
+      return '';
+    }
+
+    // the page dimension can be computed on window.top only.
+    const wt = utils.getWindowTop();
+    const body = wt.document.querySelector('body');
+
     if (!body) {
-      return ''
+      return '';
     }
-    const html = w.document.documentElement;
+    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 viewportDims[0] + 'x' + pageHeight;
+    return `${pageWidth}x${pageHeight}`;
   },
 
-  getViewPortDimensions: function () {
-    let viewPortWidth;
-    let viewPortHeight;
-    const w = utils.getWindowTop();
-    const d = w.document;
+  getViewPortDimensions() {
+    if (!isSafeFrameWindow() && !canAccessTopWindow()) {
+      return '';
+    }
+
+    const viewportDims = { w: 0, h: 0 };
 
-    if (w.innerWidth) {
-      viewPortWidth = w.innerWidth;
-      viewPortHeight = w.innerHeight;
+    if (isSafeFrameWindow()) {
+      const ws = utils.getWindowSelf();
+
+      if (typeof ws.$sf.ext.geom !== 'function') {
+        utils.logWarn(`${LOG_PREFIX} cannot use the $sf.ext.geom() safeFrame API method`);
+        return '';
+      }
+
+      const sfGeom = ws.$sf.ext.geom().win;
+      viewportDims.w = Math.round(sfGeom.w);
+      viewportDims.h = Math.round(sfGeom.h);
     } else {
-      viewPortWidth = d.getElementsByTagName('body')[0].clientWidth;
-      viewPortHeight = d.getElementsByTagName('body')[0].clientHeight;
+      // window.top based computing
+      const wt = utils.getWindowTop();
+
+      if (wt.innerWidth) {
+        viewportDims.w = wt.innerWidth;
+        viewportDims.h = wt.innerHeight;
+      } else {
+        const d = wt.document;
+        const body = d.querySelector('body');
+
+        if (!body) {
+          return '';
+        }
+
+        viewportDims.w = d.querySelector('body').clientWidth;
+        viewportDims.h = d.querySelector('body').clientHeight;
+      }
     }
 
-    return viewPortWidth + 'x' + viewPortHeight;
+    return `${viewportDims.w}x${viewportDims.h}`;
   },
 
-  isDomLoading: function () {
-    const w = utils.getWindowTop();
-    let performance = w.performance || w.msPerformance || w.webkitPerformance || w.mozPerformance;
-    let domLoading = -1;
+  /**
+   * domLoading feature is computed on window.top if reachable.
+   */
+  getDomLoadingDuration() {
+    let domLoadingDuration = -1;
+    let performance;
+
+    performance = (canAccessTopWindow()) ? utils.getWindowTop().performance : utils.getWindowSelf().performance;
 
     if (performance && performance.timing && performance.timing.navigationStart > 0) {
       const val = performance.timing.domLoading - performance.timing.navigationStart;
-      if (val > 0) domLoading = val;
+      if (val > 0) {
+        domLoadingDuration = val;
+      }
     }
-    return domLoading;
+
+    return domLoadingDuration;
   },
 
-  getSlotPosition: function (element) {
-    if (!element) return '';
+  getSlotPosition(params) {
+    const { adUnitElementId, postBid } = params;
+
+    if (!adUnitElementId) {
+      return '';
+    }
 
-    const w = utils.getWindowTop();
-    const d = w.document;
-    const el = element;
+    if (!isSafeFrameWindow() && !canAccessTopWindow()) {
+      return '';
+    }
 
-    let box = el.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 = w.pageYOffset || docEl.scrollTop || body.scrollTop;
-    const scrollLeft = w.pageXOffset || docEl.scrollLeft || body.scrollLeft;
+    const position = { x: 0, y: 0 };
 
-    const elComputedStyle = w.getComputedStyle(el, null);
-    const elComputedDisplay = elComputedStyle.display || 'block';
-    const mustDisplayElement = elComputedDisplay === 'none';
+    if (isSafeFrameWindow()) {
+      const ws = utils.getWindowSelf();
 
-    if (mustDisplayElement) {
-      el.style = el.style || {};
-      el.style.display = 'block';
-      box = el.getBoundingClientRect();
-      el.style.display = elComputedDisplay;
-    }
+      if (typeof ws.$sf.ext.geom !== 'function') {
+        utils.logWarn(`${LOG_PREFIX} cannot use the $sf.ext.geom() safeFrame API method`);
+        return '';
+      }
 
-    const position = {
-      x: Math.round(box.left + scrollLeft - clientLeft),
-      y: Math.round(box.top + scrollTop - clientTop)
-    };
+      const sfGeom = ws.$sf.ext.geom().self;
+      position.x = Math.round(sfGeom.t);
+      position.y = Math.round(sfGeom.l);
+    } else if (canAccessTopWindow()) {
+      // window.top based computing
+      const wt = utils.getWindowTop();
+      const d = wt.document;
+
+      let domElement;
+
+      if (postBid === true) {
+        const ws = utils.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;
 
-    return position.x + 'x' + position.y;
+      const elComputedStyle = wt.getComputedStyle(domElement, null);
+      const elComputedDisplay = elComputedStyle.display || 'block';
+      const mustDisplayElement = elComputedDisplay === 'none';
+
+      if (mustDisplayElement) {
+        domElement.style = domElement.style || {};
+        domElement.style.display = 'block';
+        box = domElement.getBoundingClientRect();
+        domElement.style.display = elComputedDisplay;
+      }
+      position.x = Math.round(box.left + scrollLeft - clientLeft);
+      position.y = Math.round(box.top + scrollTop - clientTop);
+    } else {
+      return '';
+    }
+
+    return `${position.x}x${position.y}`;
   },
 
-  getTimestamp: function () {
+  getTimestampUTC() {
+    // timestamp returned in seconds
     return Math.floor(new Date().getTime() / 1000) - new Date().getTimezoneOffset() * 60;
   },
 
-  getDevice: function () {
-    if (!canAccessTopWindow()) return false;
-    const w = utils.getWindowTop();
-    const ua = w.navigator.userAgent;
+  getDevice() {
+    const ws = utils.getWindowSelf();
+    const ua = ws.navigator.userAgent;
 
     if ((/(tablet|ipad|playbook|silk)|(android(?!.*mobi))/i).test(ua)) {
       return 5; // "tablet"
@@ -189,52 +360,83 @@ export const _features = {
     return 2; // personal computers
   },
 
-  getBrowser: function () {
-    const w = utils.getWindowTop();
-    const ua = w.navigator.userAgent;
+  getBrowser() {
+    const ws = utils.getWindowSelf();
+    const ua = ws.navigator.userAgent;
     const uaLowerCase = ua.toLowerCase();
-    return /Edge\/\d./i.test(ua) ? 'edge' : uaLowerCase.indexOf('chrome') > 0 ? 'chrome' : uaLowerCase.indexOf('firefox') > 0 ? 'firefox' : uaLowerCase.indexOf('safari') > 0 ? 'safari' : uaLowerCase.indexOf('opera') > 0 ? 'opera' : uaLowerCase.indexOf('msie') > 0 || w.MSStream ? 'ie' : 'unknow';
+    return /Edge\/\d./i.test(ua) ? 'edge' : uaLowerCase.indexOf('chrome') > 0 ? 'chrome' : uaLowerCase.indexOf('firefox') > 0 ? 'firefox' : uaLowerCase.indexOf('safari') > 0 ? 'safari' : uaLowerCase.indexOf('opera') > 0 ? 'opera' : uaLowerCase.indexOf('msie') > 0 || ws.MSStream ? 'ie' : 'unknow';
   },
 
-  getOS: function () {
-    const w = window.top;
-    const ua = w.navigator.userAgent;
+  getOS() {
+    const ws = utils.getWindowSelf();
+    const ua = ws.navigator.userAgent;
     const uaLowerCase = ua.toLowerCase();
     return uaLowerCase.indexOf('linux') > 0 ? 'linux' : uaLowerCase.indexOf('mac') > 0 ? 'mac' : uaLowerCase.indexOf('win') > 0 ? 'windows' : '';
+  },
+
+  getUrl(refererInfo) {
+    // top has not been reached, it means we are not sure
+    // to get the proper page url.
+    if (!refererInfo.reachedTop) {
+      return;
+    }
+    return refererInfo.referer;
+  },
+
+  getUrlFromParams(params) {
+    const { postBidOptions } = params;
+    if (postBidOptions && postBidOptions.url) {
+      return postBidOptions.url;
+    }
   }
-}
+};
 
-function _pushInAdagioQueue(ob) {
-  try {
-    if (!canAccessTopWindow()) return;
-    const w = utils.getWindowTop();
-    w.ADAGIO.queue.push(ob);
-  } catch (e) {}
+function enqueue(ob) {
+  const w = internal.getCurrentWindow();
+
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.queue = w.ADAGIO.queue || [];
+  w.ADAGIO.queue.push(ob);
 };
 
-function _getOrAddAdagioAdUnit(adUnitCode) {
-  const w = utils.getWindowTop();
+function getOrAddAdagioAdUnit(adUnitCode) {
+  const w = internal.getCurrentWindow();
+
+  w.ADAGIO = w.ADAGIO || {};
+
   if (w.ADAGIO.adUnits[adUnitCode]) {
-    return w.ADAGIO.adUnits[adUnitCode]
+    return w.ADAGIO.adUnits[adUnitCode];
   }
+
   return w.ADAGIO.adUnits[adUnitCode] = {};
-}
+};
+
+function getPageviewId() {
+  const w = internal.getCurrentWindow();
 
-function _computePrintNumber(adUnitCode) {
+  w.ADAGIO = w.ADAGIO || {};
+  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || utils.generateUUID();
+
+  return w.ADAGIO.pageviewId;
+};
+
+function computePrintNumber(adUnitCode) {
   let printNumber = 1;
-  const w = utils.getWindowTop();
+  const w = internal.getCurrentWindow();
+
   if (
     w.ADAGIO &&
     w.ADAGIO.adUnits && w.ADAGIO.adUnits[adUnitCode] &&
-    w.ADAGIO.adUnits[adUnitCode].pageviewId === _getPageviewId() &&
+    w.ADAGIO.adUnits[adUnitCode].pageviewId === internal.getPageviewId() &&
     w.ADAGIO.adUnits[adUnitCode].printNumber
   ) {
     printNumber = parseInt(w.ADAGIO.adUnits[adUnitCode].printNumber, 10) + 1;
   }
+
   return printNumber;
-}
+};
 
-function _getDevice() {
+function getDevice() {
   const language = navigator.language ? 'language' : 'userLanguage';
   return {
     userAgent: navigator.userAgent,
@@ -246,36 +448,64 @@ function _getDevice() {
   };
 };
 
-function _getSite() {
-  const w = utils.getWindowTop();
+function getSite(bidderRequest) {
+  let domain = '';
+  let page = '';
+  let referrer = '';
+
+  const { refererInfo } = bidderRequest;
+
+  if (canAccessTopWindow()) {
+    const wt = utils.getWindowTop();
+    domain = wt.location.hostname;
+    page = wt.location.href;
+    referrer = wt.document.referrer || '';
+  } else if (refererInfo.reachedTop) {
+    const url = utils.parseUrl(refererInfo.referer);
+    domain = url.hostname;
+    page = refererInfo.referer;
+  } else if (refererInfo.stack && refererInfo.stack.length && refererInfo.stack[0]) {
+    // important note check if refererInfo.stack[0] is 'thruly' because a `null` value
+    // will be considered as "localhost" by the parseUrl function.
+    // As the isBidRequestValid returns false when it does not reach the referer
+    // this should never called.
+    const url = utils.parseUrl(refererInfo.stack[0]);
+    domain = url.hostname;
+  }
+
   return {
-    domain: w.location.hostname,
-    page: w.location.href,
-    referrer: w.document.referrer || ''
+    domain,
+    page,
+    referrer
   };
 };
 
-function _getPageviewId() {
-  if (!canAccessTopWindow()) return false;
-  const w = utils.getWindowTop();
-  w.ADAGIO.pageviewId = w.ADAGIO.pageviewId || utils.generateUUID();
-  return w.ADAGIO.pageviewId;
-};
+function getElementFromTopWindow(element, currentWindow) {
+  try {
+    if (utils.getWindowTop() === currentWindow) {
+      if (!element.getAttribute('id')) {
+        element.setAttribute('id', `adg-${utils.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;
+      }
 
-function _getElementFromTopWindow(element, currentWindow) {
-  if (utils.getWindowTop() === currentWindow) {
-    if (!element.getAttribute('id')) {
-      element.setAttribute('id', `adg-${utils.getUniqueIdentifierStr()}`);
+      return getElementFromTopWindow(frame, currentWindow.parent);
     }
-    return element;
-  } else {
-    const frame = currentWindow.frameElement;
-    return _getElementFromTopWindow(frame, currentWindow.parent);
+  } catch (err) {
+    utils.logWarn(`${LOG_PREFIX}`, err);
+    return false;
   }
-}
+};
 
-export function _autoDetectAdUnitElementId(adUnitCode) {
-  const autoDetectedAdUnit = utils.getGptSlotInfoForAdUnitCode(adUnitCode)
+function autoDetectAdUnitElementId(adUnitCode) {
+  const autoDetectedAdUnit = utils.getGptSlotInfoForAdUnitCode(adUnitCode);
   let adUnitElementId = null;
 
   if (autoDetectedAdUnit && autoDetectedAdUnit.divId) {
@@ -283,70 +513,49 @@ export function _autoDetectAdUnitElementId(adUnitCode) {
   }
 
   return adUnitElementId;
-}
+};
 
-function _autoDetectEnvironment() {
+function autoDetectEnvironment() {
   const device = _features.getDevice();
-  let environment;
-  switch (device) {
-    case 2:
-      environment = 'desktop'
-      break;
-    case 4:
-      environment = 'mobile'
-      break;
-    case 5:
-      environment = 'tablet'
-      break;
-  };
-  return environment
+  const map = { 2: 'desktop', 4: 'mobile', 5: 'tablet' };
+  return map[device] || 'unknown';
+};
+
+function supportIObs() {
+  const currentWindow = internal.getCurrentWindow();
+  return !!(currentWindow && currentWindow.IntersectionObserver && currentWindow.IntersectionObserverEntry &&
+    currentWindow.IntersectionObserverEntry.prototype && 'intersectionRatio' in currentWindow.IntersectionObserverEntry.prototype);
 }
 
-/**
- * Returns all features for a specific adUnit element
- *
- * @param {Object} bidRequest
- * @returns {Object} features for an element (see specs)
- */
-function _getFeatures(bidRequest) {
-  if (!canAccessTopWindow()) return;
-  const w = utils.getWindowTop();
-  const adUnitCode = bidRequest.adUnitCode;
-  const adUnitElementId = bidRequest.params.adUnitElementId || _autoDetectAdUnitElementId(adUnitCode);
-  let element;
+function getFeatures(bidRequest, bidderRequest) {
+  const { adUnitCode, params } = bidRequest;
+  const { adUnitElementId } = params;
+  const { refererInfo } = bidderRequest;
 
   if (!adUnitElementId) {
-    utils.logWarn('Unable to detect adUnitElementId. Adagio measures won\'t start');
-  } else {
-    if (bidRequest.params.postBid === true) {
-      window.document.getElementById(adUnitElementId);
-      element = _getElementFromTopWindow(element, window);
-      w.ADAGIO.pbjsAdUnits.map((adUnit) => {
-        if (adUnit.code === adUnitCode) {
-          const outerElementId = element.getAttribute('id');
-          adUnit.outerAdUnitElementId = outerElementId;
-          bidRequest.params.outerAdUnitElementId = outerElementId;
-        }
-      });
-    } else {
-      element = w.document.getElementById(adUnitElementId);
-    }
+    utils.logWarn(`${LOG_PREFIX} unable to get params.adUnitElementId. Continue without tiv.`);
   }
 
   const features = {
-    print_number: _features.getPrintNumber(bidRequest.adUnitCode).toString(),
+    print_number: _features.getPrintNumber(adUnitCode).toString(),
     page_dimensions: _features.getPageDimensions().toString(),
     viewport_dimensions: _features.getViewPortDimensions().toString(),
-    dom_loading: _features.isDomLoading().toString(),
+    dom_loading: _features.getDomLoadingDuration().toString(),
     // layout: features.getLayout().toString(),
-    adunit_position: _features.getSlotPosition(element).toString(),
-    user_timestamp: _features.getTimestamp().toString(),
+    adunit_position: _features.getSlotPosition(params).toString(),
+    user_timestamp: _features.getTimestampUTC().toString(),
     device: _features.getDevice().toString(),
-    url: w.location.origin + w.location.pathname,
+    url: _features.getUrl(refererInfo) || _features.getUrlFromParams(params) || '',
     browser: _features.getBrowser(),
     os: _features.getOS()
   };
 
+  Object.keys(features).forEach((prop) => {
+    if (features[prop] === '') {
+      delete features[prop];
+    }
+  });
+
   const adUnitFeature = {};
 
   adUnitFeature[adUnitElementId] = {
@@ -354,7 +563,7 @@ function _getFeatures(bidRequest) {
     version: FEATURES_VERSION
   };
 
-  _pushInAdagioQueue({
+  internal.enqueue({
     action: 'features',
     ts: Date.now(),
     data: adUnitFeature
@@ -363,112 +572,418 @@ function _getFeatures(bidRequest) {
   return features;
 };
 
+function isRendererPreferredFromPublisher(bidRequest) {
+  // renderer defined at adUnit level
+  const adUnitRenderer = utils.deepAccess(bidRequest, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
+
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = utils.deepAccess(bidRequest, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render);
+
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
+}
+
+/**
+ *
+ * @param {object} adagioStorage
+ * @returns {boolean}
+ */
+function isNewSession(adagioStorage) {
+  const now = Date.now();
+  const { lastActivityTime, vwSmplg } = utils.deepAccess(adagioStorage, 'session', {});
+  return (
+    !utils.isNumber(lastActivityTime) ||
+    !utils.isNumber(vwSmplg) ||
+    (now - lastActivityTime) > MAX_SESS_DURATION
+  )
+}
+
+export const internal = {
+  enqueue,
+  getOrAddAdagioAdUnit,
+  getPageviewId,
+  computePrintNumber,
+  getDevice,
+  getSite,
+  getElementFromTopWindow,
+  autoDetectAdUnitElementId,
+  autoDetectEnvironment,
+  getFeatures,
+  getRefererInfo,
+  adagioScriptFromLocalStorageCb,
+  getCurrentWindow,
+  supportIObs,
+  canAccessTopWindow,
+  isRendererPreferredFromPublisher,
+  isNewSession,
+  prepareExchange
+};
+
 function _getGdprConsent(bidderRequest) {
-  const consent = {};
-  if (utils.deepAccess(bidderRequest, 'gdprConsent')) {
-    if (bidderRequest.gdprConsent.consentString !== undefined) {
-      consent.consentString = bidderRequest.gdprConsent.consentString;
+  if (!utils.deepAccess(bidderRequest, 'gdprConsent')) {
+    return false;
+  }
+
+  const {
+    apiVersion,
+    gdprApplies,
+    consentString,
+    allowAuctionWithoutConsent
+  } = bidderRequest.gdprConsent;
+
+  return utils.cleanObj({
+    apiVersion,
+    consentString,
+    consentRequired: gdprApplies ? 1 : 0,
+    allowAuctionWithoutConsent: allowAuctionWithoutConsent ? 1 : 0
+  });
+}
+
+function _getCoppa() {
+  return {
+    required: config.getConfig('coppa') === true ? 1 : 0
+  };
+}
+
+function _getUspConsent(bidderRequest) {
+  return (utils.deepAccess(bidderRequest, 'uspConsent')) ? { uspConsent: bidderRequest.uspConsent } : false;
+}
+
+function _getSchain(bidRequest) {
+  return utils.deepAccess(bidRequest, 'schain');
+}
+
+function _getEids(bidRequest) {
+  if (utils.deepAccess(bidRequest, 'userId')) {
+    return createEidsArray(bidRequest.userId);
+  }
+}
+
+function _buildVideoBidRequest(bidRequest) {
+  const videoAdUnitParams = utils.deepAccess(bidRequest, 'mediaTypes.video', {});
+  const videoBidderParams = utils.deepAccess(bidRequest, 'params.video', {});
+  const computedParams = {};
+
+  // Special case for playerSize.
+  // Eeach props will be overrided if they are defined in config.
+  if (Array.isArray(videoAdUnitParams.playerSize)) {
+    const tempSize = (Array.isArray(videoAdUnitParams.playerSize[0])) ? videoAdUnitParams.playerSize[0] : videoAdUnitParams.playerSize;
+    computedParams.w = tempSize[0];
+    computedParams.h = tempSize[1];
+  }
+
+  const videoParams = {
+    ...computedParams,
+    ...videoAdUnitParams,
+    ...videoBidderParams
+  };
+
+  if (videoParams.context && videoParams.context === OUTSTREAM) {
+    bidRequest.mediaTypes.video.playerName = (internal.isRendererPreferredFromPublisher(bidRequest)) ? 'other' : 'adagio';
+
+    if (bidRequest.mediaTypes.video.playerName === 'other') {
+      utils.logWarn(`${LOG_PREFIX} renderer.backupOnly has not been set. Adagio recommends to use its own player to get expected behavior.`);
     }
-    if (bidderRequest.gdprConsent.gdprApplies !== undefined) {
-      consent.consentRequired = bidderRequest.gdprConsent.gdprApplies ? 1 : 0;
+  }
+
+  // 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];
+        utils.logWarn(`${LOG_PREFIX} The OpenRTB video param ${paramName} has been skipped due to misformating. Please refer to OpenRTB 2.5 spec.`);
+      }
     }
-    if (bidderRequest.gdprConsent.allowAuctionWithoutConsent !== undefined) {
-      consent.allowAuctionWithoutConsent = bidderRequest.gdprConsent.allowAuctionWithoutConsent ? 1 : 0;
+  });
+}
+
+function _renderer(bid) {
+  bid.renderer.push(() => {
+    if (typeof window.ADAGIO.outstreamPlayer === 'function') {
+      window.ADAGIO.outstreamPlayer(bid);
+    } else {
+      utils.logError(`${LOG_PREFIX} Adagio outstream player is not defined`);
     }
-    if (bidderRequest.gdprConsent.apiVersion !== undefined) {
-      consent.apiVersion = bidderRequest.gdprConsent.apiVersion;
+  });
+}
+
+function _parseNativeBidResponse(bid) {
+  if (!bid.admNative || !Array.isArray(bid.admNative.assets)) {
+    utils.logError(`${LOG_PREFIX} Invalid native response`);
+    return;
+  }
+
+  const native = {}
+
+  function addAssetDataValue(data) {
+    const map = {
+      1: 'sponsoredBy', // sponsored
+      2: 'body', // desc
+      3: 'rating',
+      4: 'likes',
+      5: 'downloads',
+      6: 'price',
+      7: 'salePrice',
+      8: 'phone',
+      9: 'address',
+      10: 'body2', // desc2
+      11: 'displayUrl',
+      12: 'cta'
+    }
+    if (map.hasOwnProperty(data.type) && typeof data.value === 'string') {
+      native[map[data.type]] = data.value;
+    }
+  }
+
+  // assets
+  bid.admNative.assets.forEach(asset => {
+    if (asset.title) {
+      native.title = asset.title.text
+    } else if (asset.data) {
+      addAssetDataValue(asset.data)
+    } else if (asset.img) {
+      switch (asset.img.type) {
+        case 1:
+          native.icon = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+        default:
+          native.image = {
+            url: asset.img.url,
+            width: asset.img.w,
+            height: asset.img.h
+          };
+          break;
+      }
+    }
+  });
+
+  if (bid.admNative.link) {
+    if (bid.admNative.link.url) {
+      native.clickUrl = bid.admNative.link.url;
+    }
+    if (Array.isArray(bid.admNative.link.clickTrackers)) {
+      native.clickTrackers = bid.admNative.link.clickTrackers
+    }
+  }
+
+  if (Array.isArray(bid.admNative.eventtrackers)) {
+    native.impressionTrackers = [];
+    bid.admNative.eventtrackers.forEach(tracker => {
+      // Only Impression events are supported. Prebid does not support Viewability events yet.
+      if (tracker.event !== 1) {
+        return;
+      }
+
+      // methods:
+      // 1: image
+      // 2: js
+      // note: javascriptTrackers is a string. If there's more than one JS tracker in bid response, the last script will be used.
+      switch (tracker.method) {
+        case 1:
+          native.impressionTrackers.push(tracker.url);
+          break;
+        case 2:
+          native.javascriptTrackers = ``;
+          break;
+      }
+    });
+  } else {
+    native.impressionTrackers = Array.isArray(bid.admNative.imptrackers) ? bid.admNative.imptrackers : [];
+    if (bid.admNative.jstracker) {
+      native.javascriptTrackers = bid.admNative.jstracker;
     }
   }
-  return consent;
+
+  if (bid.admNative.privacy) {
+    native.privacyLink = bid.admNative.privacy;
+  }
+
+  if (bid.admNative.ext) {
+    native.ext = {}
+
+    if (bid.admNative.ext.bvw) {
+      native.ext.adagio_bvw = bid.admNative.ext.bvw;
+    }
+  }
+
+  bid.native = native
 }
 
-function _getSchain(bidRequest) {
-  if (utils.deepAccess(bidRequest, 'schain')) {
-    return bidRequest.schain;
+function _getFloors(bidRequest) {
+  if (!utils.isFn(bidRequest.getFloor)) {
+    return false;
   }
+
+  const floors = [];
+
+  const getAndPush = (mediaType, size) => {
+    const info = bidRequest.getFloor({
+      currency: CURRENCY,
+      mediaType,
+      size: []
+    });
+
+    floors.push(utils.cleanObj({
+      mt: mediaType,
+      s: utils.isArray(size) ? `${size[0]}x${size[1]}` : undefined,
+      f: (!isNaN(info.floor) && info.currency === CURRENCY) ? info.floor : DEFAULT_FLOOR
+    }));
+  }
+
+  Object.keys(bidRequest.mediaTypes).forEach(mediaType => {
+    if (SUPPORTED_MEDIA_TYPES.indexOf(mediaType) !== -1) {
+      const sizeProp = mediaType === VIDEO ? 'playerSize' : 'sizes';
+
+      if (bidRequest.mediaTypes[mediaType][sizeProp] && bidRequest.mediaTypes[mediaType][sizeProp].length) {
+        if (utils.isArray(bidRequest.mediaTypes[mediaType][sizeProp][0])) {
+          bidRequest.mediaTypes[mediaType][sizeProp].forEach(size => {
+            getAndPush(mediaType, [size[0], size[1]]);
+          });
+        } else {
+          getAndPush(mediaType, [bidRequest.mediaTypes[mediaType][sizeProp][0], bidRequest.mediaTypes[mediaType][sizeProp][1]]);
+        }
+      } else {
+        getAndPush(mediaType, '*');
+      }
+    }
+  });
+
+  return floors;
 }
 
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaType: SUPPORTED_MEDIA_TYPES,
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
-  isBidRequestValid: function (bid) {
+  isBidRequestValid(bid) {
     const { adUnitCode, auctionId, sizes, bidder, params, mediaTypes } = bid;
-    const { organizationId, site, placement } = bid.params;
-    const adUnitElementId = bid.params.adUnitElementId || _autoDetectAdUnitElementId(adUnitCode);
-    const environment = bid.params.environment || _autoDetectEnvironment();
-    let isValid = false;
-
-    utils.logInfo('adUnitElementId', adUnitElementId)
+    if (!params) {
+      utils.logWarn(`${LOG_PREFIX} the "params" property is missing.`);
+      return false;
+    }
 
-    try {
-      if (canAccessTopWindow()) {
-        const w = utils.getWindowTop();
-        w.ADAGIO = w.ADAGIO || {};
-        w.ADAGIO.adUnits = w.ADAGIO.adUnits || {};
-        w.ADAGIO.pbjsAdUnits = w.ADAGIO.pbjsAdUnits || [];
-        isValid = !!(organizationId && site && placement);
-
-        const tempAdUnits = w.ADAGIO.pbjsAdUnits.filter((adUnit) => adUnit.code !== adUnitCode);
-
-        bid.params = {
-          ...bid.params,
-          adUnitElementId,
-          environment
-        }
+    const { organizationId, site } = params;
+    const adUnitElementId = (params.useAdUnitCodeAsAdUnitElementId === true)
+      ? adUnitCode
+      : params.adUnitElementId || internal.autoDetectAdUnitElementId(adUnitCode);
+    const placement = (params.useAdUnitCodeAsPlacement === true) ? adUnitCode : params.placement;
+    const environment = params.environment || internal.autoDetectEnvironment();
+    const supportIObs = internal.supportIObs();
+
+    // insure auto-detected params are kept in `bid` object.
+    bid.params = {
+      ...params,
+      adUnitElementId,
+      environment,
+      placement,
+      supportIObs
+    };
 
-        tempAdUnits.push({
-          code: adUnitCode,
-          sizes: (mediaTypes && mediaTypes.banner && Array.isArray(mediaTypes.banner.sizes)) ? mediaTypes.banner.sizes : sizes,
-          bids: [{
-            bidder,
-            params
-          }]
-        });
-        w.ADAGIO.pbjsAdUnits = tempAdUnits;
-
-        if (isValid === true) {
-          let printNumber = _computePrintNumber(adUnitCode);
-          w.ADAGIO.adUnits[adUnitCode] = {
-            auctionId: auctionId,
-            pageviewId: _getPageviewId(),
-            printNumber
-          };
-        }
+    const debugData = () => ({
+      action: 'pb-dbg',
+      ts: Date.now(),
+      data: {
+        bid
       }
-    } catch (e) {
-      return isValid;
+    });
+
+    const refererInfo = internal.getRefererInfo();
+
+    if (!refererInfo.reachedTop) {
+      utils.logWarn(`${LOG_PREFIX} the main page url is unreachabled.`);
+      internal.enqueue(debugData());
+
+      return false;
+    } else if (!(organizationId && site && placement)) {
+      utils.logWarn(`${LOG_PREFIX} at least one required param is missing.`);
+      internal.enqueue(debugData());
+
+      return false;
     }
-    return isValid;
-  },
 
-  buildRequests: function (validBidRequests, bidderRequest) {
-    // AdagioBidAdapter works when window.top can be reached only
-    if (!bidderRequest.refererInfo.reachedTop) return [];
+    const w = internal.getCurrentWindow();
+    const pageviewId = internal.getPageviewId();
+    const printNumber = internal.computePrintNumber(adUnitCode);
+
+    // 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 !== adUnitCode);
+    w.ADAGIO.pbjsAdUnits.push({
+      code: adUnitCode,
+      mediaTypes: mediaTypes || {},
+      sizes: (mediaTypes && mediaTypes.banner && Array.isArray(mediaTypes.banner.sizes)) ? mediaTypes.banner.sizes : sizes,
+      bids: [{
+        bidder,
+        params: bid.params // use the updated bid.params object with auto-detected params
+      }],
+      auctionId,
+      pageviewId,
+      printNumber
+    });
+
+    // (legacy) Store internal adUnit information
+    w.ADAGIO.adUnits[adUnitCode] = {
+      auctionId,
+      pageviewId,
+      printNumber,
+    };
+
+    return true;
+  },
 
+  buildRequests(validBidRequests, bidderRequest) {
     const secure = (location.protocol === 'https:') ? 1 : 0;
-    const device = _getDevice();
-    const site = _getSite();
-    const pageviewId = _getPageviewId();
-    const gdprConsent = _getGdprConsent(bidderRequest);
+    const device = internal.getDevice();
+    const site = internal.getSite(bidderRequest);
+    const pageviewId = internal.getPageviewId();
+    const gdprConsent = _getGdprConsent(bidderRequest) || {};
+    const uspConsent = _getUspConsent(bidderRequest) || {};
+    const coppa = _getCoppa();
     const schain = _getSchain(validBidRequests[0]);
+    const eids = _getEids(validBidRequests[0]) || [];
     const adUnits = utils._map(validBidRequests, (bidRequest) => {
-      bidRequest.features = _getFeatures(bidRequest);
+      bidRequest.features = internal.getFeatures(bidRequest, bidderRequest);
+
+      // Handle priceFloors module
+      bidRequest.floors = _getFloors(bidRequest);
+
+      if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
+        _buildVideoBidRequest(bidRequest);
+      }
+
       return bidRequest;
     });
 
-    // Regroug ad units by siteId
+    // Group ad units by organizationId
     const groupedAdUnits = adUnits.reduce((groupedAdUnits, adUnit) => {
-      if (adUnit.params && adUnit.params.organizationId) {
-        adUnit.params.organizationId = adUnit.params.organizationId.toString();
-      }
-      (groupedAdUnits[adUnit.params.organizationId] = groupedAdUnits[adUnit.params.organizationId] || []).push(adUnit);
+      const adUnitCopy = utils.deepClone(adUnit);
+      adUnitCopy.params.organizationId = adUnitCopy.params.organizationId.toString();
+
+      // remove useless props
+      delete adUnitCopy.floorData;
+
+      groupedAdUnits[adUnitCopy.params.organizationId] = groupedAdUnits[adUnitCopy.params.organizationId] || [];
+      groupedAdUnits[adUnitCopy.params.organizationId].push(adUnitCopy);
+
       return groupedAdUnits;
     }, {});
 
-    // Build one request per siteId
-    const requests = utils._map(Object.keys(groupedAdUnits), (organizationId) => {
+    // Build one request per organizationId
+    const requests = utils._map(Object.keys(groupedAdUnits), organizationId => {
       return {
         method: 'POST',
         url: ENDPOINT,
@@ -480,8 +995,16 @@ export const spec = {
           site: site,
           pageviewId: pageviewId,
           adUnits: groupedAdUnits[organizationId],
-          gdpr: gdprConsent,
+          data: EXT_DATA,
+          regs: {
+            gdpr: gdprConsent,
+            coppa: coppa,
+            ccpa: uspConsent
+          },
           schain: schain,
+          user: {
+            eids: eids
+          },
           prebidVersion: '$prebid.version$',
           adapterVersion: VERSION,
           featuresVersion: FEATURES_VERSION
@@ -489,19 +1012,19 @@ export const spec = {
         options: {
           contentType: 'text/plain'
         }
-      }
+      };
     });
 
     return requests;
   },
 
-  interpretResponse: function (serverResponse, bidRequest) {
+  interpretResponse(serverResponse, bidRequest) {
     let bidResponses = [];
     try {
       const response = serverResponse.body;
       if (response) {
         if (response.data) {
-          _pushInAdagioQueue({
+          internal.enqueue({
             action: 'ssp-data',
             ts: Date.now(),
             data: response.data
@@ -510,7 +1033,38 @@ export const spec = {
         if (response.bids) {
           response.bids.forEach(bidObj => {
             const bidReq = (find(bidRequest.data.adUnits, bid => bid.bidId === bidObj.requestId));
+
             if (bidReq) {
+              bidObj.meta = utils.deepAccess(bidObj, 'meta', {});
+              bidObj.meta.mediaType = bidObj.mediaType;
+              bidObj.meta.advertiserDomains = (Array.isArray(bidObj.aDomain) && bidObj.aDomain.length) ? bidObj.aDomain : [];
+
+              if (bidObj.mediaType === VIDEO) {
+                const mediaTypeContext = utils.deepAccess(bidReq, 'mediaTypes.video.context');
+                // Adagio SSP returns a `vastXml` only. No `vastUrl` nor `videoCacheKey`.
+                if (!bidObj.vastUrl && bidObj.vastXml) {
+                  bidObj.vastUrl = 'data:text/xml;charset=utf-8;base64,' + btoa(bidObj.vastXml.replace(/\\"/g, '"'));
+                }
+
+                if (mediaTypeContext === OUTSTREAM) {
+                  bidObj.renderer = Renderer.install({
+                    id: bidObj.requestId,
+                    adUnitCode: bidObj.adUnitCode,
+                    url: bidObj.urlRenderer || RENDERER_URL,
+                    config: {
+                      ...utils.deepAccess(bidReq, 'mediaTypes.video'),
+                      ...utils.deepAccess(bidObj, 'outstream', {})
+                    }
+                  });
+
+                  bidObj.renderer.setRender(_renderer);
+                }
+              }
+
+              if (bidObj.mediaType === NATIVE) {
+                _parseNativeBidResponse(bidObj);
+              }
+
               bidObj.site = bidReq.params.site;
               bidObj.placement = bidReq.params.placement;
               bidObj.pagetype = bidReq.params.pagetype;
@@ -528,18 +1082,20 @@ export const spec = {
     return bidResponses;
   },
 
-  getUserSyncs: function (syncOptions, serverResponses) {
+  getUserSyncs(syncOptions, serverResponses) {
     if (!serverResponses.length || serverResponses[0].body === '' || !serverResponses[0].body.userSyncs) {
       return false;
     }
-    const syncs = serverResponses[0].body.userSyncs.map((sync) => {
-      return {
-        type: sync.t === 'p' ? 'image' : 'iframe',
-        url: sync.u
-      }
-    })
+
+    const syncs = serverResponses[0].body.userSyncs.map(sync => ({
+      type: sync.t === 'p' ? 'image' : 'iframe',
+      url: sync.u
+    }));
+
     return syncs;
-  }
-}
+  },
+};
+
+initAdagio();
 
 registerBidder(spec);
diff --git a/modules/adagioBidAdapter.md b/modules/adagioBidAdapter.md
index b34cc3fe37a..46656d88d37 100644
--- a/modules/adagioBidAdapter.md
+++ b/modules/adagioBidAdapter.md
@@ -22,10 +22,10 @@ Connects to Adagio demand source to fetch bids.
         bids: [{
           bidder: 'adagio', // Required
           params: {
-            organizationId: '0', // Required - Organization ID provided by Adagio.
-            site: 'news-of-the-day', // Required - Site Name provided by Adagio.
-            placement: 'ban_atf', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
-            adUnitElementId: 'dfp_banniere_atf', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_outstream', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
 
             // The following params are limited to 30 characters,
             // and can only contain the following characters:
@@ -37,7 +37,110 @@ Connects to Adagio demand source to fetch bids.
             environment: 'mobile', // Recommended. Environment where the page is displayed.
             category: 'sport', // Recommended. Category of the content displayed in the page.
             subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
-            postBid: false // Optional. Use it in case of Post-bid integration only.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
+          }
+        }]
+      },
+      {
+        code: 'article_outstream',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [640, 480],
+            mimes: ['video/mp4'],
+            skip: 1
+            // Other OpenRTB 2.5 video options…
+          }
+        },
+        bids: [{
+          bidder: 'adagio', // Required
+          params: {
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_outstream', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+
+            // The following params are limited to 30 characters,
+            // and can only contain the following characters:
+            // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
+            // - dashes `-`
+            // - underscores `_`
+            // Also, each param can have at most 50 unique active values (case-insensitive).
+            pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
+            environment: 'mobile', // Recommended. Environment where the page is displayed.
+            category: 'sport', // Recommended. Category of the content displayed in the page.
+            subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
+            video: {
+              skip: 0
+              // OpenRTB 2.5 video options defined here override ones defined in mediaTypes.
+            },
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
+          }
+        }]
+      },
+      {
+        code: 'article_native',
+        mediaTypes: {
+          native: {
+            // generic Prebid options
+            title: {
+                required: true,
+                len: 80
+            },
+            // …
+            // Custom Adagio data assets
+            ext: {
+              adagio_bvw: {
+                required: false
+              }
+            }
+          }
+        },
+        bids: [{
+          bidder: 'adagio', // Required
+          params: {
+            organizationId: '1002', // Required - Organization ID provided by Adagio.
+            site: 'adagio-io', // Required - Site Name provided by Adagio.
+            placement: 'in_article', // Required. Refers to the placement of an adunit in a page. Must not contain any information about the type of device. Other example: `mpu_btf'.
+            adUnitElementId: 'article_native', // Required - AdUnit element id. Refers to the adunit id in a page. Usually equals to the adunit code above.
+
+            // The following params are limited to 30 characters,
+            // and can only contain the following characters:
+            // - alphanumeric (A-Z+a-z+0-9, case-insensitive)
+            // - dashes `-`
+            // - underscores `_`
+            // Also, each param can have at most 50 unique active values (case-insensitive).
+            pagetype: 'article', // Highly recommended. The pagetype describes what kind of content will be present in the page.
+            environment: 'mobile', // Recommended. Environment where the page is displayed.
+            category: 'sport', // Recommended. Category of the content displayed in the page.
+            subcategory: 'handball', // Optional. Subcategory of the content displayed in the page.
+            postBid: false, // Optional. Use it in case of Post-bid integration only.
+            useAdUnitCodeAsAdUnitElementId: false, // Optional. Use it by-pass adUnitElementId and use the adUnit code as value
+            useAdUnitCodeAsPlacement: false, // Optional. Use it to by-pass placement and use the adUnit code as value
+            // Optional OpenRTB Native 1.2 request object. Only `context`, `plcmttype` fields are supported.
+            native: {
+              context: 1,
+              plcmttype: 2
+            },
+            // Optional debug mode, used to get a bid response with expected cpm.
+            debug: {
+              enabled: true,
+              cpm: 3.00 // default to 1.00
+            }
           }
         }]
       }
@@ -88,5 +191,4 @@ Connects to Adagio demand source to fetch bids.
         ]
       }
     }
-
 ```
diff --git a/modules/adblender.md b/modules/adblender.md
new file mode 100644
index 00000000000..e70b2a4a8ed
--- /dev/null
+++ b/modules/adblender.md
@@ -0,0 +1,36 @@
+# Overview
+
+Module Name: AdBlender Bidder Adapter  
+Module Type: Bidder Adapter  
+Maintainer: contact@ad-blender.com
+
+# Description
+
+Connects to AdBlender demand source to fetch bids.  
+Banner and Video formats are supported.  
+Please use ```adblender``` as the bidder code.  
+#Bidder Config
+You can set an alternate endpoint url `pbjs.setBidderConfig` for the bidder `adblender`
+```
+pbjs.setBidderConfig({
+        bidders: ["adblender"],
+        config: {"adblender": { "endpoint_url": "https://inv-nets.admixer.net/adblender.1.1.aspx"}}
+      })
+```
+# Ad Unit Example
+```
+    var adUnits = [
+           {
+               code: 'desktop-banner-ad-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "adblender",
+                       params: {
+                           zone: 'fb3d34d0-7a88-4a4a-a5c9-8088cd7845f4'
+                       }
+                   }
+               ]
+           }
+       ];
+```
diff --git a/modules/adbookpspBidAdapter.js b/modules/adbookpspBidAdapter.js
new file mode 100644
index 00000000000..d3f3ba295b9
--- /dev/null
+++ b/modules/adbookpspBidAdapter.js
@@ -0,0 +1,796 @@
+import includes from 'core-js-pure/features/array/includes.js';
+import find from 'core-js-pure/features/array/find';
+import { config } from '../src/config.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.js';
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.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) {
+  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: window.location.hostname,
+      page: window.location.href,
+      ref: bidderRequest.refererInfo.referer,
+    },
+    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 (utils.isPlainObject(deviceConfig)) {
+    return { ...device, ...deviceConfig };
+  }
+
+  return device;
+}
+
+function buildRegs(bidderRequest) {
+  const regs = {
+    coppa: common.getConfig('coppa') === true ? 1 : 0,
+  };
+
+  if (bidderRequest.gdprConsent) {
+    utils.deepSetValue(
+      regs,
+      'ext.gdpr',
+      bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+    );
+    utils.deepSetValue(
+      regs,
+      'ext.gdprConsentString',
+      bidderRequest.gdprConsent.consentString || ''
+    );
+  }
+
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(regs, 'ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  return regs;
+}
+
+function buildSource(bidRequests, bidderRequest) {
+  const source = {
+    fd: 1,
+    tid: bidderRequest.auctionId,
+  };
+  const schain = utils.deepAccess(bidRequests, '0.schain');
+
+  if (schain) {
+    utils.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:
+      utils.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: utils.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 = utils.deepAccess(bidRequest, `params.video.${param}`);
+    const mediaTypeValue = utils.deepAccess(
+      bidRequest,
+      `mediaTypes.video.${param}`
+    );
+
+    if (paramsValue || mediaTypeValue) {
+      videoObj[param] = paramsValue || mediaTypeValue;
+    }
+  }
+
+  return videoObj;
+}
+
+function getVideoSize(bidRequest) {
+  const playerSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize', [[]]);
+  const { w, h } = utils.deepAccess(bidRequest, 'mediaTypes.video', {});
+
+  if (utils.isNumber(w) && utils.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) {
+    utils.deepSetValue(ext, 'adbook.placementId', placementId);
+  }
+
+  if (effectiverOrgId) {
+    utils.deepSetValue(ext, 'adbook.orgId', effectiverOrgId);
+  }
+
+  return ext;
+}
+
+/**
+ * BID RESPONSE
+ */
+
+function interpretResponse(bidResponse, bidderRequest) {
+  const bidderRequestBody = safeJSONparse(bidderRequest.data);
+
+  if (
+    utils.deepAccess(bidderRequestBody, 'id') !=
+    utils.deepAccess(bidResponse, 'body.id')
+  ) {
+    utils.logError(
+      `${BIDDER_CODE}: Bid response id does not match bidder request id`
+    );
+
+    return [];
+  }
+
+  const referrer = utils.deepAccess(bidderRequestBody, 'site.ref', '');
+  const incomingBids = utils
+    .deepAccess(bidResponse, 'body.seatbid', [])
+    .filter((seat) => utils.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) => {
+    try {
+      const bidRequest = findBidRequest(bidderRequestBody, bid);
+
+      if (!bidRequest) {
+        utils.logError(`${BIDDER_CODE}: Could not match bid to bid request`);
+
+        return null;
+      }
+      const categories = utils.deepAccess(bid, 'cat', []);
+      const mediaType = getMediaType(bid.adm);
+      let prebidBid = {
+        ad: bid.adm,
+        adId: bid.adid,
+        adserverTargeting: targetingMap[bid.impid],
+        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: utils.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),
+        };
+      }
+
+      return prebidBid;
+    } catch (error) {
+      utils.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(utils.uniques);
+  const values = impIds.reduce((result, id) => {
+    result[id] = {
+      lineItemIds: [],
+      dealIds: [],
+      adIds: [],
+    };
+
+    return result;
+  }, {});
+
+  bids.forEach((bid) => {
+    values[bid.impid].lineItemIds.push(bid.ext.liid);
+    values[bid.impid].dealIds.push(bid.dealid);
+    values[bid.impid].adIds.push(bid.adid);
+  });
+
+  const targetingMap = {};
+
+  for (const id of impIds) {
+    targetingMap[id] = {
+      hb_liid_adbookpsp: values[id].lineItemIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_deal_adbookpsp: values[id].dealIds.join(TARGETING_VALUE_SEPARATOR),
+      hb_adid_c_adbookpsp: values[id].adIds.join(TARGETING_VALUE_SEPARATOR),
+    };
+  }
+
+  return targetingMap;
+}
+
+/**
+ * VALIDATION
+ */
+
+function hasRequiredParams(bidRequest) {
+  const value =
+    utils.deepAccess(bidRequest, 'params.placementId') != null ||
+    utils.deepAccess(bidRequest, 'params.orgId') != null ||
+    getBidderConfig('orgId') != null;
+
+  if (!value) {
+    utils.logError(`${BIDDER_CODE}: missing orgId and placementId parameter`);
+  }
+
+  return value;
+}
+
+function isValidBannerRequest(bidRequest) {
+  const value = validateSizes(
+    utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes', [])
+  );
+
+  return value;
+}
+
+function isValidVideoRequest(bidRequest) {
+  const value =
+    utils.isArray(utils.deepAccess(bidRequest, 'mediaTypes.video.mimes')) &&
+    validateVideoSizes(bidRequest);
+
+  return value;
+}
+
+function validateSize(size) {
+  return utils.isArray(size) && size.length === 2 && size.every(utils.isNumber);
+}
+
+function validateSizes(sizes) {
+  return utils.isArray(sizes) && sizes.length > 0 && sizes.every(validateSize);
+}
+
+function validateVideoSizes(bidRequest) {
+  const { w, h } = utils.deepAccess(bidRequest, 'mediaTypes.video', {});
+
+  return (
+    validateSizes(
+      utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize')
+    ) ||
+    (utils.isNumber(w) && utils.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) {
+      utils.logWarn(`${BIDDER_CODE}: Invalid bid`, bid);
+    }
+
+    return value;
+  };
+}
+
+const commonBidValidators = [
+  (bid) => utils.isPlainObject(bid),
+  (bid) => isNonEmptyStr(bid.adid),
+  (bid) => isNonEmptyStr(bid.adm),
+  (bid) => isNonEmptyStr(bid.id),
+  (bid) => isNonEmptyStr(bid.impid),
+  (bid) => isNonEmptyStr(utils.deepAccess(bid, 'ext.liid')),
+  (bid) => utils.isNumber(bid.price),
+];
+
+const bannerBidValidators = [
+  validateBannerDimension('w'),
+  validateBannerDimension('h'),
+];
+
+function validateBannerDimension(dimension) {
+  return function (bid, bidRequest) {
+    if (bid[dimension] == null) {
+      return bannerHasSingleSize(bidRequest);
+    }
+
+    return utils.isNumber(bid[dimension]);
+  };
+}
+
+function bannerHasSingleSize(bidRequest) {
+  return utils.deepAccess(bidRequest, 'banner.format', []).length === 1;
+}
+
+/**
+ * USER SYNC
+ */
+
+export const storage = getStorageManager();
+
+function getUserSyncs(syncOptions, responses, gdprConsent, uspConsent) {
+  return responses
+    .map((response) => utils.deepAccess(response, 'body.ext.sync'))
+    .filter(utils.isArray)
+    .reduce(utils.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) {
+    utils.triggerPixel(wurl);
+  }
+
+  if (utils.isStr(bid.nurl)) {
+    utils.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 (_) {
+    utils.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 && utils.isPlainObject(markup.native)) {
+    return NATIVE;
+  }
+
+  return BANNER;
+}
+
+function safeJSONparse(...args) {
+  try {
+    return JSON.parse(...args);
+  } catch (_) {
+    return undefined;
+  }
+}
+
+function isNonEmptyStr(value) {
+  return utils.isStr(value) && !utils.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 utils.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
new file mode 100644
index 00000000000..e258b1fd7c3
--- /dev/null
+++ b/modules/adbookpspBidAdapter.md
@@ -0,0 +1,191 @@
+### 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
index 47162aa2445..10edd8ae3e3 100644
--- a/modules/adbutlerBidAdapter.js
+++ b/modules/adbutlerBidAdapter.js
@@ -9,7 +9,7 @@ const BIDDER_CODE = 'adbutler';
 export const spec = {
   code: BIDDER_CODE,
   pageID: Math.floor(Math.random() * 10e6),
-  aliases: ['divreach'],
+  aliases: ['divreach', 'doceree'],
 
   isBidRequestValid: function (bid) {
     return !!(bid.params.accountID && bid.params.zoneID);
@@ -25,6 +25,7 @@ export const spec = {
     let requestURI;
     let serverRequests = [];
     let zoneCounters = {};
+    let extraParams = {};
 
     for (i = 0; i < validBidRequests.length; i++) {
       bidRequest = validBidRequests[i];
@@ -32,6 +33,7 @@ export const spec = {
       accountID = utils.getBidIdParameter('accountID', bidRequest.params);
       keyword = utils.getBidIdParameter('keyword', bidRequest.params);
       domain = utils.getBidIdParameter('domain', bidRequest.params);
+      extraParams = utils.getBidIdParameter('extra', bidRequest.params);
 
       if (!(zoneID in zoneCounters)) {
         zoneCounters[zoneID] = 0;
@@ -52,6 +54,13 @@ export const spec = {
         requestURI += 'kw=' + encodeURIComponent(keyword) + ';';
       }
 
+      for (let key in extraParams) {
+        if (extraParams.hasOwnProperty(key)) {
+          let val = encodeURIComponent(extraParams[key]);
+          requestURI += `${key}=${val};`;
+        }
+      }
+
       zoneCounters[zoneID]++;
       serverRequests.push({
         method: 'GET',
diff --git a/modules/adbutlerBidAdapter.md b/modules/adbutlerBidAdapter.md
index 5905074270a..1921cc4046e 100644
--- a/modules/adbutlerBidAdapter.md
+++ b/modules/adbutlerBidAdapter.md
@@ -23,9 +23,12 @@ Module that connects to an AdButler zone to fetch bids.
                            keyword: 'red', //optional
                            minCPM: '1.00', //optional
                            maxCPM: '5.00' //optional
+                           extra: { // optional
+                                foo: "bar" 
+                           }
                        }
                    }
                ]
            }
        ];
-```
\ No newline at end of file
+```
diff --git a/modules/addefendBidAdapter.js b/modules/addefendBidAdapter.js
new file mode 100644
index 00000000000..18cafe829b5
--- /dev/null
+++ b/modules/addefendBidAdapter.js
@@ -0,0 +1,79 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'addefend';
+
+export const spec = {
+  code: BIDDER_CODE,
+  hostname: 'https://addefend-platform.com',
+
+  getHostname() {
+    return this.hostname;
+  },
+  isBidRequestValid: function(bid) {
+    return (bid.sizes !== undefined && bid.bidId !== undefined && bid.params !== undefined &&
+              (bid.params.pageId !== undefined && (typeof bid.params.pageId === 'string')) &&
+              (bid.params.placementId !== undefined && (typeof bid.params.placementId === 'string')));
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let bid = {
+      v: $$PREBID_GLOBAL$$.version,
+      auctionId: false,
+      pageId: false,
+      gdpr_consent: bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString ? bidderRequest.gdprConsent.consentString : '',
+      referer: bidderRequest.refererInfo.referer,
+      bids: [],
+    };
+
+    for (var i = 0; i < validBidRequests.length; i++) {
+      let vb = validBidRequests[i];
+      let o = vb.params;
+      bid.auctionId = vb.auctionId;
+      o.bidId = vb.bidId;
+      o.transactionId = vb.transactionId;
+      o.sizes = [];
+      if (o.trafficTypes) {
+        bid.trafficTypes = o.trafficTypes;
+      }
+      delete o.trafficTypes;
+
+      bid.pageId = o.pageId;
+      delete o.pageId;
+
+      if (vb.sizes && Array.isArray(vb.sizes)) {
+        for (var j = 0; j < vb.sizes.length; j++) {
+          let s = vb.sizes[j];
+          if (Array.isArray(s) && s.length == 2) {
+            o.sizes.push(s[0] + 'x' + s[1]);
+          }
+        }
+      }
+      bid.bids.push(o);
+    }
+    return [{
+      method: 'POST',
+      url: this.getHostname() + '/bid',
+      options: { withCredentials: true },
+      data: bid
+    }];
+  },
+  interpretResponse: function(serverResponse, request) {
+    const requiredKeys = ['requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'creativeId', 'netRevenue', 'currency', 'advertiserDomains'];
+    const validBidResponses = [];
+    serverResponse = serverResponse.body;
+    if (serverResponse && (serverResponse.length > 0)) {
+      serverResponse.forEach((bid) => {
+        const bidResponse = {};
+        for (const requiredKey of requiredKeys) {
+          if (!bid.hasOwnProperty(requiredKey)) {
+            return [];
+          }
+          bidResponse[requiredKey] = bid[requiredKey];
+        }
+        validBidResponses.push(bidResponse);
+      });
+    }
+    return validBidResponses;
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/addefendBidAdapter.md b/modules/addefendBidAdapter.md
new file mode 100644
index 00000000000..f1ac3ff2c46
--- /dev/null
+++ b/modules/addefendBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+```
+Module Name: AdDefend Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@addefend.com
+```
+
+# Description
+
+Module that connects to AdDefend as a demand source. 
+
+## Parameters
+| Param        | Description           | Optional  | Default  |
+| ------------- | ------------- | ----- | ----- |
+| pageId | id assigned to the website in the AdDefend system. (ask AdDefend support) | no | - |
+| placementId | id of the placement in the AdDefend system.  (ask AdDefend support) | no | - |
+| trafficTypes | comma seperated list of the following traffic types:
ADBLOCK - user has a activated adblocker
PM - user has firefox private mode activated
NC - user has not given consent
NONE - user traffic is none of the above, this usually means this is a "normal" user.
| yes | ADBLOCK |
+
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[970, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "addefend",
+                    params: {
+                        pageId: "887",
+                        placementId: "9398",
+                        trafficTypes: "ADBLOCK"
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/adformOpenRTBBidAdapter.js b/modules/adfBidAdapter.js
similarity index 59%
rename from modules/adformOpenRTBBidAdapter.js
rename to modules/adfBidAdapter.js
index 3270fb5865a..5893891eba6 100644
--- a/modules/adformOpenRTBBidAdapter.js
+++ b/modules/adfBidAdapter.js
@@ -5,13 +5,17 @@ import {
   registerBidder
 } from '../src/adapters/bidderFactory.js';
 import {
-  NATIVE
+  NATIVE, BANNER, VIDEO
 } from '../src/mediaTypes.js';
 import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
+import { Renderer } from '../src/Renderer.js';
 
-const BIDDER_CODE = 'adformOpenRTB';
+const { getConfig } = config;
+
+const BIDDER_CODE = 'adf';
 const GVLID = 50;
+const BIDDER_ALIAS = [ { code: 'adformOpenRTB', gvlid: GVLID } ];
 const NATIVE_ASSET_IDS = { 0: 'title', 2: 'icon', 3: 'image', 5: 'sponsoredBy', 4: 'body', 1: 'cta' };
 const NATIVE_PARAMS = {
   title: {
@@ -44,27 +48,58 @@ const NATIVE_PARAMS = {
     name: 'data'
   }
 };
+const OUTSTREAM_RENDERER_URL = 'https://s2.adform.net/banners/scripts/video/outstream/render.js';
 
 export const spec = {
   code: BIDDER_CODE,
+  aliases: BIDDER_ALIAS,
   gvlid: GVLID,
-  supportedMediaTypes: [ NATIVE ],
+  supportedMediaTypes: [ NATIVE, BANNER, VIDEO ],
   isBidRequestValid: bid => !!bid.params.mid,
   buildRequests: (validBidRequests, bidderRequest) => {
-    const page = bidderRequest.refererInfo.referer;
+    let app, site;
+
+    const commonFpd = getConfig('ortb2') || {};
+    let { user } = commonFpd;
+
+    if (typeof getConfig('app') === 'object') {
+      app = getConfig('app') || {};
+      if (commonFpd.app) {
+        utils.mergeDeep(app, commonFpd.app);
+      }
+    } else {
+      site = getConfig('site') || {};
+      if (commonFpd.site) {
+        utils.mergeDeep(site, commonFpd.site);
+      }
+
+      if (!site.page) {
+        site.page = bidderRequest.refererInfo.referer;
+      }
+    }
+
+    const device = getConfig('device') || {};
+    device.w = device.w || window.innerWidth;
+    device.h = device.h || window.innerHeight;
+    device.ua = device.ua || navigator.userAgent;
+
     const adxDomain = setOnAny(validBidRequests, 'params.adxDomain') || 'adx.adform.net';
-    const ua = navigator.userAgent;
+
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
-    const tid = validBidRequests[0].transactionId; // ??? check with ssp
+    const tid = validBidRequests[0].transactionId;
     const test = setOnAny(validBidRequests, 'params.test');
-    const publisher = setOnAny(validBidRequests, 'params.publisher');
-    const siteId = setOnAny(validBidRequests, 'params.siteId');
-    const currency = config.getConfig('currency.adServerCurrency');
+    const currency = getConfig('currency.adServerCurrency');
     const cur = currency && [ currency ];
     const eids = setOnAny(validBidRequests, 'userIdAsEids');
 
     const imp = validBidRequests.map((bid, id) => {
       bid.netRevenue = pt;
+
+      const imp = {
+        id: id + 1,
+        tagid: bid.params.mid
+      };
+
       const assets = utils._map(bid.nativeParams, (bidParams, key) => {
         const props = NATIVE_PARAMS[key];
         const asset = {
@@ -100,21 +135,51 @@ export const spec = {
         }
       }).filter(Boolean);
 
-      return {
-        id: id + 1,
-        tagid: bid.params.mid,
-        native: {
+      if (assets.length) {
+        imp.native = {
           request: {
             assets
           }
-        }
-      };
+        };
+
+        bid.mediaType = NATIVE;
+        return imp;
+      }
+
+      const bannerParams = utils.deepAccess(bid, 'mediaTypes.banner');
+
+      if (bannerParams && bannerParams.sizes) {
+        const sizes = utils.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
+        };
+        bid.mediaType = BANNER;
+
+        return imp;
+      }
+
+      const videoParams = utils.deepAccess(bid, 'mediaTypes.video');
+      if (videoParams) {
+        imp.video = videoParams;
+        bid.mediaType = VIDEO;
+
+        return imp;
+      }
     });
 
     const request = {
       id: bidderRequest.auctionId,
-      site: { id: siteId, page, publisher },
-      device: { ua },
+      site,
+      app,
+      user,
+      device,
       source: { tid, fd: 1 },
       ext: { pt },
       cur,
@@ -126,8 +191,8 @@ export const spec = {
       request.test = 1;
     }
     if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') !== undefined) {
-      request.user = { ext: { consent: bidderRequest.gdprConsent.consentString } };
-      request.regs = { ext: { gdpr: bidderRequest.gdprConsent.gdprApplies & 1 } };
+      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1);
     }
 
     if (bidderRequest.uspConsent) {
@@ -162,17 +227,35 @@ export const spec = {
     return bids.map((bid, id) => {
       const bidResponse = bidResponses[id];
       if (bidResponse) {
-        return {
+        const result = {
           requestId: bid.bidId,
           cpm: bidResponse.price,
           creativeId: bidResponse.crid,
           ttl: 360,
           netRevenue: bid.netRevenue === 'net',
           currency: cur,
-          mediaType: NATIVE,
-          bidderCode: BIDDER_CODE,
-          native: parseNative(bidResponse)
+          mediaType: bid.mediaType,
+          width: bidResponse.w,
+          height: bidResponse.h,
+          dealId: bidResponse.dealid,
+          meta: {
+            mediaType: bid.mediaType,
+            advertiserDomains: bidResponse.adomain
+          }
         };
+
+        if (bidResponse.native) {
+          result.native = parseNative(bidResponse);
+        } else {
+          result[ bid.mediaType === VIDEO ? 'vastXml' : 'ad' ] = bidResponse.adm;
+        }
+
+        if (!bid.renderer && bid.mediaType === VIDEO && utils.deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+          result.renderer = Renderer.install({id: bid.bidId, url: OUTSTREAM_RENDERER_URL, adUnitCode: bid.adUnitCode});
+          result.renderer.setRender(renderer);
+        }
+
+        return result;
       }
     }).filter(Boolean);
   }
@@ -211,3 +294,9 @@ function setOnAny(collection, key) {
 function flatten(arr) {
   return [].concat(...arr);
 }
+
+function renderer(bid) {
+  bid.renderer.push(() => {
+    window.Adform.renderOutstream(bid);
+  });
+}
diff --git a/modules/adformOpenRTBBidAdapter.md b/modules/adfBidAdapter.md
similarity index 51%
rename from modules/adformOpenRTBBidAdapter.md
rename to modules/adfBidAdapter.md
index 0dd98ad07b8..10264e6f486 100644
--- a/modules/adformOpenRTBBidAdapter.md
+++ b/modules/adfBidAdapter.md
@@ -1,21 +1,18 @@
 # Overview
 
-Module Name: Adform OpenRTB Adapter
+Module Name: Adf Adapter
 Module Type: Bidder Adapter
 Maintainer: Scope.FL.Scripts@adform.com
 
 # Description
 
 Module that connects to Adform demand sources to fetch bids.
-Only native format is supported. Using OpenRTB standard.
+Banner, video and native formats are supported. Using OpenRTB standard. Previous adapter name - adformOpenRTB.
 
 # Test Parameters
 ```
-    var adUnits = [
+    var adUnits = [{
         code: '/19968336/prebid_native_example_1',
-        sizes: [
-            [360, 360]
-        ],
         mediaTypes: {
             native: {
                 image: {
@@ -42,18 +39,38 @@ Only native format is supported. Using OpenRTB standard.
             }
         },
         bids: [{
-            bidder: 'adformOpenRTB',
+            bidder: 'adf',
             params: {
-                mid: 606169,                  // required
-                adxDomain: 'adx.adform.net',  // optional
-                siteId: '23455',              // optional
-                priceType: 'gross'            // optional, default is 'net'
-                publisher: {                  // optional block
-                  id: "2706",
-                  name: "Publishers Name",
-                  domain: "publisher.com"
-                }
+                mid: 606169,                 // required
+                adxDomain: 'adx.adform.net'  // optional
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_banner_example_1',
+        mediaTypes: {
+            banner: {
+                sizes: [[ 300, 250 ]]
+            }
+        }
+        bids: [{
+            bidder: 'adf',
+            params: {
+                mid: 1038466
+            }
+        }]
+    }, {
+        code: '/19968336/prebid_video_example_1',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                mimes: ['video/mp4']
+            }
+        }
+        bids: [{
+            bidder: 'adf',
+            params: {
+                mid: 822732
             }
         }]
-    ];
+    }];
 ```
diff --git a/modules/adformBidAdapter.js b/modules/adformBidAdapter.js
index d7db9eef16d..802b5c39579 100644
--- a/modules/adformBidAdapter.js
+++ b/modules/adformBidAdapter.js
@@ -5,6 +5,7 @@ import { config } from '../src/config.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { Renderer } from '../src/Renderer.js';
 import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const OUTSTREAM_RENDERER_URL = 'https://s2.adform.net/banners/scripts/video/outstream/render.js';
 
@@ -12,7 +13,7 @@ const BIDDER_CODE = 'adform';
 const GVLID = 50;
 export const spec = {
   code: BIDDER_CODE,
-  aliases: ['adform2'],
+  aliases: ['adform2', 'adform3'],
   gvlid: GVLID,
   supportedMediaTypes: [ BANNER, VIDEO ],
   isBidRequestValid: function (bid) {
@@ -24,14 +25,33 @@ export const spec = {
     const eids = getEncodedEIDs(utils.deepAccess(validBidRequests, '0.userIdAsEids'));
 
     var request = [];
-    var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ] ];
+    var globalParams = [ [ 'adxDomain', 'adx.adform.net' ], [ 'fd', 1 ], [ 'url', null ], [ 'tid', null ], [ 'eids', eids ] ];
+    const targetingParams = { mkv: [], mkw: [], msw: [] };
+
     var bids = JSON.parse(JSON.stringify(validBidRequests));
     var bidder = (bids[0] && bids[0].bidder) || BIDDER_CODE;
+
+    // set common targeting options as query params
+    if (bids.length > 1) {
+      for (let key in targetingParams) {
+        if (targetingParams.hasOwnProperty(key)) {
+          const collection = bids.map(bid => ((bid.params[key] && bid.params[key].split(',')) || []));
+          targetingParams[key] = collection.reduce(intersects);
+          if (targetingParams[key].length) {
+            bids.forEach((bid, index) => {
+              bid.params[key] = collection[index].filter(item => !includes(targetingParams[key], item));
+            });
+          }
+        }
+      }
+    }
+
     for (i = 0, l = bids.length; i < l; i++) {
       bid = bids[i];
       if ((bid.params.priceType === 'net') || (bid.params.pt === 'net')) {
         netRevenue = 'net';
       }
+
       for (j = 0, k = globalParams.length; j < k; j++) {
         _key = globalParams[j][0];
         _value = bid[_key] || bid.params[_key];
@@ -66,8 +86,10 @@ export const spec = {
       request.push('us_privacy=' + bidderRequest.uspConsent);
     }
 
-    if (eids) {
-      request.push('eids=' + eids);
+    for (let key in targetingParams) {
+      if (targetingParams.hasOwnProperty(key)) {
+        globalParams.push([ key, targetingParams[key].join(',') ]);
+      }
     }
 
     for (i = 1, l = globalParams.length; i < l; i++) {
@@ -101,7 +123,7 @@ export const spec = {
     function getEncodedEIDs(eids) {
       if (utils.isArray(eids) && eids.length > 0) {
         const parsed = parseEIDs(eids);
-        return encodeURIComponent(btoa(JSON.stringify(parsed)));
+        return btoa(JSON.stringify(parsed));
       }
     }
 
@@ -119,6 +141,10 @@ export const spec = {
         return result;
       }, {});
     }
+
+    function intersects(col1, col2) {
+      return col1.filter(item => includes(col2, item));
+    }
   },
   interpretResponse: function (serverResponse, bidRequest) {
     const VALID_RESPONSES = {
@@ -145,6 +171,7 @@ export const spec = {
           currency: response.win_cur,
           netRevenue: bidRequest.netRevenue !== 'gross',
           ttl: 360,
+          meta: { advertiserDomains: response && response.adomain ? response.adomain : [] },
           ad: response.banner,
           bidderCode: bidRequest.bidder,
           transactionId: bid.transactionId,
diff --git a/modules/adhashBidAdapter.js b/modules/adhashBidAdapter.js
new file mode 100644
index 00000000000..b30f9cebbc1
--- /dev/null
+++ b/modules/adhashBidAdapter.js
@@ -0,0 +1,102 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import includes from 'core-js-pure/features/array/includes.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const VERSION = '1.0';
+
+export const spec = {
+  code: 'adhash',
+  url: 'https://bidder.adhash.org/rtb?version=' + VERSION + '&prebid=true',
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: (bid) => {
+    try {
+      const { publisherId, platformURL } = bid.params;
+      return (
+        includes(Object.keys(bid.mediaTypes), BANNER) &&
+        typeof publisherId === 'string' &&
+        publisherId.length === 42 &&
+        typeof platformURL === 'string' &&
+        platformURL.length >= 13
+      );
+    } catch (error) {
+      return false;
+    }
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const { gdprConsent } = bidderRequest;
+    const { url } = spec;
+    const bidRequests = [];
+    let referrer = '';
+    if (bidderRequest && bidderRequest.refererInfo) {
+      referrer = bidderRequest.refererInfo.referer;
+    }
+    for (var i = 0; i < validBidRequests.length; i++) {
+      var index = Math.floor(Math.random() * validBidRequests[i].sizes.length);
+      var size = validBidRequests[i].sizes[index].join('x');
+      bidRequests.push({
+        method: 'POST',
+        url: url,
+        bidRequest: validBidRequests[i],
+        data: {
+          timezone: new Date().getTimezoneOffset() / 60,
+          location: referrer,
+          publisherId: validBidRequests[i].params.publisherId,
+          size: {
+            screenWidth: window.screen.width,
+            screenHeight: window.screen.height
+          },
+          navigator: {
+            platform: window.navigator.platform,
+            language: window.navigator.language,
+            userAgent: window.navigator.userAgent
+          },
+          creatives: [{
+            size: size,
+            position: validBidRequests[i].adUnitCode
+          }],
+          blockedCreatives: [],
+          currentTimestamp: new Date().getTime(),
+          recentAds: [],
+          GDPR: gdprConsent
+        },
+        options: {
+          withCredentials: false,
+          crossOrigin: true
+        },
+      });
+    }
+    return bidRequests;
+  },
+
+  interpretResponse: (serverResponse, request) => {
+    const responseBody = serverResponse ? serverResponse.body : {};
+
+    if (!responseBody.creatives || responseBody.creatives.length === 0) {
+      return [];
+    }
+
+    const publisherURL = JSON.stringify(request.bidRequest.params.platformURL);
+    const oneTimeId = request.bidRequest.adUnitCode + Math.random().toFixed(16).replace('0.', '.');
+    const bidderResponse = JSON.stringify({ responseText: JSON.stringify(responseBody) });
+    const requestData = JSON.stringify(request.data);
+
+    return [{
+      requestId: request.bidRequest.bidId,
+      cpm: responseBody.creatives[0].costEUR,
+      ad:
+        `

+        
+        `,
+      width: request.bidRequest.sizes[0][0],
+      height: request.bidRequest.sizes[0][1],
+      creativeId: request.bidRequest.adUnitCode,
+      netRevenue: true,
+      currency: 'EUR',
+      ttl: 60
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/adhashBidAdapter.md b/modules/adhashBidAdapter.md
new file mode 100644
index 00000000000..c1093e0ccd7
--- /dev/null
+++ b/modules/adhashBidAdapter.md
@@ -0,0 +1,43 @@
+# Overview
+
+```
+Module Name: AdHash Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: damyan@adhash.org
+```
+
+# Description
+
+Here is what you need for Prebid integration with AdHash:
+1. Register with AdHash.
+2. Once registered and approved, you will receive a Publisher ID and Platform URL.
+3. Use the Publisher ID and Platform URL as parameters in params.
+
+Please note that a number of AdHash functionalities are not supported in the Prebid.js integration:
+* Cookie-less frequency and recency capping;
+* Audience segments;
+* Price floors and passback tags, as they are not needed in the Prebid.js setup;
+* Reservation for direct deals only, as bids are evaluated based on their price.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: '/19968336/header-bid-tag-1',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'adhash',
+                    params: {
+                        publisherId: '0x1234567890123456789012345678901234567890',
+                        platformURL: 'https://adhash.org/p/struma/'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/adheseBidAdapter.js b/modules/adheseBidAdapter.js
index 3c129d1bee1..b9dbae529ba 100644
--- a/modules/adheseBidAdapter.js
+++ b/modules/adheseBidAdapter.js
@@ -4,10 +4,12 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'adhese';
+const GVLID = 553;
 const USER_SYNC_BASE_URL = 'https://user-sync.adhese.com/iframe/user_sync.html';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bid) {
@@ -20,21 +22,37 @@ export const spec = {
     }
     const { gdprConsent, refererInfo } = bidderRequest;
 
+    const gdprParams = (gdprConsent && gdprConsent.consentString) ? { xt: [gdprConsent.consentString] } : {};
+    const refererParams = (refererInfo && refererInfo.referer) ? { xf: [base64urlEncode(refererInfo.referer)] } : {};
+    const commonParams = { ...gdprParams, ...refererParams };
+
+    const slots = validBidRequests.map(bid => ({
+      slotname: bidToSlotName(bid),
+      parameters: cleanTargets(bid.params.data)
+    }));
+
+    const payload = {
+      slots: slots,
+      parameters: commonParams,
+      vastContentAsUrl: true,
+      user: {
+        ext: {
+          eids: getEids(validBidRequests),
+        }
+      }
+    };
+
     const account = getAccount(validBidRequests);
-    const targets = validBidRequests.map(bid => bid.params.data).reduce(mergeTargets, {});
-    const gdprParams = (gdprConsent && gdprConsent.consentString) ? [`xt${gdprConsent.consentString}`] : [];
-    const refererParams = (refererInfo && refererInfo.referer) ? [`xf${base64urlEncode(refererInfo.referer)}`] : [];
-    const id5Params = (getId5Id(validBidRequests)) ? [`x5${getId5Id(validBidRequests)}`] : [];
-    const targetsParams = Object.keys(targets).map(targetCode => targetCode + targets[targetCode].join(';'));
-    const slotsParams = validBidRequests.map(bid => 'sl' + bidToSlotName(bid));
-    const params = [...slotsParams, ...targetsParams, ...gdprParams, ...refererParams, ...id5Params].map(s => `/${s}`).join('');
-    const cacheBuster = '?t=' + new Date().getTime();
-    const uri = 'https://ads-' + account + '.adhese.com/json' + params + cacheBuster;
+    const uri = 'https://ads-' + account + '.adhese.com/json';
 
     return {
-      method: 'GET',
+      method: 'POST',
       url: uri,
-      bids: validBidRequests
+      data: JSON.stringify(payload),
+      bids: validBidRequests,
+      options: {
+        contentType: 'application/json'
+      }
     };
   },
 
@@ -78,7 +96,7 @@ function adResponse(bid, ad) {
 
   const bidResponse = getbaseAdResponse({
     requestId: bid.bidId,
-    mediaType: getMediaType(markup),
+    mediaType: ad.extension.mediaType,
     cpm: Number(price.amount),
     currency: price.currency,
     width: Number(ad.width),
@@ -93,7 +111,11 @@ function adResponse(bid, ad) {
   });
 
   if (bidResponse.mediaType === VIDEO) {
-    bidResponse.vastXml = markup;
+    if (ad.cachedBodyUrl) {
+      bidResponse.vastUrl = ad.cachedBodyUrl
+    } else {
+      bidResponse.vastXml = markup;
+    }
   } else {
     const counter = ad.impressionCounter ? "" : '';
     bidResponse.ad = markup + counter;
@@ -101,16 +123,20 @@ function adResponse(bid, ad) {
   return bidResponse;
 }
 
-function mergeTargets(targets, target) {
+function cleanTargets(target) {
+  const targets = {};
   if (target) {
     Object.keys(target).forEach(function (key) {
       const val = target[key];
-      const values = Array.isArray(val) ? val : [val];
-      if (targets[key]) {
-        const distinctValues = values.filter(v => targets[key].indexOf(v) < 0);
-        targets[key].push.apply(targets[key], distinctValues);
-      } else {
-        targets[key] = values;
+      const dirtyValues = Array.isArray(val) ? val : [val];
+      const values = dirtyValues.filter(v => v === 0 || v);
+      if (values.length > 0) {
+        if (targets[key]) {
+          const distinctValues = values.filter(v => targets[key].indexOf(v) < 0);
+          targets[key].push.apply(targets[key], distinctValues);
+        } else {
+          targets[key] = values;
+        }
       }
     });
   }
@@ -137,9 +163,9 @@ function getAccount(validBidRequests) {
   return validBidRequests[0].params.account;
 }
 
-function getId5Id(validBidRequests) {
-  if (validBidRequests[0] && validBidRequests[0].userId && validBidRequests[0].userId.id5id) {
-    return validBidRequests[0].userId.id5id;
+function getEids(validBidRequests) {
+  if (validBidRequests[0] && validBidRequests[0].userIdAsEids) {
+    return validBidRequests[0].userIdAsEids;
   }
 }
 
@@ -148,12 +174,7 @@ function getbaseAdResponse(response) {
 }
 
 function isAdheseAd(ad) {
-  return !ad.origin || ad.origin === 'JERLICIA' || ad.origin === 'DALE';
-}
-
-function getMediaType(markup) {
-  const isVideo = markup.trim().toLowerCase().match(/<\?xml| {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: analyticsAdapter,
-  code: 'adkernelAdn'
+  code: 'adkernelAdn',
+  gvlid: GVLID
 });
 
 export default analyticsAdapter;
@@ -390,3 +395,19 @@ function getLocationAndReferrer(win) {
     loc: win.location
   };
 }
+
+function initPrivacy(template, requests) {
+  let consent = requests[0].gdprConsent;
+  if (consent && consent.gdprApplies) {
+    template.user.gdpr = ~~consent.gdprApplies;
+  }
+  if (consent && consent.consentString) {
+    template.user.gdpr_consent = consent.consentString;
+  }
+  if (requests[0].uspConsent) {
+    template.user.us_privacy = requests[0].uspConsent;
+  }
+  if (config.getConfig('coppa')) {
+    template.user.coppa = 1;
+  }
+}
diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
index 483d6de52b9..dc56ed6abbb 100644
--- a/modules/adkernelAdnBidAdapter.js
+++ b/modules/adkernelAdnBidAdapter.js
@@ -1,11 +1,13 @@
 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';
 
 const DEFAULT_ADKERNEL_DSP_DOMAIN = 'tag.adkernel.com';
 const DEFAULT_MIMES = ['video/mp4', 'video/webm', 'application/x-shockwave-flash', 'application/javascript'];
 const DEFAULT_PROTOCOLS = [2, 3, 5, 6];
 const DEFAULT_APIS = [1, 2];
+const GVLID = 14;
 
 function isRtbDebugEnabled(refInfo) {
   return refInfo.referer.indexOf('adk_debug=true') !== -1;
@@ -16,13 +18,15 @@ function buildImp(bidRequest) {
     id: bidRequest.bidId,
     tagid: bidRequest.adUnitCode
   };
+  let mediaType;
   let bannerReq = utils.deepAccess(bidRequest, `mediaTypes.banner`);
   let videoReq = utils.deepAccess(bidRequest, `mediaTypes.video`);
   if (bannerReq) {
     let sizes = canonicalizeSizesArray(bannerReq.sizes);
     imp.banner = {
       format: utils.parseSizesInput(sizes)
-    }
+    };
+    mediaType = BANNER;
   } else if (videoReq) {
     let size = canonicalizeSizesArray(videoReq.playerSize)[0];
     imp.video = {
@@ -32,6 +36,11 @@ function buildImp(bidRequest) {
       protocols: videoReq.protocols || DEFAULT_PROTOCOLS,
       api: videoReq.api || DEFAULT_APIS
     };
+    mediaType = VIDEO;
+  }
+  let bidFloor = getBidFloor(bidRequest, mediaType, '*');
+  if (bidFloor) {
+    imp.bidfloor = bidFloor;
   }
   return imp;
 }
@@ -48,11 +57,12 @@ function canonicalizeSizesArray(sizes) {
   return sizes;
 }
 
-function buildRequestParams(tags, auctionId, transactionId, gdprConsent, uspConsent, refInfo) {
+function buildRequestParams(tags, bidderRequest) {
+  let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
   let req = {
     id: auctionId,
     tid: transactionId,
-    site: buildSite(refInfo),
+    site: buildSite(refererInfo),
     imp: tags
   };
   if (gdprConsent) {
@@ -66,6 +76,9 @@ function buildRequestParams(tags, auctionId, transactionId, gdprConsent, uspCons
   if (uspConsent) {
     utils.deepSetValue(req, 'user.us_privacy', uspConsent);
   }
+  if (config.getConfig('coppa')) {
+    utils.deepSetValue(req, 'user.coppa', 1);
+  }
   return req;
 }
 
@@ -90,13 +103,17 @@ function buildBid(tag) {
     requestId: tag.impid,
     bidderCode: spec.code,
     cpm: tag.bid,
-    width: tag.w,
-    height: tag.h,
     creativeId: tag.crid,
     currency: 'USD',
     ttl: 720,
     netRevenue: true
   };
+  if (tag.w) {
+    bid.width = tag.w;
+  }
+  if (tag.h) {
+    bid.height = tag.h;
+  }
   if (tag.tag) {
     bid.ad = tag.tag;
     bid.mediaType = BANNER;
@@ -104,11 +121,46 @@ function buildBid(tag) {
     bid.vastUrl = tag.vast_url;
     bid.mediaType = VIDEO;
   }
+  fillBidMeta(bid, tag);
   return bid;
 }
 
+function fillBidMeta(bid, tag) {
+  if (utils.isStr(tag.agencyName)) {
+    utils.deepSetValue(bid, 'meta.agencyName', tag.agencyName);
+  }
+  if (utils.isNumber(tag.advertiserId)) {
+    utils.deepSetValue(bid, 'meta.advertiserId', tag.advertiserId);
+  }
+  if (utils.isStr(tag.advertiserName)) {
+    utils.deepSetValue(bid, 'meta.advertiserName', tag.advertiserName);
+  }
+  if (utils.isArray(tag.advertiserDomains)) {
+    utils.deepSetValue(bid, 'meta.advertiserDomains', tag.advertiserDomains);
+  }
+  if (utils.isStr(tag.primaryCatId)) {
+    utils.deepSetValue(bid, 'meta.primaryCatId', tag.primaryCatId);
+  }
+  if (utils.isArray(tag.secondaryCatIds)) {
+    utils.deepSetValue(bid, 'meta.secondaryCatIds', tag.secondaryCatIds);
+  }
+}
+
+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,
   supportedMediaTypes: [BANNER, VIDEO],
   aliases: ['engagesimply'],
 
@@ -132,14 +184,13 @@ export const spec = {
         return acc;
       }, {});
 
-    let {auctionId, gdprConsent, uspConsent, transactionId, refererInfo} = bidderRequest;
     let requests = [];
     Object.keys(dispatch).forEach(host => {
       Object.keys(dispatch[host]).forEach(pubId => {
-        let request = buildRequestParams(dispatch[host][pubId], auctionId, transactionId, gdprConsent, uspConsent, refererInfo);
+        let request = buildRequestParams(dispatch[host][pubId], bidderRequest);
         requests.push({
           method: 'POST',
-          url: `https://${host}/tag?account=${pubId}&pb=1${isRtbDebugEnabled(refererInfo) ? '&debug=1' : ''}`,
+          url: `https://${host}/tag?account=${pubId}&pb=1${isRtbDebugEnabled(bidderRequest.refererInfo) ? '&debug=1' : ''}`,
           data: JSON.stringify(request)
         })
       });
@@ -159,14 +210,24 @@ export const spec = {
   },
 
   getUserSyncs: function(syncOptions, serverResponses) {
-    if (!syncOptions.iframeEnabled || !serverResponses || serverResponses.length === 0) {
+    if (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+    if (syncOptions.iframeEnabled) {
+      return buildSyncs(serverResponses, 'syncpages', 'iframe');
+    } else if (syncOptions.pixelEnabled) {
+      return buildSyncs(serverResponses, 'syncpixels', 'image');
+    } else {
       return [];
     }
-    return serverResponses.filter(rps => rps.body && rps.body.syncpages)
-      .map(rsp => rsp.body.syncpages)
-      .reduce((a, b) => a.concat(b), [])
-      .map(syncUrl => ({type: 'iframe', url: syncUrl}));
   }
 };
 
+function buildSyncs(serverResponses, propName, type) {
+  return serverResponses.filter(rps => rps.body && rps.body[propName])
+    .map(rsp => rsp.body[propName])
+    .reduce((a, b) => a.concat(b), [])
+    .map(syncUrl => ({type: type, url: syncUrl}));
+}
+
 registerBidder(spec);
diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index d069af7d56e..09f16a82221 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -15,13 +15,14 @@ import {config} from '../src/config.js';
 const VIDEO_TARGETING = Object.freeze(['mimes', 'minduration', 'maxduration', 'protocols',
   'startdelay', 'linearity', 'boxingallowed', 'playbackmethod', 'delivery',
   'pos', 'api', 'ext']);
-const VERSION = '1.5';
+const VERSION = '1.6';
 const SYNC_IFRAME = 1;
 const SYNC_IMAGE = 2;
 const SYNC_TYPES = Object.freeze({
   1: 'iframe',
   2: 'image'
 });
+const GVLID = 14;
 
 const NATIVE_MODEL = [
   {name: 'title', assetType: 'title'},
@@ -50,9 +51,26 @@ const NATIVE_INDEX = NATIVE_MODEL.reduce((acc, val, idx) => {
  * Adapter for requesting bids from AdKernel white-label display platform
  */
 export const spec = {
-
   code: 'adkernel',
-  aliases: ['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon'],
+  gvlid: GVLID,
+  aliases: [
+    {code: 'headbidding'},
+    {code: 'adsolut'},
+    {code: 'oftmediahb'},
+    {code: 'audiencemedia'},
+    {code: 'waardex_ak'},
+    {code: 'roqoon'},
+    {code: 'andbeyond'},
+    {code: 'adbite'},
+    {code: 'houseofpubs'},
+    {code: 'torchad'},
+    {code: 'stringads'},
+    {code: 'bcm'},
+    {code: 'engageadx'},
+    {code: 'converge_digital', gvlid: 248},
+    {code: 'adomega'},
+    {code: 'denakop'}
+  ],
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
@@ -78,10 +96,11 @@ export const spec = {
    */
   buildRequests: function (bidRequests, bidderRequest) {
     let impDispatch = dispatchImps(bidRequests, bidderRequest.refererInfo);
-    const requests = [];
+    let requests = [];
+    let schain = bidRequests[0].schain;
     Object.keys(impDispatch).forEach(host => {
       Object.keys(impDispatch[host]).forEach(zoneId => {
-        const request = buildRtbRequest(impDispatch[host][zoneId], bidderRequest);
+        const request = buildRtbRequest(impDispatch[host][zoneId], bidderRequest, schain);
         requests.push({
           method: 'POST',
           url: `https://${host}/hb?zone=${zoneId}&v=${VERSION}`,
@@ -115,7 +134,7 @@ export const spec = {
         requestId: rtbBid.impid,
         cpm: rtbBid.price,
         creativeId: rtbBid.crid,
-        currency: 'USD',
+        currency: response.cur || 'USD',
         ttl: 360,
         netRevenue: true
       };
@@ -133,6 +152,27 @@ export const spec = {
         prBid.mediaType = NATIVE;
         prBid.native = buildNativeAd(JSON.parse(rtbBid.adm));
       }
+      if (utils.isStr(rtbBid.dealid)) {
+        prBid.dealId = rtbBid.dealid;
+      }
+      if (utils.isArray(rtbBid.adomain)) {
+        utils.deepSetValue(prBid, 'meta.advertiserDomains', rtbBid.adomain);
+      }
+      if (utils.isArray(rtbBid.cat)) {
+        utils.deepSetValue(prBid, 'meta.secondaryCatIds', rtbBid.cat);
+      }
+      if (utils.isPlainObject(rtbBid.ext)) {
+        if (utils.isNumber(rtbBid.ext.advertiser_id)) {
+          utils.deepSetValue(prBid, 'meta.advertiserId', rtbBid.ext.advertiser_id);
+        }
+        if (utils.isStr(rtbBid.ext.advertiser_name)) {
+          utils.deepSetValue(prBid, 'meta.advertiserName', rtbBid.ext.advertiser_name);
+        }
+        if (utils.isStr(rtbBid.ext.agency_name)) {
+          utils.deepSetValue(prBid, 'meta.agencyName', rtbBid.ext.agency_name);
+        }
+      }
+
       return prBid;
     });
   },
@@ -174,6 +214,18 @@ function dispatchImps(bidRequests, refererInfo) {
     }, {});
 }
 
+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
  *  @param bidRequest {BidRequest}
@@ -184,27 +236,42 @@ function buildImp(bidRequest, secure) {
     'id': bidRequest.bidId,
     'tagid': bidRequest.adUnitCode
   };
+  var mediaType;
+  var sizes = [];
 
-  if (utils.deepAccess(bidRequest, `mediaTypes.banner`)) {
-    let sizes = utils.getAdUnitSizes(bidRequest);
+  if (utils.deepAccess(bidRequest, 'mediaTypes.banner')) {
+    sizes = utils.getAdUnitSizes(bidRequest);
     imp.banner = {
       format: sizes.map(wh => utils.parseGPTSingleSizeArrayToRtbSize(wh)),
       topframe: 0
     };
+    mediaType = BANNER;
   } else if (utils.deepAccess(bidRequest, 'mediaTypes.video')) {
-    let sizes = bidRequest.mediaTypes.video.playerSize || [];
-    imp.video = utils.parseGPTSingleSizeArrayToRtbSize(sizes[0]) || {};
+    let video = utils.deepAccess(bidRequest, 'mediaTypes.video');
+    imp.video = {};
+    if (video.playerSize) {
+      sizes = video.playerSize[0];
+      imp.video = Object.assign(imp.video, utils.parseGPTSingleSizeArrayToRtbSize(sizes) || {});
+    }
     if (bidRequest.params.video) {
       Object.keys(bidRequest.params.video)
         .filter(key => includes(VIDEO_TARGETING, key))
         .forEach(key => imp.video[key] = bidRequest.params.video[key]);
     }
+    mediaType = VIDEO;
   } else if (utils.deepAccess(bidRequest, 'mediaTypes.native')) {
     let nativeRequest = buildNativeRequest(bidRequest.mediaTypes.native);
     imp.native = {
       ver: '1.1',
       request: JSON.stringify(nativeRequest)
-    }
+    };
+    mediaType = NATIVE;
+  } else {
+    throw new Error('Unsupported bid received');
+  }
+  let floor = getBidFloor(bidRequest, mediaType, sizes);
+  if (floor) {
+    imp.bidfloor = floor;
   }
   if (secure) {
     imp.secure = 1;
@@ -293,11 +360,12 @@ function getAllowedSyncMethod(bidderCode) {
  * Builds complete rtb request
  * @param imps {Object} Collection of rtb impressions
  * @param bidderRequest {BidderRequest}
+ * @param schain {Object=} Supply chain config
  * @return {Object} Complete rtb request
  */
-function buildRtbRequest(imps, bidderRequest) {
+function buildRtbRequest(imps, bidderRequest, schain) {
   let {bidderCode, gdprConsent, auctionId, refererInfo, timeout, uspConsent} = bidderRequest;
-
+  let coppa = config.getConfig('coppa');
   let req = {
     'id': auctionId,
     'imp': imps,
@@ -305,6 +373,7 @@ function buildRtbRequest(imps, bidderRequest) {
     'at': 1,
     'device': {
       'ip': 'caller',
+      'ipv6': 'caller',
       'ua': 'caller',
       'js': 1,
       'language': getLanguage()
@@ -325,10 +394,20 @@ function buildRtbRequest(imps, bidderRequest) {
   if (uspConsent) {
     utils.deepSetValue(req, 'regs.ext.us_privacy', uspConsent);
   }
+  if (coppa) {
+    utils.deepSetValue(req, 'regs.coppa', 1);
+  }
   let syncMethod = getAllowedSyncMethod(bidderCode);
   if (syncMethod) {
     utils.deepSetValue(req, 'ext.adk_usersync', syncMethod);
   }
+  if (schain) {
+    utils.deepSetValue(req, 'source.ext.schain', schain);
+  }
+  let eids = getExtendedUserIds(bidderRequest);
+  if (eids) {
+    utils.deepSetValue(req, 'user.ext.eids', eids);
+  }
   return req;
 }
 
@@ -360,6 +439,13 @@ function createSite(refInfo) {
   return site;
 }
 
+function getExtendedUserIds(bidderRequest) {
+  let eids = utils.deepAccess(bidderRequest, 'bids.0.userIdAsEids');
+  if (utils.isArray(eids)) {
+    return eids;
+  }
+}
+
 /**
  *  Format creative with optional nurl call
  *  @param bid rtb Bid object
diff --git a/modules/adlooxAnalyticsAdapter.js b/modules/adlooxAnalyticsAdapter.js
new file mode 100644
index 00000000000..3e92ae34004
--- /dev/null
+++ b/modules/adlooxAnalyticsAdapter.js
@@ -0,0 +1,288 @@
+/**
+ * This module provides [Adloox]{@link https://www.adloox.com/} Analytics
+ * The module will inject Adloox's verification JS tag alongside slot at bidWin
+ * @module modules/adlooxAnalyticsAdapter
+ */
+
+import adapterManager from '../src/adapterManager.js';
+import adapter from '../src/AnalyticsAdapter.js';
+import { loadExternalScript } from '../src/adloader.js';
+import { auctionManager } from '../src/auctionManager.js';
+import { AUCTION_COMPLETED } from '../src/auction.js';
+import { EVENTS } from '../src/constants.json';
+import find from 'core-js-pure/features/array/find.js';
+import * as utils from '../src/utils.js';
+
+const MODULE = 'adlooxAnalyticsAdapter';
+
+const URL_JS = 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js';
+
+const ADLOOX_VENDOR_ID = 93;
+
+const ADLOOX_MEDIATYPE = {
+  DISPLAY: 2,
+  VIDEO: 6
+};
+
+const MACRO = {};
+MACRO['client'] = function(b, c) {
+  return c.client;
+};
+MACRO['clientid'] = function(b, c) {
+  return c.clientid;
+};
+MACRO['tagid'] = function(b, c) {
+  return c.tagid;
+};
+MACRO['platformid'] = function(b, c) {
+  return c.platformid;
+};
+MACRO['targetelt'] = function(b, c) {
+  return c.toselector(b);
+};
+MACRO['creatype'] = function(b, c) {
+  return b.mediaType == 'video' ? ADLOOX_MEDIATYPE.VIDEO : ADLOOX_MEDIATYPE.DISPLAY;
+};
+MACRO['pbAdSlot'] = function(b, c) {
+  const adUnit = find(auctionManager.getAdUnits(), a => b.adUnitCode === a.code);
+  return utils.deepAccess(adUnit, 'fpd.context.pbAdSlot') || utils.getGptSlotInfoForAdUnitCode(b.adUnitCode).gptSlot || b.adUnitCode;
+};
+
+const PARAMS_DEFAULT = {
+  'id1': function(b) { return b.adUnitCode },
+  'id2': '%%pbAdSlot%%',
+  'id3': function(b) { return b.bidder },
+  'id4': function(b) { return b.adId },
+  'id5': function(b) { return b.dealId },
+  'id6': function(b) { return b.creativeId },
+  'id7': function(b) { return b.size },
+  'id11': '$ADLOOX_WEBSITE'
+};
+
+const NOOP = function() {};
+
+let analyticsAdapter = Object.assign(adapter({ analyticsType: 'endpoint' }), {
+  track({ eventType, args }) {
+    if (!analyticsAdapter[`handle_${eventType}`]) return;
+
+    utils.logInfo(MODULE, 'track', eventType, args);
+
+    analyticsAdapter[`handle_${eventType}`](args);
+  }
+});
+
+analyticsAdapter.context = null;
+
+analyticsAdapter.originEnableAnalytics = analyticsAdapter.enableAnalytics;
+analyticsAdapter.enableAnalytics = function(config) {
+  analyticsAdapter.context = null;
+
+  utils.logInfo(MODULE, 'config', config);
+
+  if (!utils.isPlainObject(config.options)) {
+    utils.logError(MODULE, 'missing options');
+    return;
+  }
+  if (!(config.options.js === undefined || utils.isStr(config.options.js))) {
+    utils.logError(MODULE, 'invalid js options value');
+    return;
+  }
+  if (!(config.options.toselector === undefined || utils.isFn(config.options.toselector))) {
+    utils.logError(MODULE, 'invalid toselector options value');
+    return;
+  }
+  if (!utils.isStr(config.options.client)) {
+    utils.logError(MODULE, 'invalid client options value');
+    return;
+  }
+  if (!utils.isNumber(config.options.clientid)) {
+    utils.logError(MODULE, 'invalid clientid options value');
+    return;
+  }
+  if (!utils.isNumber(config.options.tagid)) {
+    utils.logError(MODULE, 'invalid tagid options value');
+    return;
+  }
+  if (!utils.isNumber(config.options.platformid)) {
+    utils.logError(MODULE, 'invalid platformid options value');
+    return;
+  }
+  if (!(config.options.params === undefined || utils.isPlainObject(config.options.params))) {
+    utils.logError(MODULE, 'invalid params options value');
+    return;
+  }
+
+  analyticsAdapter.context = {
+    js: config.options.js || URL_JS,
+    toselector: config.options.toselector || function(bid) {
+      let code = utils.getGptSlotInfoForAdUnitCode(bid.adUnitCode).divId || bid.adUnitCode;
+      // https://mathiasbynens.be/notes/css-escapes
+      code = code.replace(/^\d/, '\\3$& ');
+      return `#${code}`
+    },
+    client: config.options.client,
+    clientid: config.options.clientid,
+    tagid: config.options.tagid,
+    platformid: config.options.platformid,
+    params: []
+  };
+
+  config.options.params = utils.mergeDeep({}, PARAMS_DEFAULT, config.options.params || {});
+  Object
+    .keys(config.options.params)
+    .forEach(k => {
+      if (!Array.isArray(config.options.params[k])) {
+        config.options.params[k] = [ config.options.params[k] ];
+      }
+      config.options.params[k].forEach(v => analyticsAdapter.context.params.push([ k, v ]));
+    });
+
+  Object.keys(COMMAND_QUEUE).forEach(commandProcess);
+
+  analyticsAdapter.originEnableAnalytics(config);
+}
+
+analyticsAdapter.originDisableAnalytics = analyticsAdapter.disableAnalytics;
+analyticsAdapter.disableAnalytics = function() {
+  analyticsAdapter.context = null;
+
+  analyticsAdapter.originDisableAnalytics();
+}
+
+analyticsAdapter.url = function(url, args, bid) {
+  // utils.formatQS outputs PHP encoded querystrings... (╯°□°)╯ ┻━┻
+  function a2qs(a) {
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
+    function fixedEncodeURIComponent(str) {
+      return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+        return '%' + c.charCodeAt(0).toString(16);
+      });
+    }
+
+    const args = [];
+    let n = a.length;
+    while (n-- > 0) {
+      if (!(a[n][1] === undefined || a[n][1] === null || a[n][1] === false)) {
+        args.unshift(fixedEncodeURIComponent(a[n][0]) + (a[n][1] !== true ? ('=' + fixedEncodeURIComponent(a[n][1])) : ''));
+      }
+    }
+
+    return args.join('&');
+  }
+
+  const macros = (str) => {
+    return str.replace(/%%([a-z]+)%%/gi, (match, p1) => MACRO[p1] ? MACRO[p1](bid, analyticsAdapter.context) : match);
+  };
+
+  url = macros(url);
+  args = args || [];
+
+  let n = args.length;
+  while (n-- > 0) {
+    if (utils.isFn(args[n][1])) {
+      try {
+        args[n][1] = args[n][1](bid);
+      } catch (_) {
+        utils.logError(MODULE, 'macro', args[n][0], _.message);
+        args[n][1] = `ERROR: ${_.message}`;
+      }
+    }
+    if (utils.isStr(args[n][1])) {
+      args[n][1] = macros(args[n][1]);
+    }
+  }
+
+  return url + a2qs(args);
+}
+
+analyticsAdapter[`handle_${EVENTS.AUCTION_END}`] = function(auctionDetails) {
+  if (!(auctionDetails.auctionStatus == AUCTION_COMPLETED && auctionDetails.bidsReceived.length > 0)) return;
+  analyticsAdapter[`handle_${EVENTS.AUCTION_END}`] = NOOP;
+
+  utils.logMessage(MODULE, 'preloading verification JS');
+
+  const uri = utils.parseUrl(analyticsAdapter.url(`${analyticsAdapter.context.js}#`));
+
+  const link = document.createElement('link');
+  link.setAttribute('href', `${uri.protocol}://${uri.host}${uri.pathname}`);
+  link.setAttribute('rel', 'preload');
+  link.setAttribute('as', 'script');
+  utils.insertElement(link);
+}
+
+analyticsAdapter[`handle_${EVENTS.BID_WON}`] = function(bid) {
+  const sl = analyticsAdapter.context.toselector(bid);
+  let el;
+  try {
+    el = document.querySelector(sl);
+  } catch (_) { }
+  if (!el) {
+    utils.logWarn(MODULE, `unable to find ad unit code '${bid.adUnitCode}' slot using selector '${sl}' (use options.toselector to change), ignoring`);
+    return;
+  }
+
+  utils.logMessage(MODULE, `measuring '${bid.mediaType}' unit at '${bid.adUnitCode}'`);
+
+  const params = analyticsAdapter.context.params.concat([
+    [ 'tagid', '%%tagid%%' ],
+    [ 'platform', '%%platformid%%' ],
+    [ 'fwtype', 4 ],
+    [ 'targetelt', '%%targetelt%%' ],
+    [ 'creatype', '%%creatype%%' ]
+  ]);
+
+  loadExternalScript(analyticsAdapter.url(`${analyticsAdapter.context.js}#`, params, bid), 'adloox');
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: analyticsAdapter,
+  code: 'adloox',
+  gvlid: ADLOOX_VENDOR_ID
+});
+
+export default analyticsAdapter;
+
+// src/events.js does not support custom events or handle races... (╯°□°)╯ ┻━┻
+const COMMAND_QUEUE = {};
+export const COMMAND = {
+  CONFIG: 'config',
+  URL: 'url',
+  TRACK: 'track'
+};
+export function command(cmd, data, callback0) {
+  const cid = utils.getUniqueIdentifierStr();
+  const callback = function() {
+    delete COMMAND_QUEUE[cid];
+    if (callback0) callback0.apply(null, arguments);
+  };
+  COMMAND_QUEUE[cid] = { cmd, data, callback };
+  if (analyticsAdapter.context) commandProcess(cid);
+}
+function commandProcess(cid) {
+  const { cmd, data, callback } = COMMAND_QUEUE[cid];
+
+  utils.logInfo(MODULE, 'command', cmd, data);
+
+  switch (cmd) {
+    case COMMAND.CONFIG:
+      const response = {
+        client: analyticsAdapter.context.client,
+        clientid: analyticsAdapter.context.clientid,
+        tagid: analyticsAdapter.context.tagid,
+        platformid: analyticsAdapter.context.platformid
+      };
+      callback(response);
+      break;
+    case COMMAND.URL:
+      if (data.ids) data.args = data.args.concat(analyticsAdapter.context.params.filter(p => /^id([1-9]|10)$/.test(p[0]))); // not >10
+      callback(analyticsAdapter.url(data.url, data.args, data.bid));
+      break;
+    case COMMAND.TRACK:
+      analyticsAdapter.track(data);
+      callback(); // drain queue
+      break;
+    default:
+      utils.logWarn(MODULE, 'command unknown', cmd);
+      // do not callback as arguments are unknown and to aid debugging
+  }
+}
diff --git a/modules/adlooxAnalyticsAdapter.md b/modules/adlooxAnalyticsAdapter.md
new file mode 100644
index 00000000000..0ca67f937f6
--- /dev/null
+++ b/modules/adlooxAnalyticsAdapter.md
@@ -0,0 +1,146 @@
+# Overview
+
+    Module Name: Adloox Analytics Adapter
+    Module Type: Analytics Adapter
+    Maintainer: technique@adloox.com
+
+# Description
+
+Analytics adapter for adloox.com. Contact adops@adloox.com for information.
+
+This module can be used to track:
+
+ * Display
+ * Native
+ * Video (see below for further instructions)
+
+The adapter adds an HTML ``;
+      trackedAd += tracker;
+    });
+  }
+
+  return trackedAd;
+}
+
+function getScreenParams() {
+  return `${window.screen.width}x${window.screen.height}@${window.devicePixelRatio}`;
+}
+
+function getBids(bids) {
+  const bidArr = bids.map(bid => {
+    const bidId = bid.bidId;
+
+    let mediaType = '';
+    const mediaTypes = Object.keys(bid.mediaTypes)
+    switch (mediaTypes[0]) {
+      case 'video':
+        mediaType = 'v';
+        break;
+
+      case 'native':
+        mediaType = 'n';
+        break;
+
+      case 'audio':
+        mediaType = 'a';
+        break;
+
+      default:
+        mediaType = 'b';
+        break;
+    }
+
+    let adUnitCode = `,c=${bid.adUnitCode}`;
+    if (bid.params.code) {
+      adUnitCode = `,c=${encodeURIComponent(bid.params.code)}`;
+    }
+    if (bid.params.adunitId) {
+      adUnitCode = `,u=${encodeURIComponent(bid.params.adunitId)}`;
+    }
+
+    return `${bidId}:t=${mediaType},s=${serializeSizes(bid.sizes)}${adUnitCode}`;
+  });
+
+  return bidArr.join(';');
+};
+
+function getEndpointsGroups(bidRequests) {
+  let endpoints = [];
+  const getEndpoint = bid => {
+    const publisherId = bid.params.publisherId || config.getConfig('apstream.publisherId');
+    const isTestConfig = bid.params.test || config.getConfig('apstream.test');
+
+    if (isTestConfig) {
+      return `https://mock-bapi.userreport.com/v2/${publisherId}/bid`;
+    }
+
+    if (bid.params.endpoint) {
+      return `${bid.params.endpoint}${publisherId}/bid`;
+    }
+
+    return `https://bapi.userreport.com/v2/${publisherId}/bid`;
+  }
+  bidRequests.forEach(bid => {
+    const endpoint = getEndpoint(bid);
+    const exist = endpoints.filter(item => item.endpoint.indexOf(endpoint) > -1)[0];
+    if (exist) {
+      exist.bids.push(bid);
+    } else {
+      endpoints.push({
+        endpoint: endpoint,
+        bids: [bid]
+      });
+    }
+  });
+
+  return endpoints;
+}
+
+function isBidRequestValid(bid) {
+  const publisherId = config.getConfig('apstream.publisherId');
+  const isPublisherIdExist = !!(publisherId || bid.params.publisherId);
+  const isOneMediaType = Object.keys(bid.mediaTypes).length === 1;
+
+  return isPublisherIdExist && isOneMediaType;
+}
+
+function buildRequests(bidRequests, bidderRequest) {
+  const data = {
+    med: encodeURIComponent(window.location.href),
+    auid: bidderRequest.auctionId,
+    ref: document.referrer,
+    dnt: utils.getDNT() ? 1 : 0,
+    sr: getScreenParams()
+  };
+
+  const consentData = getRawConsentString(bidderRequest.gdprConsent);
+  data.iab_consent = consentData;
+
+  const options = {
+    withCredentials: true
+  };
+
+  const isConsent = getIabConsentString(bidderRequest);
+  const noDsu = config.getConfig('apstream.noDsu');
+  if (!isConsent || noDsu) {
+    data.dsu = '';
+  } else {
+    data.dsu = dsuModule.readOrCreateDsu();
+  }
+
+  if (!isConsent || isConsent === 'disabled') {
+    options.withCredentials = false;
+  }
+
+  const endpoints = getEndpointsGroups(bidRequests);
+  const serverRequests = endpoints.map(item => ({
+    method: 'GET',
+    url: item.endpoint,
+    data: {
+      ...data,
+      bids: getBids(item.bids),
+      rnd: Math.random()
+    },
+    options: options
+  }));
+
+  return serverRequests;
+}
+
+function interpretResponse(serverResponse) {
+  let bidResponses = serverResponse && serverResponse.body;
+
+  if (!bidResponses || !bidResponses.length) {
+    return [];
+  }
+
+  return bidResponses.map(x => ({
+    requestId: x.bidId,
+    cpm: x.bidDetails.cpm,
+    width: x.bidDetails.width,
+    height: x.bidDetails.height,
+    creativeId: x.bidDetails.creativeId,
+    currency: x.bidDetails.currency || 'USD',
+    netRevenue: x.bidDetails.netRevenue,
+    dealId: x.bidDetails.dealId,
+    ad: injectPixels(x.bidDetails.ad, x.bidDetails.noticeUrls, x.bidDetails.impressionScripts),
+    ttl: x.bidDetails.ttl,
+  }));
+}
+
+export const spec = {
+  code: CONSTANTS.BIDDER_CODE,
+  gvlid: CONSTANTS.GVLID,
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildRequests,
+  interpretResponse: interpretResponse
+}
+
+registerBidder(spec);
diff --git a/modules/apstreamBidAdapter.md b/modules/apstreamBidAdapter.md
new file mode 100644
index 00000000000..6b87b33489a
--- /dev/null
+++ b/modules/apstreamBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: AP Stream Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: tech@audienceproject.com
+gdpr_supported: true
+tcf2_supported: true
+```
+
+# Description
+
+Module that connects to AP Stream source
+
+# Inherit from prebid.js
+```
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID // mandatory
+            }
+        }]
+      }
+    ];
+```
+
+# Explicit ad-unit code
+```
+    var website = null;
+    switch (location.hostname) { 
+      case "site1.com": 
+        website = "S1"; 
+        break;
+      case "site2.com":
+        website = "S2";
+        break;
+    }
+    
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID, // mandatory
+                code: website + '_Leaderboard'
+            }
+        }]
+      }
+    ];
+```
+
+# Explicit ad-unit ID
+```
+    var adUnits = [
+      {
+        code: '/19968336/header-bid-tag-1',
+        mediaTypes: { // mandatory and should be only one
+            banner: {
+                sizes: [[920,180], [920, 130]]
+            }
+        },
+        bids: [{
+            bidder: 'apstream',
+            params: {
+                publisherId: STREAM_PIBLISHER_ID, // mandatory
+                adunitId: 1234
+            }
+        }]
+      }
+    ];
+```
+
+# DSU
+
+To disable DSU use config option:
+
+```
+    pbjs.setConfig({
+        apstream: {
+            noDsu: true
+        }
+    });
+```
+
+To set `test` and `publisherId` parameters globally use config options (it can be overrided if set in specific bid):
+
+```
+pbjs.setBidderConfig({
+    bidders: ["apstream"],
+    config: {
+        appstream: {
+            publisherId: '1234
+            test: true
+        }
+    }
+});
+```
diff --git a/modules/astraoneBidAdapter.js b/modules/astraoneBidAdapter.js
index 7e98c1022d2..2fec3892d27 100644
--- a/modules/astraoneBidAdapter.js
+++ b/modules/astraoneBidAdapter.js
@@ -31,7 +31,9 @@ function buildBid(bidData) {
     creativeId: bidData.content.seanceId,
     currency: bidData.currency,
     netRevenue: true,
-    mediaType: BANNER,
+    meta: {
+      mediaType: BANNER,
+    },
     ttl: TTL,
     content: bidData.content
   };
@@ -62,7 +64,7 @@ function wrapAd(bid, bidData) {
                 parentDocument.style.height = "100%";
                 parentDocument.style.width = "100%";
             }
-            var _html = "${encodeURIComponent(JSON.stringify(bid))}";
+            var _html = "${encodeURIComponent(JSON.stringify({...bid, content: bidData.content}))}";
             window._ao_ssp.registerInImage(JSON.parse(decodeURIComponent(_html)));
         
     
@@ -126,14 +128,9 @@ export const spec = {
    * @return {Bid[]} An array of bids which were nested inside the server.
    */
   interpretResponse: function(serverResponse) {
-    const serverBody = serverResponse.body;
-    if (serverBody && utils.isArray(serverBody)) {
-      return utils._map(serverBody, function(bid) {
-        return buildBid(bid);
-      });
-    } else {
-      return [];
-    }
+    const bids = serverResponse.body && serverResponse.body.bids;
+
+    return Array.isArray(bids) ? bids.map(bid => buildBid(bid)) : []
   }
 
 }
diff --git a/modules/astraoneBidAdapter.md b/modules/astraoneBidAdapter.md
index a7eaeeef5a4..e090cfe1e54 100644
--- a/modules/astraoneBidAdapter.md
+++ b/modules/astraoneBidAdapter.md
@@ -18,17 +18,17 @@ About us: https://astraone.io
 var adUnits = [{
     code: 'test-div',
     mediaTypes: {
-        banner: {
-            sizes: [1, 1]
-        }
+      banner: {
+        sizes: [1, 1],
+      }
     },
     bids: [{
-        bidder: "astraone",
-        params: {
-            placement: "inImage",
-            placeId: "5af45ad34d506ee7acad0c26",
-            imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
-        }
+      bidder: "astraone",
+      params: {
+        placement: "inImage",
+        placeId: "5f477bf94d506ebe2c4240f3",
+        imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+      }
     }]
 }];
 ```
@@ -39,66 +39,69 @@ var adUnits = [{
 
 
 
-	
-	Prebid.js Banner Example
-	
-	
+  
+      },
+      bids: [{
+        bidder: "astraone",
+        params: {
+          placement: "inImage",
+          placeId: "5f477bf94d506ebe2c4240f3",
+          imageUrl: "https://creative.astraone.io/files/default_image-1-600x400.jpg"
+        }
+      }]
+    }];
+
+    var pbjs = pbjs || {};
+    pbjs.que = pbjs.que || [];
+
+    pbjs.que.push(function() {
+      pbjs.addAdUnits(adUnits);
+      pbjs.requestBids({
+        bidsBackHandler: function (e) {
+          if (pbjs.adserverRequestSent) return;
+          pbjs.adserverRequestSent = true;
+          var params = pbjs.getAdserverTargetingForAdUnitCode("test-div");
+          var iframe = document.getElementById('test-div');
+
+          if (params && params['hb_adid']) {
+            iframe.parentElement.style.position = "relative";
+            iframe.style.display = "block";
+            pbjs.renderAd(iframe.contentDocument, params['hb_adid']);
+          }
+        }
+      });
+    });
+  
 
 
 
-	
Prebid.js InImage Banner Test

+
Prebid.js InImage Banner Test

 
-	

-        
-        
-    

+

+  
+  
+

 
 
 
@@ -109,90 +112,91 @@ var adUnits = [{
 
 
 
-	
-	Prebid.js Banner Example
-	
-	
-	
-	
+  
+  Prebid.js Banner gpt Example
+  
+  
+  
+  
 
 
-	
Prebid.js Banner Ad Unit Test

+
Prebid.js InImage Banner gpt Test

 
-	

-		
+

+  
 
-		
-	

+  
+

 
 
 ```
diff --git a/modules/atsAnalyticsAdapter.js b/modules/atsAnalyticsAdapter.js
index 7bf2ca75c17..31e46dead89 100644
--- a/modules/atsAnalyticsAdapter.js
+++ b/modules/atsAnalyticsAdapter.js
@@ -3,26 +3,235 @@ import CONSTANTS from '../src/constants.json';
 import adaptermanager from '../src/adapterManager.js';
 import * as utils from '../src/utils.js';
 import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+/**
+ * Analytics adapter for - https://liveramp.com
+ * Maintainer - prebid@liveramp.com
+ */
 
 const analyticsType = 'endpoint';
+// dev endpoints
+// const preflightUrl = 'https://analytics-check.publishersite.xyz/check/';
+// export const analyticsUrl = 'https://analyticsv2.publishersite.xyz';
+
+const preflightUrl = 'https://check.analytics.rlcdn.com/check/';
+export const analyticsUrl = 'https://analytics.rlcdn.com';
 
 let handlerRequest = [];
 let handlerResponse = [];
-let host = '';
+
+let atsAnalyticsAdapterVersion = 1;
+
+let browsersList = [
+  /* Googlebot */
+  {
+    test: /googlebot/i,
+    name: 'Googlebot'
+  },
+
+  /* Opera < 13.0 */
+  {
+    test: /opera/i,
+    name: 'Opera',
+  },
+
+  /* Opera > 13.0 */
+  {
+    test: /opr\/|opios/i,
+    name: 'Opera'
+  },
+  {
+    test: /SamsungBrowser/i,
+    name: 'Samsung Internet for Android',
+  },
+  {
+    test: /Whale/i,
+    name: 'NAVER Whale Browser',
+  },
+  {
+    test: /MZBrowser/i,
+    name: 'MZ Browser'
+  },
+  {
+    test: /focus/i,
+    name: 'Focus',
+  },
+  {
+    test: /swing/i,
+    name: 'Swing',
+  },
+  {
+    test: /coast/i,
+    name: 'Opera Coast',
+  },
+  {
+    test: /opt\/\d+(?:.?_?\d+)+/i,
+    name: 'Opera Touch',
+  },
+  {
+    test: /yabrowser/i,
+    name: 'Yandex Browser',
+  },
+  {
+    test: /ucbrowser/i,
+    name: 'UC Browser',
+  },
+  {
+    test: /Maxthon|mxios/i,
+    name: 'Maxthon',
+  },
+  {
+    test: /epiphany/i,
+    name: 'Epiphany',
+  },
+  {
+    test: /puffin/i,
+    name: 'Puffin',
+  },
+  {
+    test: /sleipnir/i,
+    name: 'Sleipnir',
+  },
+  {
+    test: /k-meleon/i,
+    name: 'K-Meleon',
+  },
+  {
+    test: /micromessenger/i,
+    name: 'WeChat',
+  },
+  {
+    test: /qqbrowser/i,
+    name: (/qqbrowserlite/i).test(window.navigator.userAgent) ? 'QQ Browser Lite' : 'QQ Browser',
+  },
+  {
+    test: /msie|trident/i,
+    name: 'Internet Explorer',
+  },
+  {
+    test: /\sedg\//i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /edg([ea]|ios)/i,
+    name: 'Microsoft Edge',
+  },
+  {
+    test: /vivaldi/i,
+    name: 'Vivaldi',
+  },
+  {
+    test: /seamonkey/i,
+    name: 'SeaMonkey',
+  },
+  {
+    test: /sailfish/i,
+    name: 'Sailfish',
+  },
+  {
+    test: /silk/i,
+    name: 'Amazon Silk',
+  },
+  {
+    test: /phantom/i,
+    name: 'PhantomJS',
+  },
+  {
+    test: /slimerjs/i,
+    name: 'SlimerJS',
+  },
+  {
+    test: /blackberry|\bbb\d+/i,
+    name: 'BlackBerry',
+  },
+  {
+    test: /(web|hpw)[o0]s/i,
+    name: 'WebOS Browser',
+  },
+  {
+    test: /bada/i,
+    name: 'Bada',
+  },
+  {
+    test: /tizen/i,
+    name: 'Tizen',
+  },
+  {
+    test: /qupzilla/i,
+    name: 'QupZilla',
+  },
+  {
+    test: /firefox|iceweasel|fxios/i,
+    name: 'Firefox',
+  },
+  {
+    test: /electron/i,
+    name: 'Electron',
+  },
+  {
+    test: /MiuiBrowser/i,
+    name: 'Miui',
+  },
+  {
+    test: /chromium/i,
+    name: 'Chromium',
+  },
+  {
+    test: /chrome|crios|crmo/i,
+    name: 'Chrome',
+  },
+  {
+    test: /GSA/i,
+    name: 'Google Search',
+  },
+
+  /* Android Browser */
+  {
+    test: /android/i,
+    name: 'Android Browser',
+  },
+
+  /* PlayStation 4 */
+  {
+    test: /playstation 4/i,
+    name: 'PlayStation 4',
+  },
+
+  /* Safari */
+  {
+    test: /safari|applewebkit/i,
+    name: 'Safari',
+  },
+];
+
+function setSamplingCookie(samplRate) {
+  let now = new Date();
+  now.setTime(now.getTime() + 3600000);
+  storage.setCookie('_lr_sampling_rate', samplRate, now.toUTCString());
+}
+
+let listOfSupportedBrowsers = ['Safari', 'Chrome', 'Firefox', 'Microsoft Edge'];
 
 function bidRequestedHandler(args) {
+  let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
+  let envelopeSource = envelopeSourceCookieValue === 'true';
   let requests;
   requests = args.bids.map(function(bid) {
     return {
+      envelope_source: envelopeSource,
       has_envelope: bid.userId ? !!bid.userId.idl_env : false,
       bidder: bid.bidder,
       bid_id: bid.bidId,
       auction_id: args.auctionId,
-      user_browser: (browserIsFirefox() || browserIsEdge() || browserIsChrome() || browserIsSafari()),
+      user_browser: parseBrowser(),
       user_platform: navigator.platform,
       auction_start: new Date(args.auctionStart).toJSON(),
       domain: window.location.hostname,
       pid: atsAnalyticsAdapter.context.pid,
+      adapter_version: atsAnalyticsAdapterVersion
     };
   });
   return requests;
@@ -38,40 +247,44 @@ function bidResponseHandler(args) {
   };
 }
 
-export function browserIsFirefox() {
-  if (typeof InstallTrigger !== 'undefined') {
-    return 'Firefox';
-  } else {
-    return false;
+export function parseBrowser() {
+  let ua = atsAnalyticsAdapter.getUserAgent();
+  try {
+    let result = browsersList.filter(function(obj) {
+      return obj.test.test(ua);
+    });
+    let browserName = result && result.length ? result[0].name : '';
+    return (listOfSupportedBrowsers.indexOf(browserName) >= 0) ? browserName : 'Unknown';
+  } catch (err) {
+    utils.logError('ATS Analytics - Error while checking user browser!', err);
   }
 }
 
-export function browserIsIE() {
-  return !!document.documentMode;
-}
-
-export function browserIsEdge() {
-  if (!browserIsIE() && !!window.StyleMedia) {
-    return 'Edge';
-  } else {
-    return false;
+function sendDataToAnalytic () {
+  // send data to ats analytic endpoint
+  try {
+    let dataToSend = {'Data': atsAnalyticsAdapter.context.events};
+    let strJSON = JSON.stringify(dataToSend);
+    utils.logInfo('ATS Analytics - tried to send analytics data!');
+    ajax(analyticsUrl, function () {
+    }, strJSON, {method: 'POST', contentType: 'application/json'});
+  } catch (err) {
+    utils.logError('ATS Analytics - request encounter an error: ', err);
   }
 }
 
-export function browserIsChrome() {
-  if ((!!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)) || (/Android/i.test(navigator.userAgent) && !!window.chrome)) {
-    return 'Chrome';
-  } else {
-    return false;
-  }
-}
-
-export function browserIsSafari() {
-  if (navigator.vendor.indexOf('Apple')) {
-    return 'Safari'
-  } else {
-    return false;
-  }
+// preflight request, to check did publisher have permission to send data to analytics endpoint
+function preflightRequest (envelopeSourceCookieValue) {
+  ajax(preflightUrl + atsAnalyticsAdapter.context.pid, function (data) {
+    let samplingRateObject = JSON.parse(data);
+    utils.logInfo('ATS Analytics - Sampling Rate: ', samplingRateObject);
+    let samplingRate = samplingRateObject['samplingRate'];
+    setSamplingCookie(samplingRate);
+    let samplingRateNumber = Number(samplingRate);
+    if (data && samplingRate && atsAnalyticsAdapter.shouldFireRequest(samplingRateNumber) && envelopeSourceCookieValue != null) {
+      sendDataToAnalytic();
+    }
+  }, undefined, { method: 'GET', crossOrigin: true });
 }
 
 function callHandler(evtype, args) {
@@ -99,7 +312,6 @@ function callHandler(evtype, args) {
 
 let atsAnalyticsAdapter = Object.assign(adapter(
   {
-    host,
     analyticsType
   }),
 {
@@ -108,13 +320,19 @@ let atsAnalyticsAdapter = Object.assign(adapter(
       callHandler(eventType, args);
     }
     if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      // send data to ats analytic endpoint
+      let envelopeSourceCookieValue = storage.getCookie('_lr_env_src_ats');
       try {
-        let dataToSend = {'Data': atsAnalyticsAdapter.context.events};
-        let strJSON = JSON.stringify(dataToSend);
-        ajax(atsAnalyticsAdapter.context.host, function () {
-        }, strJSON, {method: 'POST', contentType: 'application/json'});
+        utils.logInfo('ATS Analytics - preflight request!');
+        let samplingRateCookie = storage.getCookie('_lr_sampling_rate');
+        if (!samplingRateCookie) {
+          preflightRequest(envelopeSourceCookieValue);
+        } else {
+          if (atsAnalyticsAdapter.shouldFireRequest(parseInt(samplingRateCookie)) && envelopeSourceCookieValue != null) {
+            sendDataToAnalytic();
+          }
+        }
       } catch (err) {
+        utils.logError('ATS Analytics - preflight request encounter an error: ', err);
       }
     }
   }
@@ -123,22 +341,24 @@ let atsAnalyticsAdapter = Object.assign(adapter(
 // save the base class function
 atsAnalyticsAdapter.originEnableAnalytics = atsAnalyticsAdapter.enableAnalytics;
 
+// add check to not fire request every time, but instead to send 1/10 events
+atsAnalyticsAdapter.shouldFireRequest = function (samplingRate) {
+  let shouldFireRequestValue = (Math.floor((Math.random() * samplingRate + 1)) === samplingRate);
+  utils.logInfo('ATS Analytics - Should Fire Request: ', shouldFireRequestValue);
+  return shouldFireRequestValue;
+};
+
+atsAnalyticsAdapter.getUserAgent = function () {
+  return window.navigator.userAgent;
+};
 // override enableAnalytics so we can get access to the config passed in from the page
 atsAnalyticsAdapter.enableAnalytics = function (config) {
   if (!config.options.pid) {
-    utils.logError('Publisher ID (pid) option is not defined. Analytics won\'t work');
+    utils.logError('ATS Analytics - Publisher ID (pid) option is not defined. Analytics won\'t work');
     return;
   }
-
-  if (!config.options.host) {
-    utils.logError('Host option is not defined. Analytics won\'t work');
-    return;
-  }
-
-  host = config.options.host;
   atsAnalyticsAdapter.context = {
     events: [],
-    host: config.options.host,
     pid: config.options.pid
   };
   let initOptions = config.options;
@@ -147,7 +367,8 @@ atsAnalyticsAdapter.enableAnalytics = function (config) {
 
 adaptermanager.registerAnalyticsAdapter({
   adapter: atsAnalyticsAdapter,
-  code: 'atsAnalytics'
+  code: 'atsAnalytics',
+  gvlid: 97
 });
 
 export default atsAnalyticsAdapter;
diff --git a/modules/atsAnalyticsAdapter.md b/modules/atsAnalyticsAdapter.md
index 560ad237aa0..7c634f39ae2 100644
--- a/modules/atsAnalyticsAdapter.md
+++ b/modules/atsAnalyticsAdapter.md
@@ -17,7 +17,6 @@ Analytics adapter for Authenticated Traffic Solution(ATS), provided by LiveRamp.
   provider: 'atsAnalytics',
   options: {
      pid: '999', // publisher ID
-     host: 'https://example.com' // host is provided to publisher
   }
 }
 ```
diff --git a/modules/audienceNetworkBidAdapter.js b/modules/audienceNetworkBidAdapter.js
deleted file mode 100644
index 2d1b3aaaf29..00000000000
--- a/modules/audienceNetworkBidAdapter.js
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * @file AudienceNetwork adapter.
- */
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { generateUUID, deepAccess, convertTypes, formatQS } from '../src/utils.js';
-import findIndex from 'core-js-pure/features/array/find-index.js';
-import includes from 'core-js-pure/features/array/includes.js';
-
-const code = 'audienceNetwork';
-const currency = 'USD';
-const method = 'GET';
-const url = 'https://an.facebook.com/v2/placementbid.json';
-const supportedMediaTypes = ['banner', 'video'];
-const netRevenue = true;
-const hbBidder = 'fan';
-const ttl = 600;
-const videoTtl = 3600;
-const platver = '$prebid.version$';
-const platform = '2078522619030089';
-const adapterver = '1.3.0';
-/**
- * Does this bid request contain valid parameters?
- * @param {Object} bid
- * @returns {Boolean}
- */
-const isBidRequestValid = bid =>
-  typeof bid.params === 'object' &&
-  typeof bid.params.placementId === 'string' &&
-  bid.params.placementId.length > 0 &&
-  Array.isArray(bid.sizes) && bid.sizes.length > 0 &&
-  (isFullWidth(bid.params.format) ? bid.sizes.map(flattenSize).some(size => size === '300x250') : true) &&
-  (isValidNonSizedFormat(bid.params.format) || bid.sizes.map(flattenSize).some(isValidSize));
-
-/**
- * Flattens a 2-element [W, H] array as a 'WxH' string,
- * otherwise passes value through.
- * @param {Array|String} size
- * @returns {String}
- */
-const flattenSize = size =>
-  (Array.isArray(size) && size.length === 2) ? `${size[0]}x${size[1]}` : size;
-
-/**
- * Expands a 'WxH' string as a 2-element [W, H] array
- * @param {String} size
- * @returns {Array}
- */
-const expandSize = size => size.split('x').map(Number);
-
-/**
- * Is this a valid slot size?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidSize = size => includes(['300x250', '320x50'], size);
-
-/**
- * Is this a valid, non-sized format?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidNonSizedFormat = format => includes(['video', 'native'], format);
-
-/**
- * Is this a valid size and format?
- * @param {String} size
- * @returns {Boolean}
- */
-const isValidSizeAndFormat = (size, format) =>
-  (isFullWidth(format) && flattenSize(size) === '300x250') ||
-  isValidNonSizedFormat(format) ||
-  isValidSize(flattenSize(size));
-
-/**
- * Find a preferred entry, if any, from an array of valid sizes.
- * @param {Array} acc
- * @param {String} cur
- */
-const sortByPreferredSize = (acc, cur) =>
-  (cur === '300x250') ? [cur, ...acc] : [...acc, cur];
-
-/**
- * Map any deprecated size/formats to new values.
- * @param {String} size
- * @param {String} format
- */
-const mapDeprecatedSizeAndFormat = (size, format) =>
-  isFullWidth(format) ? ['300x250', null] : [size, format];
-
-/**
- * Is this a video format?
- * @param {String} format
- * @returns {Boolean}
- */
-const isVideo = format => format === 'video';
-
-/**
- * Is this a fullwidth format?
- * @param {String} format
- * @returns {Boolean}
- */
-const isFullWidth = format => format === 'fullwidth';
-
-/**
- * Which SDK version should be used for this format?
- * @param {String} format
- * @returns {String}
- */
-const sdkVersion = format => isVideo(format) ? '' : '6.0.web';
-
-/**
- * Which platform identifier should be used?
- * @param {Array} platforms Possible platform identifiers
- * @returns {String} First valid platform found, or default if none found
- */
-const findPlatform = platforms => [...platforms.filter(Boolean), platform][0];
-
-/**
- * Does the search part of the URL contain "anhb_testmode"
- * and therefore indicate testmode should be used?
- * @returns {String} "true" or "false"
- */
-const isTestmode = () => Boolean(
-  window && window.location &&
-  typeof window.location.search === 'string' &&
-  window.location.search.indexOf('anhb_testmode') !== -1
-).toString();
-
-/**
- * Generate ad HTML for injection into an iframe
- * @param {String} placementId
- * @param {String} format
- * @param {String} bidId
- * @returns {String} HTML
- */
-const createAdHtml = (placementId, format, bidId) => {
-  const nativeStyle = format === 'native' ? '' : '';
-  const nativeContainer = format === 'native' ? '
' : '';
-  return `
-  ${nativeStyle}
-  
-    

-      
-      
-      ${nativeContainer}
-    

-  
-`;
-};
-
-/**
- * Convert each bid request to a single URL to fetch those bids.
- * @param {Array} bids - list of bids
- * @param {String} bids[].placementCode - Prebid placement identifier
- * @param {Object} bids[].params
- * @param {String} bids[].params.placementId - Audience Network placement identifier
- * @param {String} bids[].params.platform - Audience Network platform identifier (optional)
- * @param {String} bids[].params.format - Optional format, one of 'video' or 'native' if set
- * @param {Array} bids[].sizes - list of desired advert sizes
- * @param {Array} bids[].sizes[] - Size arrays [h,w]: should include one of [300, 250], [320, 50]
- * @returns {Array} List of URLs to fetch, plus formats and sizes for later use with interpretResponse
- */
-const buildRequests = (bids, bidderRequest) => {
-  // Build lists of placementids, adformats, sizes and SDK versions
-  const placementids = [];
-  const adformats = [];
-  const sizes = [];
-  const sdk = [];
-  const platforms = [];
-  const requestIds = [];
-
-  bids.forEach(bid => bid.sizes
-    .map(flattenSize)
-    .filter(size => isValidSizeAndFormat(size, bid.params.format))
-    .reduce(sortByPreferredSize, [])
-    .slice(0, 1)
-    .forEach(preferredSize => {
-      const [size, format] = mapDeprecatedSizeAndFormat(preferredSize, bid.params.format);
-      placementids.push(bid.params.placementId);
-      adformats.push(format || size);
-      sizes.push(size);
-      sdk.push(sdkVersion(format));
-      platforms.push(bid.params.platform);
-      requestIds.push(bid.bidId);
-    })
-  );
-  // Build URL
-  const testmode = isTestmode();
-  const pageurl = encodeURIComponent(deepAccess(bidderRequest, 'refererInfo.canonicalUrl') || deepAccess(bidderRequest, 'refererInfo.referer'));
-  const platform = findPlatform(platforms);
-  const cb = generateUUID();
-  const search = {
-    placementids,
-    adformats,
-    testmode,
-    pageurl,
-    sdk,
-    adapterver,
-    platform,
-    platver,
-    cb
-  };
-  const video = findIndex(adformats, isVideo);
-  if (video !== -1) {
-    [search.playerwidth, search.playerheight] = expandSize(sizes[video]);
-  }
-  const data = formatQS(search);
-
-  return [{ adformats, data, method, requestIds, sizes, url, pageurl }];
-};
-
-/**
- * Convert a server response to a bid response.
- * @param {Object} response - object representing the response
- * @param {Object} response.body - response body, already converted from JSON
- * @param {Object} bidRequests - the original bid requests
- * @param {Array} bidRequest.adformats - list of formats for the original bid requests
- * @param {Array} bidRequest.sizes - list of sizes fot the original bid requests
- * @returns {Array} A list of bid response objects
- */
-const interpretResponse = ({ body }, { adformats, requestIds, sizes, pageurl }) => {
-  const { bids = {} } = body;
-  return Object.keys(bids)
-    // extract Array of bid responses
-    .map(placementId => bids[placementId])
-    // flatten
-    .reduce((a, b) => a.concat(b), [])
-    // transform to bidResponse
-    .map((bid, i) => {
-      const {
-        bid_id: fbBidid,
-        placement_id: creativeId,
-        bid_price_cents: cpm
-      } = bid;
-
-      const format = adformats[i];
-      const [width, height] = expandSize(flattenSize(sizes[i]));
-      const ad = createAdHtml(creativeId, format, fbBidid);
-      const requestId = requestIds[i];
-
-      const bidResponse = {
-        // Prebid attributes
-        requestId,
-        cpm: cpm / 100,
-        width,
-        height,
-        ad,
-        ttl,
-        creativeId,
-        netRevenue,
-        currency,
-        // Audience Network attributes
-        hb_bidder: hbBidder,
-        fb_bidid: fbBidid,
-        fb_format: format,
-        fb_placementid: creativeId
-      };
-      // Video attributes
-      if (isVideo(format)) {
-        bidResponse.mediaType = 'video';
-        bidResponse.vastUrl = `https://an.facebook.com/v1/instream/vast.xml?placementid=${creativeId}&pageurl=${pageurl}&playerwidth=${width}&playerheight=${height}&bidid=${fbBidid}`;
-        bidResponse.ttl = videoTtl;
-      }
-      return bidResponse;
-    });
-};
-
-/**
- * Covert bid param types for S2S
- * @param {Object} params bid params
- * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
- * @return {Object} params bid params
- */
-const transformBidParams = (params, isOpenRtb) => {
-  return convertTypes({
-    'placementId': 'string'
-  }, params);
-}
-
-export const spec = {
-  code,
-  supportedMediaTypes,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse,
-  transformBidParams
-};
-
-registerBidder(spec);
diff --git a/modules/audienceNetworkBidAdapter.md b/modules/audienceNetworkBidAdapter.md
deleted file mode 100644
index 6147191f4b7..00000000000
--- a/modules/audienceNetworkBidAdapter.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Overview
-
-Module Name: Audience Network Bid Adapter
-
-Module Type: Bidder Adapter
-
-Maintainer: Lovell Fuller
-
-# Parameters
-
-| Name          | Scope    | Description                                     | Example                           |
-| :------------ | :------- | :---------------------------------------------- | :--------------------------------- |
-| `placementId` | required | The Placement ID from Audience Network          | "555555555555555\_555555555555555" |
-| `format`      | optional | Format, one of "native" or "video"              | "native"                           |
-
-# Example ad units
-
-```javascript
-const adUnits = [{
-  code: "test-iab",
-  sizes: [[300, 250]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}, {
-  code: "test-native",
-  sizes: [[300, 250]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      format: "native",
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}, {
-  code: "test-video",
-  sizes: [[640, 360]],
-  bids: [{
-    bidder: "audienceNetwork",
-    params: {
-      format: "video",
-      placementId: "555555555555555_555555555555555"
-    }
-  }]
-}];
-```
diff --git a/modules/audigentRtdProvider.js b/modules/audigentRtdProvider.js
deleted file mode 100644
index 0f32c84962f..00000000000
--- a/modules/audigentRtdProvider.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * This module adds audigent provider to the real time data module
- * The {@link module:modules/realTimeData} module is required
- * The module will fetch segments from audigent server
- * @module modules/audigentRtdProvider
- * @requires module:modules/realTimeData
- */
-
-/**
- * @typedef {Object} ModuleParams
- * @property {string} siteKey
- * @property {string} pubKey
- * @property {string} url
- * @property {?string} keyName
- * @property {number} auctionDelay
- */
-
-import {config} from '../src/config.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import * as utils from '../src/utils.js';
-import {submodule} from '../src/hook.js';
-import {ajax} from '../src/ajax.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const storage = getStorageManager();
-
-/** @type {string} */
-const MODULE_NAME = 'realTimeData';
-
-/** @type {ModuleParams} */
-let _moduleParams = {};
-
-/**
- * XMLHttpRequest to get data form audigent server
- * @param {string} url server url with query params
- */
-
-export function setData(data) {
-  storage.setDataInLocalStorage('__adgntseg', JSON.stringify(data));
-}
-
-function getSegments(adUnits, onDone) {
-  try {
-    let jsonData = storage.getDataFromLocalStorage('__adgntseg');
-    if (jsonData) {
-      let data = JSON.parse(jsonData);
-      if (data.audigent_segments) {
-        let dataToReturn = adUnits.reduce((rp, cau) => {
-          const adUnitCode = cau && cau.code;
-          if (!adUnitCode) { return rp }
-          rp[adUnitCode] = data;
-          return rp;
-        }, {});
-
-        onDone(dataToReturn);
-        return;
-      }
-    }
-    getSegmentsAsync(adUnits, onDone);
-  } catch (e) {
-    getSegmentsAsync(adUnits, onDone);
-  }
-}
-
-function getSegmentsAsync(adUnits, onDone) {
-  const userIds = (getGlobal()).getUserIds();
-  let tdid = null;
-
-  if (userIds && userIds['tdid']) {
-    tdid = userIds['tdid'];
-  } else {
-    onDone({});
-  }
-
-  const url = `https://seg.ad.gt/api/v1/rtb_segments?tdid=${tdid}`;
-
-  ajax(url, {
-    success: function (response, req) {
-      if (req.status === 200) {
-        try {
-          const data = JSON.parse(response);
-          if (data && data.audigent_segments) {
-            setData(data);
-            let dataToReturn = adUnits.reduce((rp, cau) => {
-              const adUnitCode = cau && cau.code;
-              if (!adUnitCode) { return rp }
-              rp[adUnitCode] = data;
-              return rp;
-            }, {});
-
-            onDone(dataToReturn);
-          } else {
-            onDone({});
-          }
-        } catch (err) {
-          utils.logError('unable to parse audigent segment data');
-          onDone({})
-        }
-      } else if (req.status === 204) {
-        // unrecognized site key
-        onDone({});
-      }
-    },
-    error: function () {
-      onDone({});
-      utils.logError('unable to get audigent segment data');
-    }
-  }
-  );
-}
-
-/** @type {RtdSubmodule} */
-export const audigentSubmodule = {
-  /**
-   * used to link submodule with realTimeData
-   * @type {string}
-   */
-  name: 'audigent',
-  /**
-   * get data and send back to realTimeData module
-   * @function
-   * @param {adUnit[]} adUnits
-   * @param {function} onDone
-   */
-  getData: getSegments
-};
-
-export function init(config) {
-  const confListener = config.getConfig(MODULE_NAME, ({realTimeData}) => {
-    try {
-      _moduleParams = realTimeData.dataProviders && realTimeData.dataProviders.filter(pr => pr.name && pr.name.toLowerCase() === 'audigent')[0].params;
-      _moduleParams.auctionDelay = realTimeData.auctionDelay;
-    } catch (e) {
-      _moduleParams = {};
-    }
-    confListener();
-  });
-}
-
-submodule('realTimeData', audigentSubmodule);
-init(config);
diff --git a/modules/audigentRtdProvider.md b/modules/audigentRtdProvider.md
deleted file mode 100644
index 47bcbbbf951..00000000000
--- a/modules/audigentRtdProvider.md
+++ /dev/null
@@ -1,52 +0,0 @@
-Audigent is a next-generation data management platform and a first-of-a-kind 
-"data agency" containing some of the most exclusive content-consuming audiences 
-across desktop, mobile and social platforms.
-
-This real-time data module provides first-party Audigent segments that can be 
-attached to bid request objects destined for different SSPs in order to optimize 
-targeting. Audigent maintains a large database of first-party Tradedesk Unified 
-ID to third party segment mappings that can now be queried at bid-time.
-
-Usage:
-
-Compile the audigent RTD module into your Prebid build:
-
-`gulp build --modules=userId,unifiedIdSystem,rtdModule,audigentRtdProvider,rubiconBidAdapter`
-
-Audigent segments will then be attached to each bid request objects in
-`bid.realTimeData.audigent_segments`
-
-The format of the segments is a per-SSP mapping:
-
-```
-{
-	'appnexus': ['anseg1', 'anseg2'],
-	'google': ['gseg1', 'gseg2']
-}
-```
-
-If a given SSP's API backend supports segment fields, they can then be
-attached prior to the bid request being sent:
-
-```
-pbjs.requestBids({bidsBackHandler: addAudigentSegments});
-
-function addAudigentSegments() {
-	for (i = 0; i < adUnits.length; i++) {
-		let adUnit = adUnits[i];
-		for (j = 0; j < adUnit.bids.length; j++) {
-			adUnit.bids[j].userId.lipb.segments = adUnit.bids[j].realTimeData.audigent_segments['rubicon'];
-		}
-	}
-}
-```
-
-To view an example of the segments returned by Audigent's backends:
-
-`gulp serve --modules=userId,unifiedIdSystem,rtdModule,audigentRtdProvider,rubiconBidAdapter`
-
-and then point your browser at:
-
-`http://localhost:9999/integrationExamples/gpt/audigentSegments_example.html`
-
-
diff --git a/modules/automatadBidAdapter.js b/modules/automatadBidAdapter.js
index 95d225cb5f7..415c52ba6d3 100644
--- a/modules/automatadBidAdapter.js
+++ b/modules/automatadBidAdapter.js
@@ -27,17 +27,20 @@ export const spec = {
     }
 
     const siteId = validBidRequests[0].params.siteId
-    const placementId = validBidRequests[0].params.placementId
 
-    const impressions = validBidRequests.map(bidRequest => ({
-      id: bidRequest.bidId,
-      banner: {
-        format: bidRequest.sizes.map(sizeArr => ({
-          w: sizeArr[0],
-          h: sizeArr[1],
-        }))
-      },
-    }))
+    const impressions = validBidRequests.map(bidRequest => {
+      return {
+        id: bidRequest.bidId,
+        adUnitCode: bidRequest.adUnitCode,
+        placement: bidRequest.params.placementId,
+        banner: {
+          format: bidRequest.sizes.map(sizeArr => ({
+            w: sizeArr[0],
+            h: sizeArr[1],
+          }))
+        },
+      }
+    })
 
     // params from bid request
     const openrtbRequest = {
@@ -45,7 +48,6 @@ export const spec = {
       imp: impressions,
       site: {
         id: siteId,
-        placement: placementId,
         domain: window.location.hostname,
         page: window.location.href,
         ref: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer || null : null,
@@ -69,20 +71,24 @@ export const spec = {
     const bidResponses = []
     const response = (serverResponse || {}).body
 
-    if (response && response.seatbid && response.seatbid.length === 1 && response.seatbid[0].bid && response.seatbid[0].bid.length) {
-      response.seatbid[0].bid.forEach(bid => {
-        bidResponses.push({
-          requestId: bid.impid,
-          cpm: bid.price,
-          ad: bid.adm,
-          adDomain: bid.adomain[0],
-          currency: DEFAULT_CURRENCY,
-          ttl: DEFAULT_BID_TTL,
-          creativeId: bid.crid,
-          width: bid.w,
-          height: bid.h,
-          netRevenue: DEFAULT_NET_REVENUE,
-          nurl: bid.nurl,
+    if (response && response.seatbid && response.seatbid[0].bid && response.seatbid[0].bid.length) {
+      response.seatbid.forEach(bidObj => {
+        bidObj.bid.forEach(bid => {
+          bidResponses.push({
+            requestId: bid.impid,
+            cpm: bid.price,
+            ad: bid.adm,
+            meta: {
+              advertiserDomains: bid.adomain
+            },
+            currency: DEFAULT_CURRENCY,
+            ttl: DEFAULT_BID_TTL,
+            creativeId: bid.crid,
+            width: bid.w,
+            height: bid.h,
+            netRevenue: DEFAULT_NET_REVENUE,
+            nurl: bid.nurl,
+          })
         })
       })
     } else {
diff --git a/modules/avocetBidAdapter.js b/modules/avocetBidAdapter.js
index 1163ac830ba..1283bb865d4 100644
--- a/modules/avocetBidAdapter.js
+++ b/modules/avocetBidAdapter.js
@@ -53,7 +53,7 @@ export const spec = {
     const publisherDomain = config.getConfig('publisherDomain');
 
     // First-party data from config
-    const fpd = config.getConfig('fpd');
+    const fpd = config.getLegacyFpd(config.getConfig('ortb2'));
 
     // GDPR status and TCF consent string
     let tcfConsentString;
@@ -77,8 +77,8 @@ export const spec = {
 
     // ID5 identifier
     let id5id;
-    if (bidRequests[0].userId && bidRequests[0].userId.id5id) {
-      id5id = bidRequests[0].userId.id5id;
+    if (bidRequests[0].userId && bidRequests[0].userId.id5id && bidRequests[0].userId.id5id.uid) {
+      id5id = bidRequests[0].userId.id5id.uid;
     }
 
     // Build the avocet ext object
diff --git a/modules/axonixBidAdapter.js b/modules/axonixBidAdapter.js
new file mode 100644
index 00000000000..daaac27e6a4
--- /dev/null
+++ b/modules/axonixBidAdapter.js
@@ -0,0 +1,185 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+
+const BIDDER_CODE = 'axonix';
+const BIDDER_VERSION = '1.0.2';
+
+const CURRENCY = 'USD';
+const DEFAULT_REGION = 'us-east-1';
+
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: CURRENCY,
+      mediaType: '*',
+      size: '*'
+    });
+  }
+
+  return floorInfo.floor || 0;
+}
+
+function getPageUrl(bidRequest, bidderRequest) {
+  let pageUrl = config.getConfig('pageUrl');
+
+  if (bidRequest.params.referrer) {
+    pageUrl = bidRequest.params.referrer;
+  } else if (!pageUrl) {
+    pageUrl = bidderRequest.refererInfo.referer;
+  }
+
+  return bidRequest.params.secure ? pageUrl.replace(/^http:/i, 'https:') : pageUrl;
+}
+
+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 getURL(params, path) {
+  let { supplyId, region, endpoint } = params;
+  let url;
+
+  if (endpoint) {
+    url = endpoint;
+  } else if (region) {
+    url = `https://openrtb-${region}.axonix.com/supply/${path}/${supplyId}`;
+  } else {
+    url = `https://openrtb-${DEFAULT_REGION}.axonix.com/supply/${path}/${supplyId}`
+  }
+
+  return url;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: function(bid) {
+    // video bid request validation
+    if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+      if (!bid.mediaTypes[VIDEO].hasOwnProperty('mimes') ||
+        !utils.isArray(bid.mediaTypes[VIDEO].mimes) ||
+        bid.mediaTypes[VIDEO].mimes.length === 0) {
+        utils.logError('mimes are mandatory for video bid request. Ad Unit: ', JSON.stringify(bid));
+
+        return false;
+      }
+    }
+
+    return !!(bid.params && bid.params.supplyId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    // device.connectiontype
+    let connection = window.navigator && (window.navigator.connection || window.navigator.mozConnection || window.navigator.webkitConnection)
+    let connectionType = 'unknown';
+    let effectiveType = '';
+
+    if (connection) {
+      if (connection.type) {
+        connectionType = connection.type;
+      }
+
+      if (connection.effectiveType) {
+        effectiveType = connection.effectiveType;
+      }
+    }
+
+    const requests = validBidRequests.map(validBidRequest => {
+      // app/site
+      let app;
+      let site;
+
+      if (typeof config.getConfig('app') === 'object') {
+        app = config.getConfig('app');
+      } else {
+        site = {
+          page: getPageUrl(validBidRequest, bidderRequest)
+        }
+      }
+
+      const data = {
+        app,
+        site,
+        validBidRequest,
+        connectionType,
+        effectiveType,
+        devicetype: isMobile() ? 1 : isConnectedTV() ? 3 : 2,
+        bidfloor: getBidFloor(validBidRequest),
+        dnt: (navigator.doNotTrack === 'yes' || navigator.doNotTrack === '1' || navigator.msDoNotTrack === '1') ? 1 : 0,
+        language: navigator.language,
+        prebidVersion: '$prebid.version$',
+        screenHeight: screen.height,
+        screenWidth: screen.width,
+        tmax: config.getConfig('bidderTimeout'),
+        ua: navigator.userAgent,
+      };
+
+      return {
+        method: 'POST',
+        url: getURL(validBidRequest.params, 'prebid'),
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        },
+        data
+      };
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse) {
+    const response = serverResponse ? serverResponse.body : [];
+
+    if (!utils.isArray(response)) {
+      return [];
+    }
+
+    const responses = [];
+
+    for (const resp of response) {
+      if (resp.requestId) {
+        responses.push(Object.assign(resp, {
+          ttl: config.getConfig('_bidderTimeout')
+        }));
+      }
+    }
+
+    return responses;
+  },
+
+  onTimeout: function(timeoutData) {
+    const params = utils.deepAccess(timeoutData, '0.params.0');
+
+    if (!utils.isEmpty(params)) {
+      ajax(getURL(params, 'prebid/timeout'), null, timeoutData[0], {
+        method: 'POST',
+        options: {
+          withCredentials: false,
+          contentType: 'application/json'
+        }
+      });
+    }
+  },
+
+  onBidWon: function(bid) {
+    const { nurl } = bid || {};
+
+    if (bid.nurl) {
+      utils.triggerPixel(utils.replaceAuctionPrice(nurl, bid.cpm));
+    };
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/axonixBidAdapter.md b/modules/axonixBidAdapter.md
new file mode 100644
index 00000000000..acbaae1d4b0
--- /dev/null
+++ b/modules/axonixBidAdapter.md
@@ -0,0 +1,140 @@
+# Overview
+
+```
+Module Name : Axonix Bidder Adapter
+Module Type : Bidder Adapter
+Maintainer  : support.axonix@emodoinc.com
+```
+
+# Description
+
+Module that connects to Axonix's exchange for bids.
+
+# Parameters
+
+| Name          | Scope    | Description                                     | Example                                |
+| :------------ | :------- | :---------------------------------------------- | :------------------------------------- |
+| `supplyId`    | required | Supply UUID                                     | `"2c426f78-bb18-4a16-abf4-62c6cd0ee8de"` |
+| `region`      | optional | Cloud region                                    | `"us-east-1"`                            |
+| `endpoint`    | optional | Supply custom endpoint                          | `"https://open-rtb.axonix.com/custom"`   |
+| `instl`       | optional | Set to 1 if using interstitial (default: 0)     | `1`   |
+
+# Test Parameters
+
+## Banner
+
+```javascript
+var bannerAdUnit = {
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Video
+
+```javascript
+var videoAdUnit = {
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Native
+
+```javascript
+var nativeAdUnit = {
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+};
+```
+
+## Multiformat
+
+```javascript
+var adUnits = [
+{
+  code: 'test-banner',
+  mediaTypes: {
+    banner: {
+      sizes: [[120, 600], [300, 250], [320, 50], [468, 60], [728, 90]]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-video',
+  mediaTypes: {
+    video: {
+      protocols: [1, 2, 3, 4, 5, 6, 7, 8]
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+},
+{
+  code: 'test-native',
+  mediaTypes: {
+    native: {
+
+    }
+  },
+  bids: [{
+    bidder: 'axonix',
+    params: {
+      supplyId: 'abc',
+      region: 'def',
+      endpoint: 'url'
+    }
+  }]
+}
+];
+```
diff --git a/modules/beachfrontBidAdapter.js b/modules/beachfrontBidAdapter.js
index 12e78c684ad..1bff77f29ce 100644
--- a/modules/beachfrontBidAdapter.js
+++ b/modules/beachfrontBidAdapter.js
@@ -6,17 +6,24 @@ import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import find from 'core-js-pure/features/array/find.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
-const ADAPTER_VERSION = '1.11';
+const ADAPTER_VERSION = '1.16';
 const ADAPTER_NAME = 'BFIO_PREBID';
 const OUTSTREAM = 'outstream';
+const CURRENCY = 'USD';
 
 export const VIDEO_ENDPOINT = 'https://reachms.bfmio.com/bid.json?exchange_id=';
 export const BANNER_ENDPOINT = 'https://display.bfmio.com/prebid_display';
 export const OUTSTREAM_SRC = 'https://player-cdn.beachfrontmedia.com/playerapi/loader/outstream.js';
 
-export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement'];
+export const VIDEO_TARGETING = ['mimes', 'playbackmethod', 'maxduration', 'placement', 'skip', 'skipmin', 'skipafter'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
 
+export const SUPPORTED_USER_IDS = [
+  { key: 'tdid', source: 'adserver.org', rtiPartner: 'TDID', queryParam: 'tdid' },
+  { key: 'idl_env', source: 'liveramp.com', rtiPartner: 'idl', queryParam: 'idl' },
+  { key: 'uid2.id', source: 'uidapi.com', rtiPartner: 'UID2', queryParam: 'uid2' }
+];
+
 let appId = '';
 
 export const spec = {
@@ -56,28 +63,39 @@ export const spec = {
     response = response.body;
 
     if (isVideoBid(bidRequest)) {
-      if (!response || !response.url || !response.bidPrice) {
+      if (!response || !response.bidPrice) {
         utils.logWarn(`No valid video bids from ${spec.code} bidder`);
         return [];
       }
       let sizes = getVideoSizes(bidRequest);
       let firstSize = getFirstSize(sizes);
       let context = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
-      return {
+      let responseType = getVideoBidParam(bidRequest, 'responseType') || 'both';
+      let responseMeta = Object.assign({ mediaType: VIDEO, advertiserDomains: [] }, response.meta);
+      let bidResponse = {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
-        vastUrl: response.url,
-        vastXml: response.vast,
         cpm: response.bidPrice,
         width: firstSize.w,
         height: firstSize.h,
         creativeId: response.crid || response.cmpId,
+        meta: responseMeta,
         renderer: context === OUTSTREAM ? createRenderer(bidRequest) : null,
         mediaType: VIDEO,
-        currency: 'USD',
+        currency: CURRENCY,
         netRevenue: true,
         ttl: 300
       };
+
+      if (responseType === 'nurl' || responseType === 'both') {
+        bidResponse.vastUrl = response.url;
+      }
+
+      if (responseType === 'adm' || responseType === 'both') {
+        bidResponse.vastXml = response.vast;
+      }
+
+      return bidResponse;
     } else {
       if (!response || !response.length) {
         utils.logWarn(`No valid banner bids from ${spec.code} bidder`);
@@ -87,6 +105,7 @@ export const spec = {
         .filter(bid => bid.adm)
         .map((bid) => {
           let request = find(bidRequest, req => req.adUnitCode === bid.slot);
+          let responseMeta = Object.assign({ mediaType: BANNER, advertiserDomains: [] }, bid.meta);
           return {
             requestId: request.bidId,
             bidderCode: spec.code,
@@ -95,8 +114,9 @@ export const spec = {
             cpm: bid.price,
             width: bid.w,
             height: bid.h,
+            meta: responseMeta,
             mediaType: BANNER,
-            currency: 'USD',
+            currency: CURRENCY,
             netRevenue: true,
             ttl: 300
           };
@@ -236,6 +256,16 @@ function getPlayerBidParam(bid, key, defaultValue) {
   return param === undefined ? defaultValue : param;
 }
 
+function getBannerBidFloor(bid) {
+  let floorInfo = utils.isFn(bid.getFloor) ? bid.getFloor({ currency: CURRENCY, mediaType: 'banner', size: '*' }) : {};
+  return floorInfo.floor || getBannerBidParam(bid, 'bidfloor');
+}
+
+function getVideoBidFloor(bid) {
+  let floorInfo = utils.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');
 }
@@ -257,13 +287,43 @@ function getTopWindowReferrer() {
   }
 }
 
+function getEids(bid) {
+  return SUPPORTED_USER_IDS
+    .map(getUserId(bid))
+    .filter(x => x);
+}
+
+function getUserId(bid) {
+  return ({ key, source, rtiPartner }) => {
+    let id = utils.deepAccess(bid, `userId.${key}`);
+    return id ? formatEid(id, source, rtiPartner) : null;
+  };
+}
+
+function formatEid(id, source, rtiPartner) {
+  return {
+    source,
+    uids: [{
+      id,
+      ext: { rtiPartner }
+    }]
+  };
+}
+
 function getVideoTargetingParams(bid) {
-  return Object.keys(Object(bid.params.video))
-    .filter(param => includes(VIDEO_TARGETING, param))
-    .reduce((obj, param) => {
-      obj[ param ] = bid.params.video[ param ];
-      return obj;
-    }, {});
+  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) {
@@ -271,9 +331,10 @@ function createVideoRequestData(bid, bidderRequest) {
   let firstSize = getFirstSize(sizes);
   let video = getVideoTargetingParams(bid);
   let appId = getVideoBidParam(bid, 'appId');
-  let bidfloor = getVideoBidParam(bid, 'bidfloor');
+  let bidfloor = getVideoBidFloor(bid);
   let tagid = getVideoBidParam(bid, 'tagid');
   let topLocation = getTopWindowLocation(bidderRequest);
+  let eids = getEids(bid);
   let payload = {
     isPrebid: true,
     appId: appId,
@@ -306,10 +367,13 @@ function createVideoRequestData(bid, bidderRequest) {
     regs: {
       ext: {}
     },
+    source: {
+      ext: {}
+    },
     user: {
       ext: {}
     },
-    cur: ['USD']
+    cur: [CURRENCY]
   };
 
   if (bidderRequest && bidderRequest.uspConsent) {
@@ -322,16 +386,12 @@ function createVideoRequestData(bid, bidderRequest) {
     payload.user.ext.consent = consentString;
   }
 
-  if (bid.userId && bid.userId.tdid) {
-    payload.user.ext.eids = [{
-      source: 'adserver.org',
-      uids: [{
-        id: bid.userId.tdid,
-        ext: {
-          rtiPartner: 'TDID'
-        }
-      }]
-    }];
+  if (bid.schain) {
+    payload.source.ext.schain = bid.schain;
+  }
+
+  if (eids.length > 0) {
+    payload.user.ext.eids = eids;
   }
 
   let connection = navigator.connection || navigator.webkitConnection;
@@ -349,7 +409,8 @@ function createBannerRequestData(bids, bidderRequest) {
     return {
       slot: bid.adUnitCode,
       id: getBannerBidParam(bid, 'appId'),
-      bidfloor: getBannerBidParam(bid, 'bidfloor'),
+      bidfloor: getBannerBidFloor(bid),
+      tagid: getBannerBidParam(bid, 'tagid'),
       sizes: getBannerSizes(bid)
     };
   });
@@ -378,10 +439,17 @@ function createBannerRequestData(bids, bidderRequest) {
     payload.gdprConsent = consentString;
   }
 
-  if (bids[0] && bids[0].userId && bids[0].userId.tdid) {
-    payload.tdid = bids[0].userId.tdid;
+  if (bids[0] && bids[0].schain) {
+    payload.schain = bids[0].schain;
   }
 
+  SUPPORTED_USER_IDS.forEach(({ key, queryParam }) => {
+    let id = utils.deepAccess(bids, `0.userId.${key}`)
+    if (id) {
+      payload[queryParam] = id;
+    }
+  });
+
   return payload;
 }
 
diff --git a/modules/beachfrontBidAdapter.md b/modules/beachfrontBidAdapter.md
index 0a6b8b73da4..9de415f8fc5 100644
--- a/modules/beachfrontBidAdapter.md
+++ b/modules/beachfrontBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: Beachfront Bid Adapter
 
 Module Type: Bidder Adapter
 
-Maintainer: john@beachfront.com
+Maintainer: prebid@beachfront.com
 
 # Description
 
@@ -18,7 +18,8 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'instream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [640, 360],
+                    mimes: ['video/mp4', 'application/javascript']
                 }
             },
             bids: [
@@ -26,10 +27,7 @@ Module that connects to Beachfront's demand sources
                     bidder: 'beachfront',
                     params: {
                         bidfloor: 0.01,
-                        appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                        video: {
-                            mimes: [ 'video/mp4', 'application/javascript' ]
-                        }
+                        appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76'
                     }
                 }
             ]
@@ -37,7 +35,7 @@ Module that connects to Beachfront's demand sources
             code: 'test-banner',
             mediaTypes: {
                 banner: {
-                    sizes: [ 300, 250 ]
+                    sizes: [300, 250]
                 }
             },
             bids: [
@@ -61,10 +59,11 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'outstream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [640, 360],
+                    mimes: ['video/mp4', 'application/javascript']
                 },
                 banner: {
-                    sizes: [ 300, 250 ]
+                    sizes: [300, 250]
                 }
             },
             bids: [
@@ -74,7 +73,6 @@ Module that connects to Beachfront's demand sources
                         video: {
                             bidfloor: 0.01,
                             appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                            mimes: [ 'video/mp4', 'application/javascript' ]
                         },
                         banner: {
                             bidfloor: 0.01,
@@ -95,7 +93,8 @@ Module that connects to Beachfront's demand sources
             mediaTypes: {
                 video: {
                     context: 'outstream',
-                    playerSize: [ 640, 360 ]
+                    playerSize: [ 640, 360 ],
+                    mimes: ['video/mp4', 'application/javascript']
                 }
             },
             bids: [
@@ -104,8 +103,7 @@ Module that connects to Beachfront's demand sources
                     params: {
                         video: {
                             bidfloor: 0.01,
-                            appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-                            mimes: [ 'video/mp4', 'application/javascript' ]
+                            appId: '11bc5dd5-7421-4dd8-c926-40fa653bec76'
                         },
                         player: {
                             progressColor: '#50A8FA',
diff --git a/modules/betweenBidAdapter.js b/modules/betweenBidAdapter.js
index c435a5a993e..5a351def958 100644
--- a/modules/betweenBidAdapter.js
+++ b/modules/betweenBidAdapter.js
@@ -1,6 +1,9 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import { getAdUnitSizes, parseSizesInput } from '../src/utils.js';
+import { getAdUnitSizes, parseSizesInput, deepAccess } from '../src/utils.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+
 const BIDDER_CODE = 'between';
+const ENDPOINT = 'https://ads.betweendigital.com/adjson?t=prebid';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -24,15 +27,18 @@ export const spec = {
   buildRequests: function(validBidRequests, bidderRequest) {
     let requests = [];
     const gdprConsent = bidderRequest && bidderRequest.gdprConsent;
+    const refInfo = getRefererInfo();
 
     validBidRequests.forEach(i => {
       let params = {
-        sizes: parseSizesInput(getAdUnitSizes(i)).join('%2C'),
+        sizes: parseSizesInput(getAdUnitSizes(i)),
         jst: 'hb',
         ord: Math.random() * 10000000000000000,
         tz: getTz(),
         fl: getFl(),
         rr: getRr(),
+        shid: getSharedId(i)('id'),
+        shid3: getSharedId(i)('third'),
         s: i.params.s,
         bidid: i.bidId,
         transactionid: i.transactionId,
@@ -56,6 +62,12 @@ export const spec = {
         }
       }
 
+      if (i.schain) {
+        params.schain = encodeToBase64WebSafe(JSON.stringify(i.schain));
+      }
+
+      if (refInfo && refInfo.referer) params.ref = refInfo.referer;
+
       if (gdprConsent) {
         if (typeof gdprConsent.gdprApplies !== 'undefined') {
           params.gdprApplies = !!gdprConsent.gdprApplies;
@@ -65,9 +77,14 @@ export const spec = {
         }
       }
 
-      requests.push({method: 'GET', url: 'https://ads.betweendigital.com/adjson', data: params})
+      requests.push({data: params})
     })
-    return requests;
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(requests)
+    }
+    // return requests;
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -87,7 +104,10 @@ export const spec = {
         creativeId: serverResponse.body[i].creativeid,
         currency: serverResponse.body[i].currency || 'RUB',
         netRevenue: serverResponse.body[i].netRevenue || true,
-        ad: serverResponse.body[i].ad
+        ad: serverResponse.body[i].ad,
+        meta: {
+          advertiserDomains: serverResponse.body[i].adomain ? serverResponse.body[i].adomain : []
+        }
       };
       bidResponses.push(bidResponse);
     }
@@ -129,6 +149,15 @@ export const spec = {
   }
 }
 
+function getSharedId(bid) {
+  const id = deepAccess(bid, 'userId.sharedid.id');
+  const third = deepAccess(bid, 'userId.sharedid.third');
+  return function(kind) {
+    if (kind === 'id') return id || '';
+    return third || '';
+  }
+}
+
 function getRr() {
   try {
     var td = top.document;
@@ -161,6 +190,10 @@ function getTz() {
   return new Date().getTimezoneOffset();
 }
 
+function encodeToBase64WebSafe(string) {
+  return btoa(string).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
+}
+
 /*
 function get_pubdata(adds) {
   if (adds !== undefined && adds.pubdata !== undefined) {
diff --git a/modules/bidViewability.js b/modules/bidViewability.js
new file mode 100644
index 00000000000..c3b72cda8d4
--- /dev/null
+++ b/modules/bidViewability.js
@@ -0,0 +1,97 @@
+// This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Bidders and Analytics adapters
+// GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent
+// Does not work with other than GPT integration
+
+import { config } from '../src/config.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.json';
+import { logWarn, isFn, triggerPixel } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import adapterManager, { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const MODULE_NAME = 'bidViewability';
+const CONFIG_ENABLED = 'enabled';
+const CONFIG_FIRE_PIXELS = 'firePixels';
+const CONFIG_CUSTOM_MATCH = 'customMatchFunction';
+const BID_VURL_ARRAY = 'vurls';
+const GPT_IMPRESSION_VIEWABLE_EVENT = 'impressionViewable';
+
+export let isBidAdUnitCodeMatchingSlot = (bid, slot) => {
+  return (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode);
+}
+
+export let getMatchingWinningBidForGPTSlot = (globalModuleConfig, slot) => {
+  return find(getGlobal().getAllWinningBids(),
+    // supports custom match function from config
+    bid => isFn(globalModuleConfig[CONFIG_CUSTOM_MATCH])
+      ? globalModuleConfig[CONFIG_CUSTOM_MATCH](bid, slot)
+      : isBidAdUnitCodeMatchingSlot(bid, slot)
+  ) || null;
+};
+
+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; }
+    }
+
+    const uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
+    bid[BID_VURL_ARRAY].forEach(url => {
+      // add '?' if not present in URL
+      if (Object.keys(queryParams).length > 0 && url.indexOf('?') === -1) {
+        url += '?';
+      }
+      // append all query params, `&key=urlEncoded(value)`
+      url += Object.keys(queryParams).reduce((prev, key) => prev += `&${key}=${encodeURIComponent(queryParams[key])}`, '');
+      triggerPixel(url)
+    });
+  }
+};
+
+export let logWinningBidNotFound = (slot) => {
+  logWarn(`bid details could not be found for ${slot.getSlotElementId()}, probable reasons: a non-prebid bid is served OR check the prebid.AdUnit.code to GPT.AdSlot relation.`);
+};
+
+export let impressionViewableHandler = (globalModuleConfig, slot, event) => {
+  let respectiveBid = getMatchingWinningBidForGPTSlot(globalModuleConfig, slot);
+  if (respectiveBid === null) {
+    logWinningBidNotFound(slot);
+  } else {
+    // if config is enabled AND VURL array is present then execute each pixel
+    fireViewabilityPixels(globalModuleConfig, respectiveBid);
+    // trigger respective bidder's onBidViewable handler
+    adapterManager.callBidViewableBidder(respectiveBid.bidder, respectiveBid);
+    // emit the BID_VIEWABLE event with bid details, this event can be consumed by bidders and analytics pixels
+    events.emit(EVENTS.BID_VIEWABLE, respectiveBid);
+  }
+};
+
+export let 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
+    // this way we are adding a way for bidders to know (using pbjs.getConfig('bidViewability').enabled === true) whether this module is added in build and is enabled
+    if (globalModuleConfig[CONFIG_ENABLED] !== true) {
+      return;
+    }
+    // add the GPT event listener
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    window.googletag.cmd.push(() => {
+      window.googletag.pubads().addEventListener(GPT_IMPRESSION_VIEWABLE_EVENT, function(event) {
+        impressionViewableHandler(globalModuleConfig, event.slot, event);
+      });
+    });
+  });
+}
+
+init()
diff --git a/modules/bidViewability.md b/modules/bidViewability.md
new file mode 100644
index 00000000000..78a1539fb1a
--- /dev/null
+++ b/modules/bidViewability.md
@@ -0,0 +1,49 @@
+# Overview
+
+Module Name: bidViewability
+
+Purpose: Track when a bid is viewable
+
+Maintainer: harshad.mane@pubmatic.com
+
+# Description
+- This module, when included, will trigger a BID_VIEWABLE event which can be consumed by Analytics adapters, bidders will need to implement `onBidViewable` method to capture this event
+- Bidderes can check if this module is part of the final build and whether it is enabled or not by accessing ```pbjs.getConfig('bidViewability')```
+- GPT API is used to find when a bid is viewable, https://developers.google.com/publisher-tag/reference#googletag.events.impressionviewableevent . This event is fired when an impression becomes viewable, according to the Active View criteria.
+Refer: https://support.google.com/admanager/answer/4524488
+- The module does not work with adserver other than GAM with GPT integration
+- Logic used to find a matching pbjs-bid for a GPT slot is ``` (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) ``` this logic can be changed by using param ```customMatchFunction```
+- When a rendered PBJS bid is viewable the module will trigger BID_VIEWABLE event, which can be consumed by bidders and analytics adapters
+- For the viewable bid if ```bid.vurls type array``` param is and module config ``` firePixels: true ``` is set then the URLs mentioned in bid.vurls will be executed. Please note that GDPR and USP related parameters will be added to the given URLs
+
+# Params
+- enabled [required] [type: boolean, default: false], when set to true, the module will emit BID_VIEWABLE when applicable
+- firePixels [optional] [type: boolean], when set to true, will fire the urls mentioned in bid.vurls which should be array of urls
+- customMatchFunction [optional] [type: function(bid, slot)], when passed this function will be used to `find` the matching winning bid for the GPT slot. Default value is ` (bid, slot) => (slot.getAdUnitPath() === bid.adUnitCode || slot.getSlotElementId() === bid.adUnitCode) `
+
+# Example of consuming BID_VIEWABLE event
+```
+	pbjs.onEvent('bidViewable', function(bid){
+		console.log('got bid details in bidViewable event', bid);
+	});
+
+```
+
+# Example of using config
+```
+	pbjs.setConfig({
+        bidViewability: {
+            enabled: true,
+            firePixels: true,
+            customMatchFunction: function(bid, slot){
+                console.log('using custom match function....');
+                return bid.adUnitCode === slot.getAdUnitPath();
+            }
+        }
+    });
+```
+
+# Please Note:
+- Doesn't seems to work with Instream Video, https://docs.prebid.org/dev-docs/examples/instream-banner-mix.html as GPT's impressionViewable event is not triggered for instream-video-creative
+- Works with Banner, Outsteam, Native creatives
+
diff --git a/modules/bidglassBidAdapter.js b/modules/bidglassBidAdapter.js
index 6db35f184ca..b77ca474e13 100644
--- a/modules/bidglassBidAdapter.js
+++ b/modules/bidglassBidAdapter.js
@@ -46,7 +46,7 @@ export const spec = {
       return window === window.top ? window.location.href : window.parent === window.top ? document.referrer : null;
     };
     let getOrigins = function() {
-      var ori = ['https://' + window.location.hostname];
+      var ori = [window.location.protocol + '//' + window.location.hostname];
 
       if (window.location.ancestorOrigins) {
         for (var i = 0; i < window.location.ancestorOrigins.length; i++) {
@@ -56,7 +56,7 @@ export const spec = {
         // Derive the parent origin
         var parts = document.referrer.split('/');
 
-        ori.push('https://' + parts[2]);
+        ori.push(parts[0] + '//' + parts[2]);
 
         if (window.parent !== window.top) {
           // Additional unknown origins exist
@@ -67,15 +67,30 @@ export const spec = {
       return ori;
     };
 
+    let bidglass = window['bidglass'];
+
     utils._each(validBidRequests, function(bid) {
       bid.sizes = ((utils.isArray(bid.sizes) && utils.isArray(bid.sizes[0])) ? bid.sizes : [bid.sizes]);
       bid.sizes = bid.sizes.filter(size => utils.isArray(size));
 
-      // Stuff to send: [bid id, sizes, adUnitId]
+      var adUnitId = utils.getBidIdParameter('adUnitId', bid.params);
+      var options = utils.deepClone(bid.params);
+
+      delete options.adUnitId;
+
+      // Merge externally set targeting params
+      if (typeof bidglass === 'object' && bidglass.getTargeting) {
+        let targeting = bidglass.getTargeting(adUnitId, options.targeting);
+
+        if (targeting && Object.keys(targeting).length > 0) options.targeting = targeting;
+      }
+
+      // Stuff to send: [bid id, sizes, adUnitId, options]
       imps.push({
         bidId: bid.bidId,
         sizes: bid.sizes,
-        adUnitId: utils.getBidIdParameter('adUnitId', bid.params)
+        adUnitId: adUnitId,
+        options: options
       });
     });
 
@@ -110,20 +125,31 @@ export const spec = {
   interpretResponse: function(serverResponse) {
     const bidResponses = [];
 
-    utils._each(serverResponse.body.bidResponses, function(bid) {
-      bidResponses.push({
-        requestId: bid.requestId,
-        cpm: parseFloat(bid.cpm),
-        width: parseInt(bid.width, 10),
-        height: parseInt(bid.height, 10),
-        creativeId: bid.creativeId,
-        dealId: bid.dealId || null,
-        currency: bid.currency || 'USD',
-        mediaType: bid.mediaType || 'banner',
+    utils._each(serverResponse.body.bidResponses, function(serverBid) {
+      const bidResponse = {
+        requestId: serverBid.requestId,
+        cpm: parseFloat(serverBid.cpm),
+        width: parseInt(serverBid.width, 10),
+        height: parseInt(serverBid.height, 10),
+        creativeId: serverBid.creativeId,
+        dealId: serverBid.dealId || null,
+        currency: serverBid.currency || 'USD',
+        mediaType: serverBid.mediaType || 'banner',
         netRevenue: true,
-        ttl: bid.ttl || 10,
-        ad: bid.ad
-      });
+        ttl: serverBid.ttl || 10,
+        ad: serverBid.ad,
+        meta: {}
+      };
+
+      if (serverBid.meta) {
+        let meta = serverBid.meta;
+
+        if (meta.advertiserDomains && meta.advertiserDomains.length) {
+          bidResponse.meta.advertiserDomains = meta.advertiserDomains;
+        }
+      }
+
+      bidResponses.push(bidResponse);
     });
 
     return bidResponses;
diff --git a/modules/bidscubeBidAdapter.js b/modules/bidscubeBidAdapter.js
new file mode 100644
index 00000000000..d3f27a5ac6d
--- /dev/null
+++ b/modules/bidscubeBidAdapter.js
@@ -0,0 +1,90 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
+import * as utils from '../src/utils.js'
+
+const BIDDER_CODE = 'bidscube'
+const URL = 'https://supply.bidscube.com/?c=o&m=multi'
+const URL_SYNC = 'https://supply.bidscube.com/?c=o&m=cookie'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: function (opts) {
+    return Boolean(opts.bidId && opts.params && !isNaN(parseInt(opts.params.placementId)))
+  },
+
+  buildRequests: function (validBidRequests) {
+    validBidRequests = validBidRequests || []
+    let winTop = window
+    try {
+      window.top.location.toString()
+      winTop = window.top
+    } catch (e) { utils.logMessage(e) }
+
+    const location = utils.getWindowLocation()
+    const placements = []
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const p = validBidRequests[i]
+
+      placements.push({
+        placementId: p.params.placementId,
+        bidId: p.bidId,
+        traffic: p.params.traffic || BANNER,
+        allParams: JSON.stringify(p)
+      })
+    }
+
+    return {
+      method: 'POST',
+      url: URL,
+      data: {
+        deviceWidth: winTop.screen.width,
+        deviceHeight: winTop.screen.height,
+        language: (navigator && navigator.language) ? navigator.language : '',
+        secure: +(location.protocol === 'https:'),
+        host: location.hostname,
+        page: location.pathname,
+        placements: placements
+      }
+    }
+  },
+
+  interpretResponse: function (opts) {
+    const body = opts.body
+    const response = []
+
+    for (let i = 0; i < body.length; i++) {
+      const item = body[i]
+      if (isBidResponseValid(item)) {
+        response.push(item)
+      }
+    }
+
+    return response
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    return [{ type: 'image', url: URL_SYNC }]
+  }
+}
+
+registerBidder(spec)
+
+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.title && bid.image && bid.impressionTrackers)
+    default:
+      return false
+  }
+}
diff --git a/modules/bidscubeBidAdapter.md b/modules/bidscubeBidAdapter.md
new file mode 100644
index 00000000000..5f3972726ec
--- /dev/null
+++ b/modules/bidscubeBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: BidsCube Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: publishers@bidscube.com
+```
+
+# Description
+
+Module that connects to BidsCube' demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: 'placementId_0',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'bidscube',
+            params: {
+                placementId: 0,
+                traffic: 'banner'
+            }
+        }]
+    }];
+```
diff --git a/modules/bizzclickBidAdapter.js b/modules/bizzclickBidAdapter.js
new file mode 100644
index 00000000000..2af9a7afed2
--- /dev/null
+++ b/modules/bizzclickBidAdapter.js
@@ -0,0 +1,326 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import {config} from '../src/config.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) => {
+    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.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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: utils.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.transactionId
+        },
+        regs: {
+          coppa: config.getConfig('coppa') === true ? 1 : 0,
+          ext: {}
+        },
+        user: {
+          ext: {}
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+      if (bidRequest) {
+        if (bidRequest.gdprConsent && bidRequest.gdprConsent.gdprApplies) {
+          utils.deepSetValue(data, 'regs.ext.gdpr', bidRequest.gdprConsent.gdprApplies ? 1 : 0);
+          utils.deepSetValue(data, 'user.ext.consent', bidRequest.gdprConsent.consentString);
+        }
+
+        if (bidRequest.uspConsent !== undefined) {
+          utils.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
+      };
+
+      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 utils.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 = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+
+  const assets = utils._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(utils.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 {
+    utils.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
index 7dfa458b34c..6fc1bebf546 100644
--- a/modules/bizzclickBidAdapter.md
+++ b/modules/bizzclickBidAdapter.md
@@ -14,14 +14,91 @@ Module that connects to BizzClick SSP demand sources
 ```
     var adUnits = [{
                 code: 'placementId',
-                sizes: [[300, 250]],
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
                 bids: [{
                         bidder: 'bizzclick',
                         params: {
-                            placementId: 0,
-                            type: 'banner'
+                            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/bluebillywigBidAdapter.js b/modules/bluebillywigBidAdapter.js
index 4d40d931e1d..3d4eeb058b3 100644
--- a/modules/bluebillywigBidAdapter.js
+++ b/modules/bluebillywigBidAdapter.js
@@ -1,4 +1,5 @@
 import * as utils from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
@@ -7,7 +8,7 @@ import { createEidsArray } from './userId/eids.js';
 
 const DEV_MODE = window.location.search.match(/bbpbs_debug=true/);
 
-// Blue Billywig Constants
+// Blue Billywig  Constants
 const BB_CONSTANTS = {
   BIDDER_CODE: 'bluebillywig',
   AUCTION_URL: '$$URL_STARTpbs.bluebillywig.com/openrtb2/auction?pub=$$PUBLICATION',
@@ -17,17 +18,18 @@ const BB_CONSTANTS = {
   DEFAULT_TTL: 300,
   DEFAULT_WIDTH: 768,
   DEFAULT_HEIGHT: 432,
-  DEFAULT_NET_REVENUE: true
+  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
-export const BB_HELPERS = {
+const BB_HELPERS = {
   addSiteAppDevice: function(request, pageUrl) {
-    if (!request) return;
-
     if (typeof getConfig('app') === 'object') request.app = getConfig('app');
     else {
       request.site = {};
@@ -41,21 +43,15 @@ export const BB_HELPERS = {
     if (!request.device.h) request.device.h = window.innerHeight;
   },
   addSchain: function(request, validBidRequests) {
-    if (!request) return;
-
     const schain = utils.deepAccess(validBidRequests, '0.schain');
     if (schain) request.source.ext = { schain: schain };
   },
   addCurrency: function(request) {
-    if (!request) return;
-
     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) {
-    if (!request) return;
-
     const bidUserId = utils.deepAccess(validBidRequests, '0.userId');
     const eids = createEidsArray(bidUserId);
 
@@ -63,10 +59,6 @@ export const BB_HELPERS = {
       utils.deepSetValue(request, 'user.ext.eids', eids);
     }
   },
-  addDigiTrust: function(request, bidRequests) {
-    const digiTrust = BB_HELPERS.getDigiTrustParams(bidRequests && bidRequests[0]);
-    if (digiTrust) utils.deepSetValue(request, 'user.ext.digitrust', digiTrust);
-  },
   substituteUrl: function (url, publication, renderer) {
     return url.replace('$$URL_START', (DEV_MODE) ? 'https://dev.' : 'https://').replace('$$PUBLICATION', publication).replace('$$RENDERER', renderer);
   },
@@ -79,41 +71,60 @@ export const BB_HELPERS = {
   getRendererUrl: function(publication, renderer) {
     return BB_HELPERS.substituteUrl(BB_CONSTANTS.RENDERER_URL, publication, renderer);
   },
-  getDigiTrustParams: function(bidRequest) {
-    const digiTrustId = BB_HELPERS.getDigiTrustId(bidRequest);
+  transformVideoParams: function(videoParams, videoParamsExt) {
+    videoParams = utils.deepClone(videoParams);
 
-    if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) return null;
-    return {
-      id: digiTrustId.id,
-      keyv: digiTrustId.keyv
-    }
-  },
-  getDigiTrustId: function(bidRequest) {
-    const bidRequestDigiTrust = utils.deepAccess(bidRequest, 'userId.digitrustid.data');
-    if (bidRequestDigiTrust) return bidRequestDigiTrust;
+    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;
 
-    const digiTrustUser = getConfig('digiTrustId');
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
+    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) {
-    bid.cpm = bid.price; delete bid.price;
-    bid.bidId = bid.impid;
-    bid.requestId = bid.impid; delete bid.impid;
-    bid.width = bid.w || BB_CONSTANTS.DEFAULT_WIDTH;
-    bid.height = bid.h || BB_CONSTANTS.DEFAULT_HEIGHT;
+    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 = utils.deepAccess(bid, 'ext.prebid.targeting');
+    const extPrebidCache = utils.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) {
-      bid.ad = bid.adm;
-      bid.vastXml = bid.adm;
-      delete bid.adm;
+      bidObject.ad = bid.adm;
+      bidObject.vastXml = bid.adm;
     }
-    if (bid.nurl && !bid.adm) { // ad markup is on win notice url, and adm is ommited according to OpenRTB 2.5
-      bid.vastUrl = bid.nurl;
-      delete bid.nurl;
+    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;
     }
-    bid.netRevenue = BB_CONSTANTS.DEFAULT_NET_REVENUE;
-    bid.creativeId = bid.crid; delete bid.crid;
-    bid.currency = serverResponse.cur;
-    bid.ttl = BB_CONSTANTS.DEFAULT_TTL;
+    bidObject.meta = bid.meta || {};
+    if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
+    return bidObject;
   },
 };
 
@@ -132,20 +143,16 @@ const BB_RENDERER = {
       return;
     }
 
-    const rendererId = BB_RENDERER.getRendererId(bid.publicationName, bid.rendererCode);
+    if (!(window.bluebillywig && window.bluebillywig.renderers)) {
+      utils.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);
 
-    let renderer;
-
-    for (let rendererIndex = 0; rendererIndex < window.bluebillywig.renderers.length; rendererIndex++) {
-      if (window.bluebillywig.renderers[rendererIndex]._id === rendererId) {
-        renderer = window.bluebillywig.renderers[rendererIndex];
-        break;
-      }
-    }
-
-    if (renderer) renderer.bootstrap(config, ele);
+    if (renderer) renderer.bootstrap(config, ele, bid.rendererSettings || {});
     else utils.logWarn(`${BB_CONSTANTS.BIDDER_CODE}: Couldn't find a renderer with ${rendererId}`);
   },
   newRenderer: function(rendererUrl, adUnitCode) {
@@ -212,9 +219,8 @@ export const spec = {
         utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: connections is not of type array. Rejecting bid: `, bid);
         return false;
       } else {
-        for (let connectionIndex = 0; connectionIndex < bid.params.connections.length; connectionIndex++) {
-          const connection = bid.params.connections[connectionIndex];
-          if (!bid.params.hasOwnProperty(connection)) {
+        for (let i = 0; i < bid.params.connections.length; i++) {
+          if (!bid.params.hasOwnProperty(bid.params.connections[i])) {
             utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: connection specified in params.connections, but not configured in params. Rejecting bid: `, bid);
             return false;
           }
@@ -225,6 +231,16 @@ export const spec = {
       return false;
     }
 
+    if (bid.params.hasOwnProperty('video') && (bid.params.video === null || typeof bid.params.video !== 'object')) {
+      utils.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')) {
+      utils.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')) {
         utils.logError(`${BB_CONSTANTS.BIDDER_CODE}: no context specified in bid. Rejecting bid: `, bid);
@@ -245,20 +261,21 @@ export const spec = {
   buildRequests(validBidRequests, bidderRequest) {
     const imps = [];
 
-    for (let validBidRequestIndex = 0; validBidRequestIndex < validBidRequests.length; validBidRequestIndex++) {
-      const validBidRequest = validBidRequests[validBidRequestIndex];
-      const _this = this;
+    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(function(extBuilder, connection) {
+      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);
+        if (this.syncStore.bidders.indexOf(connection) === -1) this.syncStore.bidders.push(connection);
 
         return extBuilder;
       }, {});
 
-      imps.push({ id: validBidRequest.bidId, ext, secure: window.location.protocol === 'https' ? 1 : 0, video: utils.deepAccess(validBidRequest, 'mediaTypes.video') });
-    }
+      const videoParams = BB_HELPERS.transformVideoParams(utils.deepAccess(validBidRequest, 'mediaTypes.video'), utils.deepAccess(validBidRequest, 'params.video'));
+      imps.push({ id: validBidRequest.bidId, ext, secure: window.location.protocol === 'https' ? 1 : 0, video: videoParams });
+    });
 
     const request = {
       id: bidderRequest.auctionId,
@@ -293,7 +310,6 @@ export const spec = {
     BB_HELPERS.addSchain(request, validBidRequests);
     BB_HELPERS.addCurrency(request);
     BB_HELPERS.addUserIds(request, validBidRequests);
-    BB_HELPERS.addDigiTrust(request, validBidRequests);
 
     return {
       method: 'POST',
@@ -311,74 +327,44 @@ export const spec = {
 
     const bids = [];
 
-    for (let seatbidIndex = 0; seatbidIndex < serverResponse.seatbid.length; seatbidIndex++) {
-      const seatbid = serverResponse.seatbid[seatbidIndex];
-      if (!seatbid.bid || !Array.isArray(seatbid.bid)) continue;
-      for (let bidIndex = 0; bidIndex < seatbid.bid.length; bidIndex++) {
-        const bid = seatbid.bid[bidIndex];
-        BB_HELPERS.transformRTBToPrebidProps(bid, serverResponse);
-
-        let bidParams;
-        for (let bidderRequestBidsIndex = 0; bidderRequestBidsIndex < request.bidderRequest.bids.length; bidderRequestBidsIndex++) {
-          if (request.bidderRequest.bids[bidderRequestBidsIndex].bidId === bid.bidId) {
-            bidParams = request.bidderRequest.bids[bidderRequestBidsIndex].params;
-          }
-        }
+    serverResponse.seatbid.forEach(seatbid => {
+      if (!seatbid.bid || !Array.isArray(seatbid.bid)) return;
+      seatbid.bid.forEach(bid => {
+        bid = BB_HELPERS.transformRTBToPrebidProps(bid, serverResponse);
 
-        if (bidParams) {
-          bid.publicationName = bidParams.publicationName;
-          bid.rendererCode = bidParams.rendererCode;
-          bid.accountId = bidParams.accountId;
-        }
+        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 (!serverResponses || !serverResponses.length) return [];
     if (!syncOptions.iframeEnabled) return [];
 
     const queryString = [];
-    let accountId;
-    let publication;
-
-    const serverResponse = serverResponses[0];
-    if (!serverResponse.body || !serverResponse.body.seatbid) return [];
-
-    for (let seatbidIndex = 0; seatbidIndex < serverResponse.body.seatbid.length; seatbidIndex++) {
-      const seatbid = serverResponse.body.seatbid[seatbidIndex];
-      for (let bidIndex = 0; bidIndex < seatbid.bid.length; bidIndex++) {
-        const bid = seatbid.bid[bidIndex];
-        accountId = bid.accountId || null;
-        publication = bid.publicationName || null;
-
-        if (publication && accountId) break;
-      }
-      if (publication && accountId) break;
-    }
-
-    if (!publication || !accountId) return [];
 
     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=${accountId}`);
+    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(publication)}&${queryString.join('&')}`;
+    const syncUrl = `${BB_HELPERS.getSyncUrl(this.syncStore.publicationName)}&${queryString.join('&')}`;
 
     return [{
       type: 'iframe',
diff --git a/modules/boldwinBidAdapter.js b/modules/boldwinBidAdapter.js
new file mode 100644
index 00000000000..04f4085ba24
--- /dev/null
+++ b/modules/boldwinBidAdapter.js
@@ -0,0 +1,110 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'boldwin';
+const AD_URL = 'https://ssp.videowalldirect.com/?c=o&m=multi';
+const SYNC_URL = 'https://cs.videowalldirect.com/?c=o&m=cookie'
+
+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;
+  }
+}
+
+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) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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];
+      let sizes
+      if (bid.mediaTypes) {
+        if (bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+          sizes = bid.mediaTypes[BANNER].sizes
+        } else if (bid.mediaTypes[VIDEO] && bid.mediaTypes[VIDEO].playerSize) {
+          sizes = bid.mediaTypes[VIDEO].playerSize
+        }
+      }
+      placements.push({
+        placementId: bid.params.placementId,
+        bidId: bid.bidId,
+        sizes: sizes || [],
+        wPlayer: sizes ? sizes[0] : 0,
+        hPlayer: sizes ? sizes[1] : 0,
+        traffic: bid.params.traffic || BANNER,
+        schain: bid.schain || {}
+      });
+    }
+    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: () => {
+    return [{
+      type: 'image',
+      url: SYNC_URL
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/boldwinBidAdapter.md b/modules/boldwinBidAdapter.md
new file mode 100644
index 00000000000..4bf272c4de3
--- /dev/null
+++ b/modules/boldwinBidAdapter.md
@@ -0,0 +1,53 @@
+# Overview
+
+```
+Module Name: boldwin Bidder Adapter
+Module Type: boldwin Bidder Adapter
+```
+
+# Description
+
+Module that connects to boldwin demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'placementId_0',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'boldwin',
+                            params: {
+                                placementId: 0,
+                                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: 'boldwin',
+                            params: {
+                                placementId: 0,
+                                traffic: 'video'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/bridgewellBidAdapter.js b/modules/bridgewellBidAdapter.js
index 0303e4f74bd..2034a59242e 100644
--- a/modules/bridgewellBidAdapter.js
+++ b/modules/bridgewellBidAdapter.js
@@ -4,8 +4,8 @@ import { BANNER, NATIVE } from '../src/mediaTypes.js';
 import find from 'core-js-pure/features/array/find.js';
 
 const BIDDER_CODE = 'bridgewell';
-const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=' + Math.random();
-const BIDDER_VERSION = '0.0.2';
+const REQUEST_ENDPOINT = 'https://prebid.scupio.com/recweb/prebid.aspx?cb=';
+const BIDDER_VERSION = '1.1.0';
 
 export const spec = {
   code: BIDDER_CODE,
@@ -19,11 +19,13 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     let valid = false;
-
-    if (bid && bid.params && bid.params.ChannelID) {
-      valid = true;
+    if (bid && bid.params) {
+      if ((bid.params.cid) && (typeof bid.params.cid === 'number')) {
+        valid = true;
+      } else if (bid.params.ChannelID) {
+        valid = true;
+      }
     }
-
     return valid;
   },
 
@@ -35,16 +37,37 @@ export const spec = {
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     const adUnits = [];
+    var bidderUrl = REQUEST_ENDPOINT + Math.random();
+    var userIds;
+
     utils._each(validBidRequests, function (bid) {
-      adUnits.push({
-        ChannelID: bid.params.ChannelID,
-        adUnitCode: bid.adUnitCode,
-        mediaTypes: bid.mediaTypes || {
-          banner: {
-            sizes: bid.sizes
-          }
-        }
-      });
+      userIds = bid.userId;
+
+      if (bid.params.cid) {
+        adUnits.push({
+          cid: bid.params.cid,
+          adUnitCode: bid.adUnitCode,
+          requestId: bid.bidId,
+          mediaTypes: bid.mediaTypes || {
+            banner: {
+              sizes: bid.sizes
+            }
+          },
+          userIds: userIds || {}
+        });
+      } else {
+        adUnits.push({
+          ChannelID: bid.params.ChannelID,
+          adUnitCode: bid.adUnitCode,
+          requestId: bid.bidId,
+          mediaTypes: bid.mediaTypes || {
+            banner: {
+              sizes: bid.sizes
+            }
+          },
+          userIds: userIds || {}
+        });
+      }
     });
 
     let topUrl = '';
@@ -54,7 +77,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: REQUEST_ENDPOINT,
+      url: bidderUrl,
       data: {
         version: {
           prebid: '$prebid.version$',
@@ -63,7 +86,8 @@ export const spec = {
         inIframe: utils.inIframe(),
         url: topUrl,
         referrer: getTopWindowReferrer(),
-        adUnits: adUnits
+        adUnits: adUnits,
+        refererInfo: bidderRequest.refererInfo,
       },
       validBidRequests: validBidRequests
     };
@@ -143,6 +167,10 @@ export const spec = {
         bidResponse.currency = matchedResponse.currency;
         bidResponse.mediaType = matchedResponse.mediaType;
 
+        if (matchedResponse.adomain) {
+          utils.deepSetValue(bidResponse, 'meta.advertiserDomains', Array.isArray(matchedResponse.adomain) ? matchedResponse.adomain : [matchedResponse.adomain]);
+        }
+
         // check required parameters by matchedResponse.mediaType
         switch (matchedResponse.mediaType) {
           case BANNER:
diff --git a/modules/bridgewellBidAdapter.md b/modules/bridgewellBidAdapter.md
index 6bcab4b8820..97e11f6eaf9 100644
--- a/modules/bridgewellBidAdapter.md
+++ b/modules/bridgewellBidAdapter.md
@@ -20,7 +20,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIFcGVubnkqCQisAhD6ARoBOQ'
+                cid: 12345
             }
         }]
     }, {
@@ -33,7 +33,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIGcGVubnkzKggI2AUQWhoBOQ'
+                cid: 56789
             }
         }]
     }, {
@@ -70,7 +70,7 @@ Module that connects to Bridgewell demand source to fetch bids.
         bids: [{
             bidder: 'bridgewell',
             params: {
-                ChannelID: 'CgUxMjMzOBIBNiIGcGVubnkzKggI2AUQWhoBOQ'
+                cid: 2394
             }
         }]
     }];
diff --git a/modules/brightMountainMediaBidAdapter.js b/modules/brightMountainMediaBidAdapter.js
new file mode 100644
index 00000000000..531238c7400
--- /dev/null
+++ b/modules/brightMountainMediaBidAdapter.js
@@ -0,0 +1,163 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'bmtm';
+const AD_URL = 'https://one.elitebidder.com/api/hb';
+const SYNC_URL = 'https://console.brightmountainmedia.com:8443/cookieSync';
+
+const videoExt = [
+  'video/x-ms-wmv',
+  'video/x-flv',
+  'video/mp4',
+  'video/3gpp',
+  'application/x-mpegURL',
+  'video/quicktime',
+  'video/x-msvideo',
+  'application/x-shockwave-flash',
+  'application/javascript'
+];
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['brightmountainmedia'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  isBidRequestValid: (bid) => {
+    return Boolean(bid.bidId && bid.params && bid.params.placement_id);
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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
+    };
+    if (bidderRequest) {
+      if (bidderRequest.gdprConsent) {
+        request.gdpr_consent = bidderRequest.gdprConsent.consentString || 'ALL'
+        request.gdpr_require = bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+      }
+    }
+    for (let i = 0; i < validBidRequests.length; i++) {
+      let bid = validBidRequests[i];
+      let placement = {
+        placementId: bid.params.placement_id,
+        bidId: bid.bidId,
+        floor: {},
+      };
+
+      if (bid.mediaTypes.hasOwnProperty(BANNER)) {
+        placement['traffic'] = BANNER;
+        if (bid.mediaTypes.banner.sizes) {
+          placement['sizes'] = bid.mediaTypes.banner.sizes;
+        }
+      }
+
+      if (bid.mediaTypes.hasOwnProperty(VIDEO)) {
+        placement['traffic'] = VIDEO;
+        if (bid.mediaTypes.video.context) {
+          placement['context'] = bid.mediaTypes.video.context;
+        }
+        if (bid.mediaTypes.video.playerSize) {
+          placement['sizes'] = bid.mediaTypes.video.playerSize;
+        }
+        if (bid.mediaTypes.video.mimes && Array.isArray(bid.mediaTypes.video.mimes)) {
+          placement['mimes'] = bid.mediaTypes.video.mimes;
+        } else {
+          placement['mimes'] = videoExt;
+        }
+        if (bid.mediaTypes.video.skip != undefined) {
+          placement['skip'] = bid.mediaTypes.video.skip;
+        }
+        if (bid.mediaTypes.video.playbackmethod && Array.isArray(bid.mediaTypes.video.playbackmethod)) {
+          placement['playbackmethod'] = bid.mediaTypes.video.playbackmethod;
+        }
+      }
+
+      if (typeof bid.getFloor === 'function') {
+        let floorInfo = {};
+
+        for (let size of placement['sizes']) {
+          floorInfo = bid.getFloor({
+            currency: 'USD',
+            mediaType: placement['traffic'],
+            size: size,
+          });
+
+          if (typeof floorInfo === 'object' && floorInfo.currency === 'USD') {
+            placement.floor[`${size[0]}x${size[1]}`] = parseFloat(floorInfo.floor);
+          }
+        }
+      }
+
+      if (bid.schain) {
+        placement.schain = bid.schain;
+      }
+      placements.push(placement);
+    }
+    return {
+      method: 'POST',
+      url: AD_URL,
+      data: request
+    };
+  },
+
+  interpretResponse: (serverResponse) => {
+    let bidResponse = [];
+    const response = serverResponse.body;
+    if (response && Array.isArray(response) && response.length > 0) {
+      for (let i = 0; i < response.length; i++) {
+        if (response[i].cpm > 0) {
+          const tempResponse = {
+            requestId: response[i].requestId,
+            width: response[i].width,
+            height: response[i].height,
+            cpm: response[i].cpm,
+            mediaType: response[i].mediaType,
+            creativeId: response[i].creativeId,
+            currency: response[i].currency,
+            netRevenue: response[i].netRevenue,
+            ttl: response[i].ttl,
+            ad: response[i].ad,
+            meta: {
+              advertiserDomains: response[i].adomain && response[i].adomain.length ? response[i].adomain : [],
+            }
+          };
+
+          if (response[i].mediaType && response[i].mediaType === 'video') {
+            response[i].vastXml = response[i].ad;
+          }
+          bidResponse.push(tempResponse);
+        }
+      }
+    }
+    return bidResponse;
+  },
+
+  getUserSyncs: (syncOptions) => {
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: SYNC_URL
+      }];
+    }
+  },
+
+};
+
+registerBidder(spec);
diff --git a/modules/brightMountainMediaBidAdapter.md b/modules/brightMountainMediaBidAdapter.md
new file mode 100644
index 00000000000..97cebe5b633
--- /dev/null
+++ b/modules/brightMountainMediaBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name:  Bright Mountain Media Bidder Adapter
+Module Type:  Bidder Adapter
+Maintainer: dev@brightmountainmedia.com
+```
+
+# Description
+
+Connects to Bright Mountain Media exchange for bids.
+
+Bright Mountain Media bid adapter currently supports Banner and Video.
+
+# Sample Ad Unit: For Publishers
+
+## Sample Banner only Ad Unit
+
+```
+var adUnits = [
+      {
+        code: 'postbid_iframe',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [
+          {
+            "bidder": "bmtm",
+            "params": {
+              "placement_id": 1
+            }
+          }
+        ]
+      }
+    ];
+```
+
+## Sample Video only Ad Unit: Outstream
+
+```
+var adUnits = [
+    {
+        code: 'postbid_iframe_video',
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'outstream'
+            ... // Additional ORTB video params 
+          }
+        },
+        bids: [
+          {
+            bidder: "bmtm",
+            params: {
+              placement_id: 1
+            }
+          }
+        ],
+        renderer: {
+          url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+          render: function (bid) {
+            adResponse = {
+              ad: {
+                video: {
+                  content: bid.vastXml,
+                  player_height: bid.height,
+                  player_width: bid.width
+                }
+              }
+            }
+            // push to render queue because ANOutstreamVideo may not be loaded yet.
+            bid.renderer.push(() => {
+              ANOutstreamVideo.renderAd({
+                targetId: bid.adUnitCode,
+                adResponse: adResponse
+              });
+            });
+          }
+        }
+      }
+];
+
+```
+
+## Sample Video only Ad Unit: Instream
+
+```
+var adUnits = [
+    {
+        code: 'postbid_iframe_video',
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+            ... // Additional ORTB video params 
+          },
+        },
+        bids: [
+          {
+            bidder: "bmtm",
+            params: {
+              placement_id: 1
+            }
+          }
+        ]
+      }
+];
+
+```
diff --git a/modules/brightcomBidAdapter.js b/modules/brightcomBidAdapter.js
index a4b013a2fe2..8299a2331cb 100644
--- a/modules/brightcomBidAdapter.js
+++ b/modules/brightcomBidAdapter.js
@@ -46,7 +46,7 @@ function buildRequests(bidReqs, bidderRequest) {
         },
         tagid: String(bid.adUnitCode)
       };
-      const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
+      const bidFloor = _getBidFloor(bid);
       if (bidFloor) {
         imp.bidfloor = bidFloor;
       }
@@ -70,6 +70,11 @@ function buildRequests(bidReqs, bidderRequest) {
       tmax: config.getConfig('bidderTimeout')
     };
 
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.deepSetValue(brightcomBidReq, 'regs.ext.gdpr', +bidderRequest.gdprConsent.gdprApplies);
+      utils.deepSetValue(brightcomBidReq, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+    }
+
     return {
       method: 'POST',
       url: URL,
@@ -117,7 +122,10 @@ function interpretResponse(serverResponse) {
           netRevenue: true,
           mediaType: BANNER,
           ad: _getAdMarkup(brightcomBid),
-          ttl: 60
+          ttl: 60,
+          meta: {
+            advertiserDomains: brightcomBid && brightcomBid.adomain ? brightcomBid.adomain : []
+          }
         });
       });
     }
@@ -243,4 +251,20 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
   return 0;
 }
 
+function _getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/britepoolIdSystem.js b/modules/britepoolIdSystem.js
index 17a39e96aad..3bf416957d2 100644
--- a/modules/britepoolIdSystem.js
+++ b/modules/britepoolIdSystem.js
@@ -8,6 +8,7 @@
 import * as utils 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 = {
@@ -28,10 +29,12 @@ export const britepoolIdSubmodule = {
   /**
    * Performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [submoduleConfig]
+   * @param {ConsentData|undefined} consentData
    * @returns {function(callback:function)}
    */
-  getId(submoduleConfigParams, consentData) {
+  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') {
@@ -44,6 +47,9 @@ export const britepoolIdSubmodule = {
         };
       }
     }
+    if (utils.isEmpty(params)) {
+      utils.triggerPixel(PIXEL);
+    }
     // Return for async operation
     return {
       callback: function(callback) {
@@ -79,13 +85,17 @@ export const britepoolIdSubmodule = {
   },
   /**
    * Helper method to create params for our API call
-   * @param {SubmoduleParams} [configParams]
+   * @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 = {};
-    let params = Object.assign({}, submoduleConfigParams);
+    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') {
@@ -98,7 +108,7 @@ export const britepoolIdSubmodule = {
         headers['x-api-key'] = params.api_key;
       }
     }
-    const url = params.url || 'https://api.britepool.com/v1/britepool/id';
+    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;
diff --git a/modules/britepoolIdSystem.md b/modules/britepoolIdSystem.md
index 89287aed7ca..72edbe2324b 100644
--- a/modules/britepoolIdSystem.md
+++ b/modules/britepoolIdSystem.md
@@ -4,10 +4,10 @@ BritePool User ID Module. For assistance setting up your module please contact u
 
 ### Prebid Params
 
-Individual params may be set for the BritePool User ID Submodule. At least one identifier must be set in the params.
+Individual params may be set for the BritePool User ID Submodule. 
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: 'britepoolId',
             storage: {
diff --git a/modules/browsiRtdProvider.js b/modules/browsiRtdProvider.js
index 9317786fb8d..4ee338e94cc 100644
--- a/modules/browsiRtdProvider.js
+++ b/modules/browsiRtdProvider.js
@@ -13,30 +13,23 @@
  * @property {string} pubKey
  * @property {string} url
  * @property {?string} keyName
- * @property {?number} auctionDelay
- * @property {?number} timeout
  */
 
-import {config} from '../src/config.js';
 import * as utils from '../src/utils.js';
 import {submodule} from '../src/hook.js';
 import {ajaxBuilder} from '../src/ajax.js';
 import {loadExternalScript} from '../src/adloader.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {getStorageManager} from '../src/storageManager.js';
 import find from 'core-js-pure/features/array/find.js';
 
 const storage = getStorageManager();
 
-/** @type {string} */
-const MODULE_NAME = 'realTimeData';
-/** @type {number} */
-const DEF_TIMEOUT = 1000;
 /** @type {ModuleParams} */
 let _moduleParams = {};
 /** @type {null|Object} */
-let _data = null;
-/** @type {null | function} */
-let _dataReadyCallback = null;
+let _predictionsData = null;
+/** @type {string} */
+const DEF_KEYNAME = 'browsiViewability';
 
 /**
  * add browsi script to page
@@ -61,7 +54,7 @@ export function addBrowsiTag(data) {
  * collect required data from page
  * send data to browsi server to get predictions
  */
-function collectData() {
+export function collectData() {
   const win = window.top;
   const doc = win.document;
   let browsiData = null;
@@ -86,61 +79,33 @@ function collectData() {
 }
 
 export function setData(data) {
-  _data = data;
-
-  if (typeof _dataReadyCallback === 'function') {
-    _dataReadyCallback(_data);
-    _dataReadyCallback = null;
-  }
-}
-
-/**
- * wait for data from server
- * call callback when data is ready
- * @param {function} callback
- */
-function waitForData(callback) {
-  if (_data) {
-    _dataReadyCallback = null;
-    callback(_data);
-  } else {
-    _dataReadyCallback = callback;
-  }
+  _predictionsData = data;
 }
 
-/**
- * filter server data according to adUnits received
- * call callback (onDone) when data is ready
- * @param {adUnit[]} adUnits
- * @param {function} onDone callback function
- */
-function sendDataToModule(adUnits, onDone) {
+function sendDataToModule(adUnitsCodes) {
   try {
-    waitForData(_predictionsData => {
-      const _predictions = _predictionsData.p;
-      if (!_predictions || !Object.keys(_predictions).length) {
-        return onDone({});
+    const _predictions = (_predictionsData && _predictionsData.p) || {};
+    return adUnitsCodes.reduce((rp, adUnitCode) => {
+      if (!adUnitCode) {
+        return rp
       }
-      let dataToReturn = adUnits.reduce((rp, cau) => {
-        const adUnitCode = cau && cau.code;
-        if (!adUnitCode) { return rp }
-        const adSlot = getSlotByCode(adUnitCode);
-        const identifier = adSlot ? getMacroId(_predictionsData.pmd, adSlot) : adUnitCode;
-        const predictionData = _predictions[identifier];
-        if (!predictionData) { return rp }
-
-        if (predictionData.p) {
-          if (!isIdMatchingAdUnit(adSlot, predictionData.w)) {
-            return rp;
-          }
-          rp[adUnitCode] = getKVObject(predictionData.p, _predictionsData.kn);
+      const adSlot = getSlotByCode(adUnitCode);
+      const identifier = adSlot ? getMacroId(_predictionsData['pmd'], adSlot) : adUnitCode;
+      const predictionData = _predictions[identifier];
+      rp[adUnitCode] = getKVObject(-1, _predictionsData['kn']);
+      if (!predictionData) {
+        return rp
+      }
+      if (predictionData.p) {
+        if (!isIdMatchingAdUnit(adSlot, predictionData.w)) {
+          return rp;
         }
-        return rp;
-      }, {});
-      return onDone(dataToReturn);
-    });
+        rp[adUnitCode] = getKVObject(predictionData.p, _predictionsData.kn);
+      }
+      return rp;
+    }, {});
   } catch (e) {
-    onDone({});
+    return {};
   }
 }
 
@@ -160,7 +125,7 @@ function getAllSlots() {
 function getKVObject(p, keyName) {
   const prValue = p < 0 ? 'NA' : (Math.floor(p * 10) / 10).toFixed(2);
   let prObject = {};
-  prObject[((_moduleParams['keyName'] || keyName).toString())] = prValue.toString();
+  prObject[((_moduleParams['keyName'] || keyName || DEF_KEYNAME).toString())] = prValue.toString();
   return prObject;
 }
 /**
@@ -231,7 +196,7 @@ function evaluate(macro, divId, adUnit, replacer) {
  * @param {string} url server url with query params
  */
 function getPredictionsFromServer(url) {
-  let ajax = ajaxBuilder(_moduleParams.auctionDelay || _moduleParams.timeout || DEF_TIMEOUT);
+  let ajax = ajaxBuilder();
 
   ajax(url,
     {
@@ -283,30 +248,23 @@ export const browsiSubmodule = {
   /**
    * get data and send back to realTimeData module
    * @function
-   * @param {adUnit[]} adUnits
-   * @param {function} onDone
+   * @param {string[]} adUnitsCodes
    */
-  getData: sendDataToModule
+  getTargetingData: sendDataToModule,
+  init: init,
 };
 
-export function init(config) {
-  const confListener = config.getConfig(MODULE_NAME, ({realTimeData}) => {
-    try {
-      _moduleParams = realTimeData.dataProviders && realTimeData.dataProviders.filter(
-        pr => pr.name && pr.name.toLowerCase() === 'browsi')[0].params;
-      _moduleParams.auctionDelay = realTimeData.auctionDelay;
-      _moduleParams.timeout = realTimeData.timeout;
-    } catch (e) {
-      _moduleParams = {};
-    }
-    if (_moduleParams.siteKey && _moduleParams.pubKey && _moduleParams.url) {
-      confListener();
-      collectData();
-    } else {
-      utils.logError('missing params for Browsi provider');
-    }
-  });
+function init(moduleConfig) {
+  _moduleParams = moduleConfig.params;
+  if (_moduleParams && _moduleParams.siteKey && _moduleParams.pubKey && _moduleParams.url) {
+    collectData();
+  } else {
+    utils.logError('missing params for Browsi provider');
+  }
+  return true;
 }
 
-submodule('realTimeData', browsiSubmodule);
-init(config);
+function registerSubModule() {
+  submodule('realTimeData', browsiSubmodule);
+}
+registerSubModule();
diff --git a/modules/browsiRtdProvider.md b/modules/browsiRtdProvider.md
new file mode 100644
index 00000000000..9eed4b2b2d4
--- /dev/null
+++ b/modules/browsiRtdProvider.md
@@ -0,0 +1,55 @@
+# Overview
+
+The Browsi RTD module provides viewability predictions for ad slots on the page.
+To use this module, you’ll need to work with [Browsi](https://gobrowsi.com/) to get an account and receive instructions on how to set up your pages and ad server.
+
+# Configurations
+
+Compile the Browsi RTD Provider into your Prebid build:
+
+`gulp build --modules=browsiRtdProvider`
+
+
+Configuration example for using RTD module with `browsi` provider
+```javascript
+    pbjs.setConfig({
+        "realTimeData": {
+            "auctionDelay": 1000,
+            dataProviders:[{
+                "name": "browsi",
+                "waitForIt": "true"
+                "params": {
+                    "url": "yield-manager.browsiprod.com",
+                    "siteKey": "browsidemo",
+                    "pubKey": "browsidemo"
+                    "keyName":"bv"
+                }  
+            }]
+        }
+    });
+```  
+
+#Params
+
+Contact Browsi to get required params
+
+|  param name | type  |Scope | Description |
+| :------------ | :------------ | :------- | :------- |
+| url  | string  | required | Browsi server URL |
+| siteKey  | string  | required | Site key |
+| pubKey  | string  | required | Publisher key |
+| keyName  | string  | optional | Ad unit targeting key |
+
+
+#Output
+`getTargetingData` function will return expected viewability prediction in the following structure:
+```json
+{
+  "adUnitCode":{
+      "browsiViewability":"0.6"
+  },
+  "adUnitCode2":{
+      "browsiViewability":"0.9"
+  }
+}
+``` 
diff --git a/modules/bucksenseBidAdapter.js b/modules/bucksenseBidAdapter.js
index 3f327e62121..46d0dfe3590 100644
--- a/modules/bucksenseBidAdapter.js
+++ b/modules/bucksenseBidAdapter.js
@@ -90,6 +90,7 @@ export const spec = {
       var sCurrency = oResponse.currency || 'USD';
       var bNetRevenue = oResponse.netRevenue || true;
       var sAd = oResponse.ad || '';
+      var sAdomains = oResponse.adomains || [];
 
       if (request && sRequestID.length == 0) {
         utils.logInfo(WHO + ' interpretResponse() - use RequestID from Placments');
@@ -110,7 +111,10 @@ export const spec = {
         creativeId: sCreativeID,
         currency: sCurrency,
         netRevenue: bNetRevenue,
-        ad: sAd
+        ad: sAd,
+        meta: {
+          advertiserDomains: sAdomains
+        }
       };
       bidResponses.push(bidResponse);
     } else {
diff --git a/modules/buzzoolaBidAdapter.js b/modules/buzzoolaBidAdapter.js
index f87607657c3..db4863f7503 100644
--- a/modules/buzzoolaBidAdapter.js
+++ b/modules/buzzoolaBidAdapter.js
@@ -1,6 +1,6 @@
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import {Renderer} from '../src/Renderer.js';
 import {OUTSTREAM} from '../src/video.js';
 
@@ -11,7 +11,7 @@ const RENDERER_SRC = 'https://tube.buzzoola.com/new/build/buzzlibrary.js';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['buzzoolaAdapter'],
-  supportedMediaTypes: [BANNER, VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -21,7 +21,7 @@ export const spec = {
    */
   isBidRequestValid: function (bid) {
     let types = bid.mediaTypes;
-    return !!(bid && bid.mediaTypes && (types.banner || types.video) && bid.params && bid.params.placementId);
+    return !!(bid && bid.mediaTypes && (types.banner || types.video || types.native) && bid.params && bid.params.placementId);
   },
 
   /**
diff --git a/modules/buzzoolaBidAdapter.md b/modules/buzzoolaBidAdapter.md
index aec3eda6c58..87f5262af4f 100644
--- a/modules/buzzoolaBidAdapter.md
+++ b/modules/buzzoolaBidAdapter.md
@@ -26,7 +26,7 @@ var adUnits = [
         bids: [{
             bidder: 'buzzoola',
             params: {
-                placementId: 417846
+                placementId: 417845
             }
         }]
     },
@@ -45,7 +45,7 @@ var adUnits = [
         bids: [{
             bidder: 'buzzoola',
             params: {
-                placementId: 417845
+                placementId: 417846
             }
         }]
     },
@@ -67,6 +67,44 @@ var adUnits = [
                 placementId: 417845
             }
         }]
+    },
+    // Native adUnit
+    {
+        code: '/21737252144/prebid_test_native',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: true,
+                    sizes: [640, 134]
+                },
+                title: {
+                    required: true,
+                    len: 80
+                },
+                sponsoredBy: {
+                    required: true
+                },
+                clickUrl: {
+                    required: true
+                },
+                privacyLink: {
+                    required: false
+                },
+                body: {
+                    required: true
+                },
+                icon: {
+                    required: true,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'buzzoola',
+            params: {
+                placementId: 417845
+            }
+        }]
     }
 ];
 ```
diff --git a/modules/ccxBidAdapter.js b/modules/ccxBidAdapter.js
index ee15d6bb3ec..2160e539040 100644
--- a/modules/ccxBidAdapter.js
+++ b/modules/ccxBidAdapter.js
@@ -94,12 +94,12 @@ function _buildBid (bid) {
       }
     }
 
-    placement.video.protocols = utils.deepAccess(bid, 'params.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS
-    placement.video.mimes = utils.deepAccess(bid, 'params.video.mimes') || SUPPORTED_VIDEO_MIMES
-    placement.video.playbackmethod = utils.deepAccess(bid, 'params.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS
-    placement.video.skip = utils.deepAccess(bid, 'params.video.skip') || 0
-    if (placement.video.skip === 1 && utils.deepAccess(bid, 'params.video.skipafter')) {
-      placement.video.skipafter = utils.deepAccess(bid, 'params.video.skipafter')
+    placement.video.protocols = utils.deepAccess(bid, 'mediaTypes.video.protocols') || utils.deepAccess(bid, 'params.video.protocols') || SUPPORTED_VIDEO_PROTOCOLS
+    placement.video.mimes = utils.deepAccess(bid, 'mediaTypes.video.mimes') || utils.deepAccess(bid, 'params.video.mimes') || SUPPORTED_VIDEO_MIMES
+    placement.video.playbackmethod = utils.deepAccess(bid, 'mediaTypes.video.playbackmethod') || utils.deepAccess(bid, 'params.video.playbackmethod') || SUPPORTED_VIDEO_PLAYBACK_METHODS
+    placement.video.skip = utils.deepAccess(bid, 'mediaTypes.video.skip') || utils.deepAccess(bid, 'params.video.skip') || 0
+    if (placement.video.skip === 1 && (utils.deepAccess(bid, 'mediaTypes.video.skipafter') || utils.deepAccess(bid, 'params.video.skipafter'))) {
+      placement.video.skipafter = utils.deepAccess(bid, 'mediaTypes.video.skipafter') || utils.deepAccess(bid, 'params.video.skipafter')
     }
   }
 
@@ -120,6 +120,11 @@ function _buildResponse (bid, currency, ttl) {
     currency: currency
   }
 
+  resp.meta = {};
+  if (bid.adomain && bid.adomain.length > 0) {
+    resp.meta.advertiserDomains = bid.adomain;
+  }
+
   if (bid.ext.type === 'video') {
     resp.vastXml = bid.adm
   } else {
diff --git a/modules/ccxBidAdapter.md b/modules/ccxBidAdapter.md
index 740457dd099..7d86507bccb 100644
--- a/modules/ccxBidAdapter.md
+++ b/modules/ccxBidAdapter.md
@@ -32,67 +32,21 @@ Module that connects to Clickonometrics's demand sources
 	    mediaTypes: {
 		video: {
 		    playerSize: [1920, 1080]
-
+		    protocols: [2, 3, 5, 6], //default
+		    mimes: ["video/mp4", "video/x-flv"], //default 
+		    playbackmethod: [1, 2, 3, 4], //default
+		    skip: 1, //default 0
+		    skipafter: 5 //delete this key if skip = 0
 		}
 	    },
 	    bids: [
 		{
 		    bidder: "ccx",
 		    params: {
-			placementId: 3287742,
-			//following options are not required, default values will be used. Uncomment if you want to use custom values
-			/*video: {
-			    //check OpenRTB documentation for following options description
-			    protocols: [2, 3, 5, 6], //default
-			    mimes: ["video/mp4", "video/x-flv"], //default 
-			    playbackmethod: [1, 2, 3, 4], //default
-			    skip: 1, //default 0
-			    skipafter: 5 //delete this key if skip = 0
-			}*/
+			placementId: 3287742
 		    }
 		}
 	    ]
 	}
 
     ];
-
-# Pre 1.0 Support
-
-    var adUnits = [
-	{
-	    code: 'test-banner',
-	    mediaType: 'banner',
-	    sizes: [300, 250],
-	    bids: [
-		{
-		    bidder: "ccx",
-		    params: {
-			placementId: 3286844
-		    }
-		}
-	    ]
-	},
-	{
-	    code: 'test-video',
-	    mediaType: 'video',
-	    sizes: [1920, 1080]
-	    bids: [
-		{
-		    bidder: "ccx",
-		    params: {
-			placementId: 3287742,
-			//following options are not required, default values will be used. Uncomment if you want to use custom values
-			/*video: {
-			    //check OpenRTB documentation for following options description
-			    protocols: [2, 3, 5, 6], //default
-			    mimes: ["video/mp4", "video/x-flv"], //default 
-			    playbackmethod: [1, 2, 3, 4], //default
-			    skip: 1, //default 0
-			    skipafter: 5 //delete this key if skip = 0
-			}*/
-		    }
-		}
-	    ]
-	}
-
-    ];
\ No newline at end of file
diff --git a/modules/cleanmedianetBidAdapter.js b/modules/cleanmedianetBidAdapter.js
index a8f37450d68..80e4f13e7d4 100644
--- a/modules/cleanmedianetBidAdapter.js
+++ b/modules/cleanmedianetBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 export const helper = {
   getTopWindowDomain: function (url) {
@@ -119,7 +120,7 @@ export const spec = {
 
       const hasFavoredMediaType =
         params.favoredMediaType &&
-        this.supportedMediaTypes.includes(params.favoredMediaType);
+        includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
diff --git a/modules/cointrafficBidAdapter.js b/modules/cointrafficBidAdapter.js
new file mode 100644
index 00000000000..a6241980e06
--- /dev/null
+++ b/modules/cointrafficBidAdapter.js
@@ -0,0 +1,101 @@
+import * as utils 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 = 'cointraffic';
+const ENDPOINT_URL = 'https://appspb.cointraffic.io/pb/tmp';
+const DEFAULT_CURRENCY = 'EUR';
+const ALLOWED_CURRENCIES = [
+  'EUR', 'USD', 'JPY', 'BGN', 'CZK', 'DKK', 'GBP', 'HUF', 'PLN', 'RON', 'SEK', 'CHF', 'ISK', 'NOK', 'HRK', 'RUB', 'TRY',
+  'AUD', 'BRL', 'CAD', 'CNY', 'HKD', 'IDR', 'ILS', 'INR', 'KRW', 'MXN', 'MYR', 'NZD', 'PHP', 'SGD', 'THB', 'ZAR',
+];
+
+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.placementId);
+  },
+
+  /**
+   * 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 = utils.parseSizesInput(bidRequest.params.size || bidRequest.sizes);
+      const currency =
+        config.getConfig(`currency.bidderCurrencyDefault.${BIDDER_CODE}`) ||
+        config.getConfig('currency.adServerCurrency') ||
+        DEFAULT_CURRENCY;
+
+      if (ALLOWED_CURRENCIES.indexOf(currency) === -1) {
+        utils.logError('Currency is not supported - ' + currency);
+        return;
+      }
+
+      const payload = {
+        placementId: bidRequest.params.placementId,
+        currency: currency,
+        sizes: sizes,
+        bidId: bidRequest.bidId,
+        referer: bidderRequest.refererInfo.referer,
+      };
+
+      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
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (utils.isEmpty(response)) {
+      return bidResponses;
+    }
+
+    const bidResponse = {
+      requestId: response.requestId,
+      cpm: response.cpm,
+      currency: response.currency,
+      netRevenue: response.netRevenue,
+      width: response.width,
+      height: response.height,
+      creativeId: response.creativeId,
+      ttl: response.ttl,
+      ad: response.ad,
+      meta: {
+        advertiserDomains: response.adomain && response.adomain.length ? response.adomain : [],
+        mediaType: response.mediaType
+      }
+    };
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/cointrafficBidAdapter.md b/modules/cointrafficBidAdapter.md
new file mode 100644
index 00000000000..fcbcad1cad7
--- /dev/null
+++ b/modules/cointrafficBidAdapter.md
@@ -0,0 +1,31 @@
+# Overview
+
+```
+Module Name: Cointraffic Bidder Adapter
+Module Type: Cointraffic Adapter
+Maintainer: tech@cointraffic.io
+```
+
+# Description
+The Cointraffic client module makes it easy to implement Cointraffic directly into your website. To get started, simply replace the ``placementId`` with your assigned tracker key. This is dependent on the size required by your account dashboard. 
+We support response in different currencies. Supported currencies listed [here](https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html).
+
+For additional information on this module, please contact us at ``support@cointraffic.io``.
+
+# Test Parameters
+```
+  var adUnits = [{
+    code: 'test-ad-div',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]],
+        }
+    },
+    bids: [{
+    bidder: 'cointraffic',
+      params: { 
+        placementId: 'testPlacementId'
+      }
+    }]
+  }];
+```
diff --git a/modules/coinzillaBidAdapter.js b/modules/coinzillaBidAdapter.js
index 240a3f1fcde..e1c2b7d01b2 100644
--- a/modules/coinzillaBidAdapter.js
+++ b/modules/coinzillaBidAdapter.js
@@ -79,7 +79,11 @@ export const spec = {
         netRevenue: netRevenue,
         ttl: config.getConfig('_bidderTimeout'),
         referrer: referrer,
-        ad: response.ad
+        ad: response.ad,
+        mediaType: response.mediaType,
+        meta: {
+          advertiserDomains: response.advertiserDomain || []
+        }
       };
       bidResponses.push(bidResponse);
     }
diff --git a/modules/colombiaBidAdapter.js b/modules/colombiaBidAdapter.js
index 55109dbaab2..8405f197ca4 100644
--- a/modules/colombiaBidAdapter.js
+++ b/modules/colombiaBidAdapter.js
@@ -79,4 +79,4 @@ export const spec = {
     return bidResponses;
   }
 }
-registerBidder(spec);
+registerBidder(spec);
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
index baa60a76a0d..1b333802e41 100644
--- a/modules/colossussspBidAdapter.js
+++ b/modules/colossussspBidAdapter.js
@@ -56,15 +56,8 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: (validBidRequests, bidderRequest) => {
-    let winTop = window;
-    let location;
-    try {
-      location = new URL(bidderRequest.refererInfo.referer)
-      winTop = window.top;
-    } catch (e) {
-      location = winTop.location;
-      utils.logMessage(e);
-    };
+    const winTop = utils.getWindowTop();
+    const location = winTop.location;
     let placements = [];
     let request = {
       'deviceWidth': winTop.screen.width,
@@ -94,15 +87,29 @@ export const spec = {
         bidId: bid.bidId,
         sizes: bid.mediaTypes[traff].sizes,
         traffic: traff,
-        eids: []
+        eids: [],
+        floor: {}
       };
+      if (typeof bid.getFloor === 'function') {
+        let tmpFloor = {};
+        for (let size of placement.sizes) {
+          tmpFloor = bid.getFloor({
+            currency: 'USD',
+            mediaType: traff,
+            size: size
+          });
+          if (tmpFloor) {
+            placement.floor[`${size[0]}x${size[1]}`] = tmpFloor.floor;
+          }
+        }
+      }
       if (bid.schain) {
         placement.schain = bid.schain;
       }
       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, utils.deepAccess(bid, 'userId.id5id.uid'), 'id5-sync.com', utils.deepAccess(bid, 'userId.id5id.ext'));
         getUserId(placement.eids, bid.userId.tdid, 'adserver.org', {
           rtiPartner: 'TDID'
         });
diff --git a/modules/concertAnalyticsAdapter.js b/modules/concertAnalyticsAdapter.js
new file mode 100644
index 00000000000..a81d07e63b5
--- /dev/null
+++ b/modules/concertAnalyticsAdapter.js
@@ -0,0 +1,120 @@
+import {ajax} from '../src/ajax.js';
+import adapter from '../src/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import * as utils from '../src/utils.js';
+
+const analyticsType = 'endpoint';
+
+// We only want to send about 1% of events for sampling purposes
+const SAMPLE_RATE_PERCENTAGE = 1 / 100;
+const pageIncludedInSample = sampleAnalytics();
+
+const url = 'https://bids.concert.io/analytics';
+
+const {
+  EVENTS: {
+    BID_RESPONSE,
+    BID_WON,
+    AUCTION_END
+  }
+} = CONSTANTS;
+
+let queue = [];
+
+let concertAnalytics = Object.assign(adapter({url, analyticsType}), {
+  track({ eventType, args }) {
+    switch (eventType) {
+      case BID_RESPONSE:
+        if (args.bidder !== 'concert') break;
+        queue.push(mapBidEvent(eventType, args));
+        break;
+
+      case BID_WON:
+        if (args.bidder !== 'concert') break;
+        queue.push(mapBidEvent(eventType, args));
+        break;
+
+      case AUCTION_END:
+        // Set a delay, as BID_WON events will come after AUCTION_END events
+        setTimeout(() => sendEvents(), 3000);
+        break;
+
+      default:
+        break;
+    }
+  }
+});
+
+function mapBidEvent(eventType, args) {
+  const { adId, auctionId, cpm, creativeId, width, height, timeToRespond } = args;
+  const [gamCreativeId, concertRequestId] = getConcertRequestId(creativeId);
+
+  const payload = {
+    event: eventType,
+    concert_rid: concertRequestId,
+    adId,
+    auctionId,
+    creativeId: gamCreativeId,
+    position: args.adUnitCode,
+    url: window.location.href,
+    cpm,
+    width,
+    height,
+    timeToRespond
+  }
+
+  return payload;
+}
+
+/**
+ * In order to pass back the concert_rid from CBS, it is tucked into the `creativeId`
+ * slot in the bid response and combined with a pipe `|`. This method splits the creative ID
+ * and the concert_rid.
+ *
+ * @param {string} creativeId
+ */
+function getConcertRequestId(creativeId) {
+  if (!creativeId || creativeId.indexOf('|') < 0) return [null, null];
+
+  return creativeId.split('|');
+}
+
+function sampleAnalytics() {
+  return Math.random() <= SAMPLE_RATE_PERCENTAGE;
+}
+
+function sendEvents() {
+  concertAnalytics.eventsStorage = queue;
+
+  if (!queue.length) return;
+
+  if (!pageIncludedInSample) {
+    utils.logMessage('Page not included in sample for Concert Analytics');
+    return;
+  }
+
+  try {
+    const body = JSON.stringify(queue);
+    ajax(url, () => queue = [], body, {
+      contentType: 'application/json',
+      method: 'POST'
+    });
+  } catch (err) { utils.logMessage('Concert Analytics error') }
+}
+
+// save the base class function
+concertAnalytics.originEnableAnalytics = concertAnalytics.enableAnalytics;
+concertAnalytics.eventsStorage = [];
+
+// override enableAnalytics so we can get access to the config passed in from the page
+concertAnalytics.enableAnalytics = function (config) {
+  concertAnalytics.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: concertAnalytics,
+  code: 'concert'
+});
+
+export default concertAnalytics;
diff --git a/modules/concertAnalyticsAdapter.md b/modules/concertAnalyticsAdapter.md
new file mode 100644
index 00000000000..7c9b6d22703
--- /dev/null
+++ b/modules/concertAnalyticsAdapter.md
@@ -0,0 +1,11 @@
+# Overview
+
+```
+Module Name: Concert Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@concert.io
+```
+
+# Description
+
+Analytics adapter for concert.
\ No newline at end of file
diff --git a/modules/concertBidAdapter.js b/modules/concertBidAdapter.js
new file mode 100644
index 00000000000..60634151aba
--- /dev/null
+++ b/modules/concertBidAdapter.js
@@ -0,0 +1,212 @@
+
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js'
+
+const BIDDER_CODE = 'concert';
+const CONCERT_ENDPOINT = 'https://bids.concert.io';
+const USER_SYNC_URL = 'https://cdn.concert.io/lib/bids/sync.html';
+
+export const spec = {
+  code: BIDDER_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.
+   */
+  isBidRequestValid: function(bid) {
+    if (!bid.params.partnerId) {
+      utils.logWarn('Missing partnerId bid parameter');
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @param {bidderRequest} -
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    utils.logMessage(validBidRequests);
+    utils.logMessage(bidderRequest);
+    let payload = {
+      meta: {
+        prebidVersion: '$prebid.version$',
+        pageUrl: bidderRequest.refererInfo.referer,
+        screen: [window.screen.width, window.screen.height].join('x'),
+        debug: utils.debugTurnedOn(),
+        uid: getUid(bidderRequest),
+        optedOut: hasOptedOutOfPersonalization(),
+        adapterVersion: '1.1.1',
+        uspConsent: bidderRequest.uspConsent,
+        gdprConsent: bidderRequest.gdprConsent
+      }
+    }
+
+    payload.slots = validBidRequests.map(bidRequest => {
+      let slot = {
+        name: bidRequest.adUnitCode,
+        bidId: bidRequest.bidId,
+        transactionId: bidRequest.transactionId,
+        sizes: bidRequest.params.sizes || bidRequest.sizes,
+        partnerId: bidRequest.params.partnerId,
+        slotType: bidRequest.params.slotType,
+        adSlot: bidRequest.params.slot || bidRequest.adUnitCode,
+        placementId: bidRequest.params.placementId || '',
+        site: bidRequest.params.site || bidderRequest.refererInfo.referer
+      }
+
+      return slot;
+    });
+
+    utils.logMessage(payload);
+
+    return {
+      method: 'POST',
+      url: `${CONCERT_ENDPOINT}/bids/prebid`,
+      data: JSON.stringify(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, bidRequest) {
+    utils.logMessage(serverResponse);
+    utils.logMessage(bidRequest);
+
+    const serverBody = serverResponse.body;
+
+    if (!serverBody || typeof serverBody !== 'object') {
+      return [];
+    }
+
+    let bidResponses = [];
+
+    bidResponses = serverBody.bids.map(bid => {
+      return {
+        requestId: bid.bidId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        ad: bid.ad,
+        ttl: bid.ttl,
+        meta: { advertiserDomains: bid && bid.adomain ? bid.adomain : [] },
+        creativeId: bid.creativeId,
+        netRevenue: bid.netRevenue,
+        currency: bid.currency
+      }
+    });
+
+    if (utils.debugTurnedOn() && serverBody.debug) {
+      utils.logMessage(`CONCERT`, serverBody.debug);
+    }
+
+    utils.logMessage(bidResponses);
+    return bidResponses;
+  },
+
+  /**
+   * 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.
+   * @param {gdprConsent} object GDPR consent object.
+   * @param {uspConsent} string US Privacy String.
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = []
+    if (syncOptions.iframeEnabled && !hasOptedOutOfPersonalization()) {
+      let params = [];
+
+      if (gdprConsent && (typeof gdprConsent.gdprApplies === 'boolean')) {
+        params.push(`gdpr_applies=${gdprConsent.gdprApplies ? '1' : '0'}`);
+      }
+      if (gdprConsent && (typeof gdprConsent.consentString === 'string')) {
+        params.push(`gdpr_consent=${gdprConsent.consentString}`);
+      }
+      if (uspConsent && (typeof uspConsent === 'string')) {
+        params.push(`usp_consent=${uspConsent}`);
+      }
+
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL + (params.length > 0 ? `?${params.join('&')}` : '')
+      });
+    }
+    return syncs;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function(data) {
+    utils.logMessage('concert bidder timed out');
+    utils.logMessage(data);
+  },
+
+  /**
+   * 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) {
+    utils.logMessage('concert bidder won bid');
+    utils.logMessage(bid);
+  }
+
+}
+
+registerBidder(spec);
+
+const storage = getStorageManager();
+
+/**
+ * Check or generate a UID for the current user.
+ */
+function getUid(bidderRequest) {
+  if (hasOptedOutOfPersonalization() || !consentAllowsPpid(bidderRequest)) {
+    return false;
+  }
+
+  const CONCERT_UID_KEY = 'c_uid';
+
+  let uid = storage.getDataFromLocalStorage(CONCERT_UID_KEY);
+
+  if (!uid) {
+    uid = utils.generateUUID();
+    storage.setDataInLocalStorage(CONCERT_UID_KEY, uid);
+  }
+
+  return uid;
+}
+
+/**
+ * Whether the user has opted out of personalization.
+ */
+function hasOptedOutOfPersonalization() {
+  const CONCERT_NO_PERSONALIZATION_KEY = 'c_nap';
+
+  return storage.getDataFromLocalStorage(CONCERT_NO_PERSONALIZATION_KEY) === 'true';
+}
+
+/**
+ * Whether the privacy consent strings allow personalization.
+ *
+ * @param {BidderRequest} bidderRequest Object which contains any data consent signals
+ */
+function consentAllowsPpid(bidderRequest) {
+  /* NOTE: We cannot easily test GDPR consent, without the
+   * `consent-string` npm module; so will have to rely on that
+   * happening on the bid-server. */
+  return !(bidderRequest.uspConsent === 'string' &&
+           bidderRequest.uspConsent.toUpperCase().substring(0, 2) === '1YY')
+}
diff --git a/modules/concertBidAdapter.md b/modules/concertBidAdapter.md
new file mode 100644
index 00000000000..d8736082e5c
--- /dev/null
+++ b/modules/concertBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+```
+Module Name: Concert Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@concert.io
+```
+
+# Description
+
+Module that connects to Concert demand sources
+
+# Test Paramters
+```
+  var adUnits = [
+    {
+      code: 'desktop_leaderboard_variable',
+      mediaTypes: {
+        banner: {
+          sizes: [[1030, 590]]
+        }
+      }
+      bids: [
+        {
+          bidder: "concert",
+          params: {
+            partnerId: 'test_partner',
+            site: 'site_name',
+            placementId: 1234567,
+            slot: 'slot_name',
+            sizes: [[1030, 590]]
+          }
+        }
+      ]
+    }
+  ];
+```
diff --git a/modules/connectadBidAdapter.js b/modules/connectadBidAdapter.js
index 3dcb8da9838..111b6ac10e8 100644
--- a/modules/connectadBidAdapter.js
+++ b/modules/connectadBidAdapter.js
@@ -2,6 +2,7 @@ import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js'
 import {config} from '../src/config.js';
+import {createEidsArray} from './userId/eids.js';
 
 const BIDDER_CODE = 'connectad';
 const BIDDER_CODE_ALIAS = 'connectadrealtime';
@@ -10,6 +11,7 @@ const SUPPORTED_MEDIA_TYPES = [BANNER];
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 138,
   aliases: [ BIDDER_CODE_ALIAS ],
   supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
@@ -18,8 +20,6 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
-    let digitrust;
-
     let ret = {
       method: 'POST',
       url: '',
@@ -41,7 +41,8 @@ export const spec = {
       screensize: getScreenSize(),
       dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
       language: navigator.language,
-      ua: navigator.userAgent
+      ua: navigator.userAgent,
+      pversion: '$prebid.version$'
     });
 
     // coppa compliance
@@ -69,81 +70,22 @@ export const spec = {
       utils.deepSetValue(data, 'user.ext.us_privacy', bidderRequest.uspConsent);
     }
 
-    // Digitrust Support
-    const bidRequestDigitrust = utils.deepAccess(validBidRequests[0], 'userId.digitrustid.data');
-    if (bidRequestDigitrust && (!bidRequestDigitrust.privacy || !bidRequestDigitrust.privacy.optout)) {
-      digitrust = {
-        id: bidRequestDigitrust.id,
-        keyv: bidRequestDigitrust.keyv
-      }
-    }
-
-    if (digitrust) {
-      utils.deepSetValue(data, 'user.ext.digitrust', {
-        id: digitrust.id,
-        keyv: digitrust.keyv
-      })
-    }
-
-    if (validBidRequests[0].userId && typeof validBidRequests[0].userId === 'object' && (validBidRequests[0].userId.tdid || validBidRequests[0].userId.pubcid || validBidRequests[0].userId.lipb || validBidRequests[0].userId.id5id || validBidRequests[0].userId.parrableid)) {
-      utils.deepSetValue(data, 'user.ext.eids', []);
-
-      if (validBidRequests[0].userId.tdid) {
-        data.user.ext.eids.push({
-          source: 'adserver.org',
-          uids: [{
-            id: validBidRequests[0].userId.tdid,
-            ext: {
-              rtiPartner: 'TDID'
-            }
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.pubcid) {
-        data.user.ext.eids.push({
-          source: 'pubcommon',
-          uids: [{
-            id: validBidRequests[0].userId.pubcid,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.id5id) {
-        data.user.ext.eids.push({
-          source: 'id5-sync.com',
-          uids: [{
-            id: validBidRequests[0].userId.id5id,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.parrableid) {
-        data.user.ext.eids.push({
-          source: 'parrable.com',
-          uids: [{
-            id: validBidRequests[0].userId.parrableid,
-          }]
-        });
-      }
-
-      if (validBidRequests[0].userId.lipb && validBidRequests[0].userId.lipb.lipbid) {
-        data.user.ext.eids.push({
-          source: 'liveintent.com',
-          uids: [{
-            id: validBidRequests[0].userId.lipb.lipbid
-          }]
-        });
-      }
+    // EIDS Support
+    if (validBidRequests[0].userId) {
+      utils.deepSetValue(data, 'user.ext.eids', createEidsArray(validBidRequests[0].userId));
     }
 
     validBidRequests.map(bid => {
       const placement = Object.assign({
         id: bid.transactionId,
         divName: bid.bidId,
+        pisze: bid.mediaTypes.banner.sizes[0] || bid.sizes[0],
         sizes: bid.mediaTypes.banner.sizes,
-        adTypes: getSize(bid.mediaTypes.banner.sizes || bid.sizes)
-      }, bid.params);
+        adTypes: getSize(bid.mediaTypes.banner.sizes || bid.sizes),
+        bidfloor: getBidFloor(bid),
+        siteId: bid.params.siteId,
+        networkId: bid.params.networkId
+      });
 
       if (placement.networkId && placement.siteId) {
         data.placements.push(placement);
@@ -182,6 +124,7 @@ 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.ad = retrieveAd(decision);
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
@@ -195,6 +138,13 @@ export const spec = {
     return bidResponses;
   },
 
+  transformBidParams: function (params, isOpenRtb) {
+    return utils.convertTypes({
+      'siteId': 'number',
+      'networkId': 'number'
+    }, params);
+  },
+
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     let syncEndpoint = 'https://cdn.connectad.io/connectmyusers.php?';
 
@@ -277,6 +227,22 @@ sizeMap[331] = '320x250';
 sizeMap[3301] = '320x267';
 sizeMap[2730] = '728x250';
 
+function getBidFloor(bidRequest) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: '*'
+    });
+  }
+
+  let floor = floorInfo.floor || bidRequest.params.bidfloor || bidRequest.params.floorprice || 0;
+
+  return floor;
+}
+
 function getSize(sizes) {
   const result = [];
   sizes.forEach(function(size) {
diff --git a/modules/consentManagement.js b/modules/consentManagement.js
index 53e97006bd1..6a13e73b8a2 100644
--- a/modules/consentManagement.js
+++ b/modules/consentManagement.js
@@ -14,9 +14,12 @@ const DEFAULT_CMP = 'iab';
 const DEFAULT_CONSENT_TIMEOUT = 10000;
 const DEFAULT_ALLOW_AUCTION_WO_CONSENT = true;
 
+export const allowAuction = {
+  value: DEFAULT_ALLOW_AUCTION_WO_CONSENT,
+  definedInConfig: false
+}
 export let userCMP;
 export let consentTimeout;
-export let allowAuction;
 export let gdprScope;
 export let staticConsentData;
 
@@ -97,9 +100,7 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
   function v2CmpResponseCallback(tcfData, success) {
     utils.logInfo('Received a response from CMP', tcfData);
     if (success) {
-      if (tcfData.eventStatus === 'tcloaded' || tcfData.eventStatus === 'useractioncomplete') {
-        cmpSuccess(tcfData, hookConfig);
-      } else if (tcfData.eventStatus === 'cmpuishown' && tcfData.tcString && tcfData.purposeOneTreatment === true) {
+      if (tcfData.gdprApplies === false || tcfData.eventStatus === 'tcloaded' || tcfData.eventStatus === 'useractioncomplete') {
         cmpSuccess(tcfData, hookConfig);
       }
     } else {
@@ -198,29 +199,52 @@ function lookupIabConsent(cmpSuccess, cmpError, hookConfig) {
   function callCmpWhileInIframe(commandName, cmpFrame, moduleCallback) {
     let apiName = (cmpVersion === 2) ? '__tcfapi' : '__cmp';
 
+    let callName = `${apiName}Call`;
+
     /* Setup up a __cmp function to do the postMessage and stash the callback.
-      This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
-    window[apiName] = function (cmd, arg, callback) {
-      let callId = Math.random() + '';
-      let callName = `${apiName}Call`;
-      let msg = {
-        [callName]: {
-          command: cmd,
-          parameter: arg,
-          callId: callId
-        }
-      };
-      if (cmpVersion !== 1) msg[callName].version = cmpVersion;
+    This function behaves (from the caller's perspective identicially to the in-frame __cmp call */
+    if (cmpVersion === 2) {
+      window[apiName] = function (cmd, cmpVersion, callback, arg) {
+        let callId = Math.random() + '';
+        let msg = {
+          [callName]: {
+            command: cmd,
+            version: cmpVersion,
+            parameter: arg,
+            callId: callId
+          }
+        };
 
-      cmpCallbacks[callId] = callback;
-      cmpFrame.postMessage(msg, '*');
-    }
+        cmpCallbacks[callId] = callback;
+        cmpFrame.postMessage(msg, '*');
+      }
 
-    /** when we get the return message, call the stashed callback */
-    window.addEventListener('message', readPostMessageResponse, false);
+      /** when we get the return message, call the stashed callback */
+      window.addEventListener('message', readPostMessageResponse, false);
 
-    // call CMP
-    window[apiName](commandName, null, moduleCallback);
+      // call CMP
+      window[apiName](commandName, cmpVersion, moduleCallback);
+    } else {
+      window[apiName] = function (cmd, arg, callback) {
+        let callId = Math.random() + '';
+        let msg = {
+          [callName]: {
+            command: cmd,
+            parameter: arg,
+            callId: callId
+          }
+        };
+
+        cmpCallbacks[callId] = callback;
+        cmpFrame.postMessage(msg, '*');
+      }
+
+      /** when we get the return message, call the stashed callback */
+      window.addEventListener('message', readPostMessageResponse, false);
+
+      // call CMP
+      window[apiName](commandName, undefined, moduleCallback);
+    }
 
     function readPostMessageResponse(event) {
       let cmpDataPkgName = `${apiName}Return`;
@@ -322,6 +346,13 @@ function processCmpData(consentObject, hookConfig) {
   // determine which set of checks to run based on cmpVersion
   let checkFn = (cmpVersion === 1) ? checkV1Data : (cmpVersion === 2) ? checkV2Data : null;
 
+  // Raise deprecation warning if 'allowAuctionWithoutConsent' is used with TCF 2.
+  if (allowAuction.definedInConfig && cmpVersion === 2) {
+    utils.logWarn(`'allowAuctionWithoutConsent' ignored for TCF 2`);
+  } else if (!allowAuction.definedInConfig && cmpVersion === 1) {
+    utils.logInfo(`'allowAuctionWithoutConsent' using system default: (${DEFAULT_ALLOW_AUCTION_WO_CONSENT}).`);
+  }
+
   if (utils.isFn(checkFn)) {
     if (checkFn(consentObject)) {
       cmpFailed(`CMP returned unexpected value during lookup process.`, hookConfig, consentObject);
@@ -352,14 +383,14 @@ function cmpFailed(errMsg, hookConfig, extraArgs) {
   clearTimeout(hookConfig.timer);
 
   // still set the consentData to undefined when there is a problem as per config options
-  if (allowAuction) {
+  if (allowAuction.value && cmpVersion === 1) {
     storeConsentData(undefined);
   }
   exitModule(errMsg, hookConfig, extraArgs);
 }
 
 /**
- * Stores CMP data locally in module and then invokes gdprDataHandler.setConsentData() to make information available in adaptermanger.js for later in the auction
+ * Stores CMP data locally in module and then invokes gdprDataHandler.setConsentData() to make information available in adaptermanager.js for later in the auction
  * @param {object} cmpConsentObject required; an object representing user's consent choices (can be undefined in certain use-cases for this function only)
  */
 function storeConsentData(cmpConsentObject) {
@@ -375,6 +406,9 @@ function storeConsentData(cmpConsentObject) {
       vendorData: (cmpConsentObject) || undefined,
       gdprApplies: cmpConsentObject && typeof cmpConsentObject.gdprApplies === 'boolean' ? cmpConsentObject.gdprApplies : gdprScope
     };
+    if (cmpConsentObject && cmpConsentObject.addtlConsent && utils.isStr(cmpConsentObject.addtlConsent)) {
+      consentData.addtlConsent = cmpConsentObject.addtlConsent;
+    };
   }
   consentData.apiVersion = cmpVersion;
   gdprDataHandler.setConsentData(consentData);
@@ -406,8 +440,8 @@ function exitModule(errMsg, hookConfig, extraArgs) {
     let nextFn = hookConfig.nextFn;
 
     if (errMsg) {
-      if (allowAuction) {
-        utils.logWarn(errMsg + ' Resuming auction without consent data as per consentManagement config.', extraArgs);
+      if (allowAuction.value && cmpVersion === 1) {
+        utils.logWarn(errMsg + ` 'allowAuctionWithoutConsent' activated.`, extraArgs);
         nextFn.apply(context, args);
       } else {
         utils.logError(errMsg + ' Canceling auction as per consentManagement config.', extraArgs);
@@ -440,7 +474,7 @@ export function resetConsentData() {
 export function setConsentConfig(config) {
   // if `config.gdpr` or `config.usp` exist, assume new config format.
   // else for backward compatability, just use `config`
-  config = config.gdpr || config.usp ? config.gdpr : config;
+  config = config && (config.gdpr || config.usp ? config.gdpr : config);
   if (!config || typeof config !== 'object') {
     utils.logWarn('consentManagement config not defined, exiting consent manager');
     return;
@@ -460,10 +494,8 @@ export function setConsentConfig(config) {
   }
 
   if (typeof config.allowAuctionWithoutConsent === 'boolean') {
-    allowAuction = config.allowAuctionWithoutConsent;
-  } else {
-    allowAuction = DEFAULT_ALLOW_AUCTION_WO_CONSENT;
-    utils.logInfo(`consentManagement config did not specify allowAuctionWithoutConsent.  Using system default setting (${DEFAULT_ALLOW_AUCTION_WO_CONSENT}).`);
+    allowAuction.value = config.allowAuctionWithoutConsent;
+    allowAuction.definedInConfig = true;
   }
 
   // if true, then gdprApplies should be set to true
diff --git a/modules/consentManagementUsp.js b/modules/consentManagementUsp.js
index 1a5879a40ff..cba9c2758d0 100644
--- a/modules/consentManagementUsp.js
+++ b/modules/consentManagementUsp.js
@@ -44,6 +44,35 @@ function lookupStaticConsentData(cmpSuccess, cmpError, hookConfig) {
  * @param {object} hookConfig contains module related variables (see comment in requestBidsHook function)
  */
 function lookupUspConsent(uspSuccess, uspError, hookConfig) {
+  function findUsp() {
+    let f = window;
+    let uspapiFrame;
+    let uspapiFunction;
+
+    while (!uspapiFrame) {
+      try {
+        if (typeof f.__uspapi === 'function') {
+          uspapiFunction = f.__uspapi;
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+
+      try {
+        if (f.frames['__uspapiLocator']) {
+          uspapiFrame = f;
+          break;
+        }
+      } catch (e) {}
+      if (f === window.top) break;
+      f = f.parent;
+    }
+    return {
+      uspapiFrame,
+      uspapiFunction,
+    };
+  }
+
   function handleUspApiResponseCallbacks() {
     const uspResponse = {};
 
@@ -61,41 +90,43 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
           uspResponse.usPrivacy = consentResponse.uspString;
         }
         afterEach();
-      }
+      },
     };
   }
 
   let callbackHandler = handleUspApiResponseCallbacks();
   let uspapiCallbacks = {};
 
+  let { uspapiFrame, uspapiFunction } = findUsp();
+
+  if (!uspapiFrame) {
+    return uspError('USP CMP not found.', hookConfig);
+  }
+
   // to collect the consent information from the user, we perform a call to USPAPI
   // to collect the user's consent choices represented as a string (via getUSPData)
 
   // the following code also determines where the USPAPI is located and uses the proper workflow to communicate with it:
-  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window. This works in friendly or cross domain iframes
+  // - use the USPAPI locator code to see if USP's located in the current window or an ancestor window.
+  // - else assume prebid is in an iframe, and use the locator to see if the CMP is located in a higher parent window. This works in cross domain iframes.
   // - if USPAPI is not found, the iframe function will call the uspError exit callback to abort the rest of the USPAPI workflow
-  // - try to call the __uspapi() function directly, otherwise use the postMessage() api
-  // find the CMP frame/window
-
-  try {
-    // try to call __uspapi directly
-    window.__uspapi('getUSPData', USPAPI_VERSION, callbackHandler.consentDataCallback);
-  } catch (e) {
-    // must not have been accessible, try using postMessage() api
-    let f = window;
-    let uspapiFrame;
-    while (!uspapiFrame) {
-      try {
-        if (f.frames['__uspapiLocator']) uspapiFrame = f;
-      } catch (e) { }
-      if (f === window.top) break;
-      f = f.parent;
-    }
 
-    if (!uspapiFrame) {
-      return uspError('USP CMP not found.', hookConfig);
-    }
-    callUspApiWhileInIframe('getUSPData', uspapiFrame, callbackHandler.consentDataCallback);
+  if (utils.isFn(uspapiFunction)) {
+    utils.logInfo('Detected USP CMP is directly accessible, calling it now...');
+    uspapiFunction(
+      'getUSPData',
+      USPAPI_VERSION,
+      callbackHandler.consentDataCallback
+    );
+  } else {
+    utils.logInfo(
+      'Detected USP CMP is outside the current iframe where Prebid.js is located, calling it now...'
+    );
+    callUspApiWhileInIframe(
+      'getUSPData',
+      uspapiFrame,
+      callbackHandler.consentDataCallback
+    );
   }
 
   function callUspApiWhileInIframe(commandName, uspapiFrame, moduleCallback) {
@@ -107,19 +138,19 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
         __uspapiCall: {
           command: cmd,
           version: ver,
-          callId: callId
-        }
+          callId: callId,
+        },
       };
 
       uspapiCallbacks[callId] = callback;
       uspapiFrame.postMessage(msg, '*');
-    }
+    };
 
     /** when we get the return message, call the stashed callback */
     window.addEventListener('message', readPostMessageResponse, false);
 
     // call uspapi
-    window.__uspapi(commandName, USPAPI_VERSION, uspapiCallback);
+    window.__uspapi(commandName, USPAPI_VERSION, moduleCallback);
 
     function readPostMessageResponse(event) {
       const res = event && event.data && event.data.__uspapiReturn;
@@ -130,11 +161,6 @@ function lookupUspConsent(uspSuccess, uspError, hookConfig) {
         }
       }
     }
-
-    function uspapiCallback(consentObject, success) {
-      window.removeEventListener('message', readPostMessageResponse, false);
-      moduleCallback(consentObject, success);
-    }
   }
 }
 
@@ -158,11 +184,6 @@ export function requestBidsHook(fn, reqBidsConfigObj) {
     timer: null
   };
 
-  // in case we already have consent (eg during bid refresh)
-  if (consentData) {
-    return exitModule(null, hookConfig);
-  }
-
   if (!uspCallMap[consentAPI]) {
     utils.logWarn(`USP framework (${consentAPI}) is not a supported framework. Aborting consentManagement module and resuming auction.`);
     return hookConfig.nextFn.apply(hookConfig.context, hookConfig.args);
@@ -274,7 +295,7 @@ export function resetConsentData() {
  * @param {object} config required; consentManagementUSP module config settings; usp (string), timeout (int), allowAuctionWithoutConsent (boolean)
  */
 export function setConsentConfig(config) {
-  config = config.usp;
+  config = config && config.usp;
   if (!config || typeof config !== 'object') {
     utils.logWarn('consentManagement.usp config not defined, exiting usp consent manager');
     return;
diff --git a/modules/consumableBidAdapter.js b/modules/consumableBidAdapter.js
index 8eb56f7d0c2..92e2192b925 100644
--- a/modules/consumableBidAdapter.js
+++ b/modules/consumableBidAdapter.js
@@ -122,6 +122,7 @@ export const spec = {
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
           bid.ttl = 30;
+          bid.meta = { advertiserDomains: decision.adomain ? decision.adomain : [] }
           bid.netRevenue = true;
           bid.referrer = bidRequest.bidderRequest.refererInfo.referer;
 
diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
index 3b3d04dc498..5af399365bd 100644
--- a/modules/conversantBidAdapter.js
+++ b/modules/conversantBidAdapter.js
@@ -33,10 +33,11 @@ export const spec = {
     }
 
     if (isVideoRequest(bid)) {
-      if (!bid.params.mimes) {
+      const mimes = bid.params.mimes || utils.deepAccess(bid, 'mediaTypes.video.mimes');
+      if (!mimes) {
         // Give a warning but let it pass
         utils.logWarn(BIDDER_CODE + ': mimes should be specified for videos');
-      } else if (!utils.isArray(bid.params.mimes) || !bid.params.mimes.every(s => utils.isStr(s))) {
+      } else if (!utils.isArray(mimes) || !mimes.every(s => utils.isStr(s))) {
         utils.logWarn(BIDDER_CODE + ': mimes must be an array of strings');
         return false;
       }
@@ -61,7 +62,7 @@ export const spec = {
     let bidurl = URL;
 
     const conversantImps = validBidRequests.map(function(bid) {
-      const bidfloor = utils.getBidIdParameter('bidfloor', bid.params);
+      const bidfloor = getBidFloor(bid);
 
       siteId = utils.getBidIdParameter('site_id', bid.params) || siteId;
       pubcidName = utils.getBidIdParameter('pubcid_name', bid.params) || pubcidName;
@@ -90,7 +91,7 @@ export const spec = {
 
         copyOptProperty(bid.params.position, video, 'pos');
         copyOptProperty(bid.params.mimes || videoData.mimes, video, 'mimes');
-        copyOptProperty(bid.params.maxduration, video, 'maxduration');
+        copyOptProperty(bid.params.maxduration || videoData.maxduration, video, 'maxduration');
         copyOptProperty(bid.params.protocols || videoData.protocols, video, 'protocols');
         copyOptProperty(bid.params.api || videoData.api, video, 'api');
 
@@ -205,6 +206,10 @@ export const spec = {
               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) === '<') {
@@ -331,7 +336,6 @@ function collectEids(bidRequests) {
       'criteo.com': 1,
       'id5-sync.com': 1,
       'parrable.com': 1,
-      'digitru.st': 1,
       'liveintent.com': 1
     };
     request.userIdAsEids.forEach(function(eid) {
@@ -374,4 +378,28 @@ function readStoredValue(key) {
   return storedValue;
 }
 
+/**
+ * Get the floor price from bid.params for backward compatibility.
+ * If not found, then check floor module.
+ * @param bid A valid bid object
+ * @returns {*|number} floor price
+ */
+function getBidFloor(bid) {
+  let floor = utils.getBidIdParameter('bidfloor', bid.params);
+
+  if (!floor && utils.isFn(bid.getFloor)) {
+    const floorObj = bid.getFloor({
+      currency: 'USD',
+      mediaType: '*',
+      size: '*'
+    });
+
+    if (utils.isPlainObject(floorObj) && !isNaN(floorObj.floor) && floorObj.currency === 'USD') {
+      floor = floorObj.floor;
+    }
+  }
+
+  return floor
+}
+
 registerBidder(spec);
diff --git a/modules/conversantBidAdapter.md b/modules/conversantBidAdapter.md
index fba793adad2..07d9abf918b 100644
--- a/modules/conversantBidAdapter.md
+++ b/modules/conversantBidAdapter.md
@@ -29,17 +29,17 @@ var adUnits = [
         mediaTypes: {
             video: {
                 context: 'instream',
-                playerSize: [640, 480]
+                playerSize: [640, 480],
+                api: [2],
+                protocols: [1, 2],
+                mimes: ['video/mp4']
             }
         },
         bids: [{
             bidder: "conversant",
             params: {
                 site_id: '108060',
-                api: [2],
-                protocols: [1, 2],
-                white_label_url: 'https://web.hb.ad.cpe.dotomi.com/s2s/header/24',
-                mimes: ['video/mp4']
+                white_label_url: 'https://web.hb.ad.cpe.dotomi.com/s2s/header/24'
             }
         }]
     }];
diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
index b416c00c2d0..61ccc0e786b 100755
--- a/modules/cpmstarBidAdapter.js
+++ b/modules/cpmstarBidAdapter.js
@@ -13,6 +13,12 @@ const ENDPOINT_PRODUCTION = 'https://server.cpmstar.com/view.aspx';
 const DEFAULT_TTL = 300;
 const DEFAULT_CURRENCY = 'USD';
 
+function fixedEncodeURIComponent(str) {
+  return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+    return '%' + c.charCodeAt(0).toString(16);
+  });
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -47,13 +53,29 @@ export const spec = {
       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=' + utils.getBidIdParameter('placementId', bidRequest.params) +
         '&reachedTop=' + encodeURIComponent(bidderRequest.refererInfo.reachedTop) +
         '&requestid=' + bidRequest.bidId +
         '&referer=' + encodeURIComponent(referer);
 
+      if (bidRequest.schain && bidRequest.schain.nodes) {
+        var schain = bidRequest.schain;
+        var schainString = '';
+        schainString += schain.ver + ',' + schain.complete;
+        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 || '');
+        }
+        url += '&schain=' + schainString
+      }
+
       if (bidderRequest.gdprConsent) {
         if (bidderRequest.gdprConsent.consentString != null) {
           url += '&gdpr_consent=' + bidderRequest.gdprConsent.consentString;
@@ -138,6 +160,21 @@ export const spec = {
     }
 
     return bidResponses;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const syncs = [];
+    if (serverResponses.length == 0 || !serverResponses[0].body) return syncs;
+    var usersyncs = serverResponses[0].body[0].syncs;
+    if (!usersyncs || usersyncs.length < 0) return syncs;
+    for (var i = 0; i < usersyncs.length; i++) {
+      var us = usersyncs[i];
+      if ((us.type === 'image' && syncOptions.pixelEnabled) || (us.type == 'iframe' && syncOptions.iframeEnabled)) {
+        syncs.push(us);
+      }
+    }
+    return syncs;
   }
+
 };
 registerBidder(spec);
diff --git a/modules/craftBidAdapter.js b/modules/craftBidAdapter.js
index 3838f5dee59..0124f96a107 100644
--- a/modules/craftBidAdapter.js
+++ b/modules/craftBidAdapter.js
@@ -7,7 +7,7 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'craft';
-const URL = 'https://gacraft.jp/prebid-v3';
+const URL_BASE = 'https://gacraft.jp/prebid-v3';
 const TTL = 360;
 const storage = getStorageManager();
 
@@ -143,10 +143,11 @@ function formatRequest(payload, bidderRequest) {
       withCredentials: false
     };
   }
+
   const payloadString = JSON.stringify(payload);
   return {
     method: 'POST',
-    url: URL,
+    url: `${URL_BASE}/${payload.tags[0].sitekey}`,
     data: payloadString,
     bidderRequest,
     options
diff --git a/modules/criteoBidAdapter.js b/modules/criteoBidAdapter.js
index 3dabe911884..41cbb0670c8 100644
--- a/modules/criteoBidAdapter.js
+++ b/modules/criteoBidAdapter.js
@@ -8,7 +8,7 @@ import { verify } from 'criteo-direct-rsa-validate/build/verify.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 const GVLID = 91;
-export const ADAPTER_VERSION = 32;
+export const ADAPTER_VERSION = 33;
 const BIDDER_CODE = 'criteo';
 const CDB_ENDPOINT = 'https://bidder.criteo.com/cdb';
 const PROFILE_ID_INLINE = 207;
@@ -28,7 +28,7 @@ export const spec = {
   gvlid: GVLID,
   supportedMediaTypes: [ BANNER, VIDEO, NATIVE ],
 
-  /**
+  /** f
    * @param {object} bid
    * @return {boolean}
    */
@@ -56,10 +56,11 @@ export const spec = {
   buildRequests: (bidRequests, bidderRequest) => {
     let url;
     let data;
+    let fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
 
     Object.assign(bidderRequest, {
-      publisherExt: config.getConfig('fpd.context'),
-      userExt: config.getConfig('fpd.user'),
+      publisherExt: fpd.context,
+      userExt: fpd.user,
       ceh: config.getConfig('criteo.ceh')
     });
 
@@ -79,10 +80,6 @@ export const spec = {
     if (publisherTagAvailable()) {
       // eslint-disable-next-line no-undef
       const adapter = new Criteo.PubTag.Adapters.Prebid(PROFILE_ID_PUBLISHERTAG, ADAPTER_VERSION, bidRequests, bidderRequest, '$prebid.version$');
-      const enableSendAllBids = config.getConfig('enableSendAllBids');
-      if (adapter.setEnableSendAllBids && typeof adapter.setEnableSendAllBids === 'function' && typeof enableSendAllBids === 'boolean') {
-        adapter.setEnableSendAllBids(enableSendAllBids);
-      }
       url = adapter.buildCdbUrl();
       data = adapter.buildCdbRequest();
     } else {
@@ -133,8 +130,6 @@ export const spec = {
         if (slot.native) {
           if (bidRequest.params.nativeCallback) {
             bid.ad = createNativeAd(bidId, slot.native, bidRequest.params.nativeCallback);
-          } else if (config.getConfig('enableSendAllBids') === true) {
-            return;
           } else {
             bid.native = createPrebidNativeAd(slot.native);
             bid.mediaType = NATIVE;
@@ -253,12 +248,14 @@ function buildCdbUrl(context) {
 
 function checkNativeSendId(bidRequest) {
   return !(bidRequest.nativeParams &&
-    ((bidRequest.nativeParams.image && bidRequest.nativeParams.image.sendId !== true) ||
-      (bidRequest.nativeParams.icon && bidRequest.nativeParams.icon.sendId !== true) ||
-      (bidRequest.nativeParams.clickUrl && bidRequest.nativeParams.clickUrl.sendId !== true) ||
-      (bidRequest.nativeParams.displayUrl && bidRequest.nativeParams.displayUrl.sendId !== true) ||
-      (bidRequest.nativeParams.privacyLink && bidRequest.nativeParams.privacyLink.sendId !== true) ||
-      (bidRequest.nativeParams.privacyIcon && bidRequest.nativeParams.privacyIcon.sendId !== true)));
+    (
+      (bidRequest.nativeParams.image && ((bidRequest.nativeParams.image.sendId !== true || bidRequest.nativeParams.image.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.icon && ((bidRequest.nativeParams.icon.sendId !== true || bidRequest.nativeParams.icon.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.clickUrl && ((bidRequest.nativeParams.clickUrl.sendId !== true || bidRequest.nativeParams.clickUrl.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.displayUrl && ((bidRequest.nativeParams.displayUrl.sendId !== true || bidRequest.nativeParams.displayUrl.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.privacyLink && ((bidRequest.nativeParams.privacyLink.sendId !== true || bidRequest.nativeParams.privacyLink.sendTargetingKeys === true))) ||
+        (bidRequest.nativeParams.privacyIcon && ((bidRequest.nativeParams.privacyIcon.sendId !== true || bidRequest.nativeParams.privacyIcon.sendTargetingKeys === true)))
+    ));
 }
 
 /**
@@ -284,8 +281,8 @@ function buildCdbRequest(context, bidRequests, bidderRequest) {
       if (bidRequest.params.zoneId) {
         slot.zoneid = bidRequest.params.zoneId;
       }
-      if (bidRequest.fpd && bidRequest.fpd.context) {
-        slot.ext = bidRequest.fpd.context;
+      if (utils.deepAccess(bidRequest, 'ortb2Imp.ext')) {
+        slot.ext = bidRequest.ortb2Imp.ext;
       }
       if (bidRequest.params.ext) {
         slot.ext = Object.assign({}, slot.ext, bidRequest.params.ext);
@@ -416,6 +413,7 @@ function hasValidVideoMediaType(bidRequest) {
  */
 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,
diff --git a/modules/criteoBidAdapter.md b/modules/criteoBidAdapter.md
index e4c441c758d..68599f05434 100644
--- a/modules/criteoBidAdapter.md
+++ b/modules/criteoBidAdapter.md
@@ -2,7 +2,7 @@
 
 Module Name: Criteo Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: pi-direct@criteo.com
+Maintainer: prebid@criteo.com
 
 # Description
 
diff --git a/modules/criteoIdSystem.js b/modules/criteoIdSystem.js
index c44f0c843ae..ac26d34d529 100644
--- a/modules/criteoIdSystem.js
+++ b/modules/criteoIdSystem.js
@@ -11,25 +11,19 @@ import { getRefererInfo } from '../src/refererDetection.js'
 import { submodule } from '../src/hook.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-export const storage = getStorageManager();
+const gvlid = 91;
+const bidderCode = 'criteo';
+export const storage = getStorageManager(gvlid, bidderCode);
 
 const bididStorageKey = 'cto_bidid';
 const bundleStorageKey = 'cto_bundle';
-const cookieWriteableKey = 'cto_test_cookie';
 const cookiesMaxAge = 13 * 30 * 24 * 60 * 60 * 1000;
 
 const pastDateString = new Date(0).toString();
 const expirationString = new Date(utils.timestamp() + cookiesMaxAge).toString();
 
-function areCookiesWriteable() {
-  storage.setCookie(cookieWriteableKey, '1');
-  const canWrite = storage.getCookie(cookieWriteableKey) === '1';
-  storage.setCookie(cookieWriteableKey, '', pastDateString);
-  return canWrite;
-}
-
 function extractProtocolHost (url, returnOnlyHost = false) {
-  const parsedUrl = utils.parseUrl(url)
+  const parsedUrl = utils.parseUrl(url, {noDecodeWholeURL: true})
   return returnOnlyHost
     ? `${parsedUrl.hostname}`
     : `${parsedUrl.protocol}://${parsedUrl.hostname}${parsedUrl.port ? ':' + parsedUrl.port : ''}/`;
@@ -58,20 +52,22 @@ function getCriteoDataFromAllStorages() {
   }
 }
 
-function buildCriteoUsersyncUrl(topUrl, domain, bundle, areCookiesWriteable, isPublishertagPresent, gdprString) {
+function buildCriteoUsersyncUrl(topUrl, domain, bundle, areCookiesWriteable, isLocalStorageWritable, isPublishertagPresent, gdprString) {
   const url = 'https://gum.criteo.com/sid/json?origin=prebid' +
     `${topUrl ? '&topUrl=' + encodeURIComponent(topUrl) : ''}` +
     `${domain ? '&domain=' + encodeURIComponent(domain) : ''}` +
     `${bundle ? '&bundle=' + encodeURIComponent(bundle) : ''}` +
     `${gdprString ? '&gdprString=' + encodeURIComponent(gdprString) : ''}` +
     `${areCookiesWriteable ? '&cw=1' : ''}` +
-    `${isPublishertagPresent ? '&pbt=1' : ''}`
+    `${isPublishertagPresent ? '&pbt=1' : ''}` +
+    `${isLocalStorageWritable ? '&lsw=1' : ''}`;
 
   return url;
 }
 
 function callCriteoUserSync(parsedCriteoData, gdprString) {
-  const cw = areCookiesWriteable();
+  const cw = storage.cookiesAreEnabled();
+  const lsw = storage.localStorageIsEnabled();
   const topUrl = extractProtocolHost(getRefererInfo().referer);
   const domain = extractProtocolHost(document.location.href, true);
   const isPublishertagPresent = typeof criteo_pubtag !== 'undefined'; // eslint-disable-line camelcase
@@ -81,6 +77,7 @@ function callCriteoUserSync(parsedCriteoData, gdprString) {
     domain,
     parsedCriteoData.bundle,
     cw,
+    lsw,
     isPublishertagPresent,
     gdprString
   );
@@ -101,7 +98,9 @@ function callCriteoUserSync(parsedCriteoData, gdprString) {
       } else if (jsonResponse.bundle) {
         saveOnAllStorages(bundleStorageKey, jsonResponse.bundle);
       }
-    }
+    },
+    undefined,
+    { method: 'GET', contentType: 'application/json', withCredentials: true }
   );
 }
 
@@ -111,7 +110,8 @@ export const criteoIdSubmodule = {
    * used to link submodule with config
    * @type {string}
    */
-  name: 'criteo',
+  name: bidderCode,
+  gvlid: gvlid,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -123,11 +123,11 @@ export const criteoIdSubmodule = {
   /**
    * get the Criteo Id from local storages and initiate a new user sync
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @returns {{id: {criteoId: string} | undefined}}}
    */
-  getId(configParams, consentData) {
+  getId(config, consentData) {
     const hasGdprData = consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies;
     const gdprConsentString = hasGdprData ? consentData.consentString : undefined;
 
diff --git a/modules/datablocksBidAdapter.js b/modules/datablocksBidAdapter.js
index b00a3eae659..47d2eb2652f 100644
--- a/modules/datablocksBidAdapter.js
+++ b/modules/datablocksBidAdapter.js
@@ -68,7 +68,7 @@ export const spec = {
         id: bidRequest.bidId,
         tagid: bidRequest.adUnitCode,
         secure: window.location.protocol == 'https:'
-      }
+      };
 
       if (utils.deepAccess(bidRequest, `mediaTypes.banner`)) {
         let sizes = bidRequest.mediaTypes.banner.sizes;
@@ -76,7 +76,7 @@ export const spec = {
           imp.banner = {
             w: sizes[0][0],
             h: sizes[0][1]
-          }
+          };
         } else if (sizes.length > 1) {
           imp.banner = {
             format: sizes.map(size => ({ w: size[0], h: size[1] }))
@@ -181,7 +181,7 @@ export const spec = {
             if (VIDEO_PARAMS.indexOf(k) > -1) {
               imp.video[k] = bidRequest.params.video[k];
             }
-          })
+          });
         }
       }
       let host = bidRequest.params.host;
diff --git a/modules/decenteradsBidAdapter.js b/modules/decenteradsBidAdapter.js
new file mode 100644
index 00000000000..823a59a3768
--- /dev/null
+++ b/modules/decenteradsBidAdapter.js
@@ -0,0 +1,90 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js'
+import * as utils from '../src/utils.js'
+
+const BIDDER_CODE = 'decenterads'
+const URL = 'https://supply.decenterads.com/?c=o&m=multi'
+const URL_SYNC = 'https://supply.decenterads.com/?c=o&m=cookie'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
+
+  isBidRequestValid: function (opts) {
+    return Boolean(opts.bidId && opts.params && !isNaN(opts.params.placementId))
+  },
+
+  buildRequests: function (validBidRequests) {
+    validBidRequests = validBidRequests || []
+    let winTop = window
+    try {
+      window.top.location.toString()
+      winTop = window.top
+    } catch (e) { utils.logMessage(e) }
+
+    const location = utils.getWindowLocation()
+    const placements = []
+
+    for (let i = 0; i < validBidRequests.length; i++) {
+      const p = validBidRequests[i]
+
+      placements.push({
+        placementId: p.params.placementId,
+        bidId: p.bidId,
+        traffic: p.params.traffic || BANNER
+      })
+    }
+
+    return {
+      method: 'POST',
+      url: URL,
+      data: {
+        deviceWidth: winTop.screen.width,
+        deviceHeight: winTop.screen.height,
+        language: (navigator && navigator.language) ? navigator.language : '',
+        secure: +(location.protocol === 'https:'),
+        host: location.hostname,
+        page: location.pathname,
+        placements: placements
+      }
+    }
+  },
+
+  interpretResponse: function (opts) {
+    const body = opts.body
+    const response = []
+
+    for (let i = 0; i < body.length; i++) {
+      const item = body[i]
+      if (isBidResponseValid(item)) {
+        delete item.mediaType
+        response.push(item)
+      }
+    }
+
+    return response
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses) {
+    return [{ type: 'image', url: URL_SYNC }]
+  }
+}
+
+registerBidder(spec)
+
+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.title && bid.image && bid.impressionTrackers)
+    default:
+      return false
+  }
+}
diff --git a/modules/deepintentBidAdapter.js b/modules/deepintentBidAdapter.js
index c4dc23cf912..a6a6cac6570 100644
--- a/modules/deepintentBidAdapter.js
+++ b/modules/deepintentBidAdapter.js
@@ -49,6 +49,8 @@ export const spec = {
       utils.deepSetValue(openRtbBidRequest, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
     }
 
+    injectEids(openRtbBidRequest, validBidRequests);
+
     return {
       method: 'POST',
       url: BIDDER_ENDPOINT,
@@ -86,6 +88,9 @@ function formatResponse(bid) {
     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',
@@ -128,6 +133,13 @@ function buildUser(bid) {
   }
 }
 
+function injectEids(openRtbBidRequest, validBidRequests) {
+  const bidUserIdAsEids = utils.deepAccess(validBidRequests, '0.userIdAsEids');
+  if (utils.isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
+    utils.deepSetValue(openRtbBidRequest, 'user.eids', bidUserIdAsEids);
+  }
+}
+
 function buildBanner(bid) {
   if (utils.deepAccess(bid, 'mediaTypes.banner')) {
     // Get Sizes from MediaTypes Object, Will always take first size, will be overrided by params for exact w,h
diff --git a/modules/deepintentDpesIdSystem.js b/modules/deepintentDpesIdSystem.js
new file mode 100644
index 00000000000..375c8c07ed1
--- /dev/null
+++ b/modules/deepintentDpesIdSystem.js
@@ -0,0 +1,45 @@
+/**
+ * This module adds DPES to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/deepintentDpesSystem
+ * @requires module:modules/userId
+ */
+
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'deepintentId';
+export const storage = getStorageManager(null, MODULE_NAME);
+
+/** @type {Submodule} */
+export const deepintentDpesSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{value:string}} value
+   * @returns {{deepintentId:Object}}
+   */
+  decode(value, config) {
+    return value ? { 'deepintentId': value } : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData|undefined} consentData
+   * @param {Object} cacheIdObj - existing id, if any
+   * @return {{id: string | undefined} | undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    return cacheIdObj;
+  }
+
+};
+
+submodule('userId', deepintentDpesSubmodule);
diff --git a/modules/deepintentDpesIdSystem.md b/modules/deepintentDpesIdSystem.md
new file mode 100644
index 00000000000..2af0fe7446e
--- /dev/null
+++ b/modules/deepintentDpesIdSystem.md
@@ -0,0 +1,43 @@
+# Deepintent DPES ID
+
+The Deepintent Id  is a shared, healthcare identifier which helps publisher in absence of the 3rd Party cookie matching. This lets publishers set and bid with healthcare identity . Deepintent lets users protect their privacy through advertising value chain, where Healthcare identity when setting the identity takes in consideration of users choices, as well as when passing identity on the cookie itself privacy consent strings are checked. The healthcare identity when set is not stored on Deepintent's servers but is stored on users browsers itself. User can still opt out of the ads by https://option.deepintent.com/adchoices. 
+
+## Deepintent DPES ID Registration
+
+The Deepintent DPES ID is free to use, but requires a simple registration with Deepintent. Please reach to prebid@deepintent.com to get started.
+Once publisher registers with deepintents platform for healthcare identity Deepintent provides the Tag code to be placed on the page, this tag code works to capture and store information as per publishers and users agreement. DPES User ID module uses this stored id and passes it on the deepintent prebid adapter.
+
+
+## Deepintent DPES ID Configuration
+
+First, make sure to add the Deepintent submodule to your Prebid.js package with:
+
+```
+gulp build --modules=deepintentDpesIdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'deepintentId',
+      storage: {
+        type: 'cookie',          
+        name: '_dpes_id',        
+        expires: 90             // storage lasts for 90 days, optional if storage type is html5
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module: `"deepintentId"` | `"deepintentId"` |
+| storage | Required | Object | Storage settings for how the User Id module will cache the Deepintent ID locally | |
+| storage.type | Required | String | This is where the results of the user ID will be stored. Deepintent`"html5"` or `"cookie"`. | `"html5"` |
+| storage.name | Required | String | The name of the local storage where the user ID will be stored. | `"_dpes_id"` |
+| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. Deepintent recommends `90`. | `90` |
\ No newline at end of file
diff --git a/modules/dfpAdServerVideo.js b/modules/dfpAdServerVideo.js
index 031d46c52d0..073abed0d62 100644
--- a/modules/dfpAdServerVideo.js
+++ b/modules/dfpAdServerVideo.js
@@ -8,6 +8,9 @@ import { deepAccess, isEmpty, logError, parseSizesInput, formatQS, parseUrl, bui
 import { config } from '../src/config.js';
 import { getHook, submodule } from '../src/hook.js';
 import { auctionManager } from '../src/auctionManager.js';
+import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
+import events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
 
 /**
  * @typedef {Object} DfpVideoParams
@@ -42,7 +45,7 @@ import { auctionManager } from '../src/auctionManager.js';
 const defaultParamConstants = {
   env: 'vp',
   gdfp_req: 1,
-  output: 'xml_vast3',
+  output: 'vast',
   unviewed_position_start: 1,
 };
 
@@ -82,7 +85,7 @@ export function buildDfpVideoUrl(options) {
 
   const derivedParams = {
     correlator: Date.now(),
-    sz: parseSizesInput(adUnit.sizes).join('|'),
+    sz: parseSizesInput(deepAccess(adUnit, 'mediaTypes.video.playerSize')).join('|'),
     url: encodeURIComponent(location.href),
   };
   const encodedCustomParams = getCustParams(bid, options);
@@ -98,6 +101,16 @@ export function buildDfpVideoUrl(options) {
   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; }
+
   return buildUrl({
     protocol: 'https',
     host: 'securepubads.g.doubleclick.net',
@@ -181,6 +194,16 @@ export function buildAdpodVideoUrl({code, params, callback} = {}) {
       { 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 uspConsent = uspDataHandler.getConsentData();
+    if (uspConsent) { queryParams.us_privacy = uspConsent; }
+
     const masterTag = buildUrl({
       protocol: 'https',
       host: 'securepubads.g.doubleclick.net',
@@ -245,24 +268,30 @@ function getCustParams(bid, options) {
     allTargetingData = (allTargeting) ? allTargeting[adUnit.code] : {};
   }
 
-  const optCustParams = deepAccess(options, 'params.cust_params');
-  let customParams = Object.assign({},
+  const prebidTargetingSet = Object.assign({},
     // Why are we adding standard keys here ? Refer https://github.com/prebid/Prebid.js/issues/3664
     { hb_uuid: bid && bid.videoCacheKey },
     // hb_uuid will be deprecated and replaced by hb_cache_id
     { hb_cache_id: bid && bid.videoCacheKey },
     allTargetingData,
     adserverTargeting,
-    optCustParams,
   );
+
+  events.emit(CONSTANTS.EVENTS.SET_TARGETING, {[adUnit.code]: prebidTargetingSet});
+
+  // merge the prebid + publisher targeting sets
+  const publisherTargetingSet = deepAccess(options, 'params.cust_params');
   // TODO : Remove below function and change the constant value in file to update the key names for video
   // Changing few key name might have impact on banner as well as we ignore few key names , hence using below function
   // to get the cust_params that should be attached to dfp.
   // It will also handle the send allBids cases
+  var customParams = {}
   if (window.PWT && window.PWT.getCustomParamsForDFPVideo) {
-    customParams = window.PWT.getCustomParamsForDFPVideo(optCustParams, bid);
+    customParams = window.PWT.getCustomParamsForDFPVideo(publisherTargetingSet, bid);
   }
-  return encodeURIComponent(formatQS(customParams));
+  // Changing PrebidTargetingSet to adServerTargeitn as for OpenWrap we don't want to set Prebid Keys and instead Set the adServerKeys sent from OpenWrap.
+  const targetingSet = Object.assign({}, adserverTargeting, publisherTargetingSet, customParams);
+  return encodeURIComponent(formatQS(targetingSet));
 }
 
 registerVideoSupport('dfp', {
diff --git a/modules/dgkeywordRtdProvider.js b/modules/dgkeywordRtdProvider.js
new file mode 100644
index 00000000000..58cec36a6b9
--- /dev/null
+++ b/modules/dgkeywordRtdProvider.js
@@ -0,0 +1,134 @@
+/**
+ * This module adds dgkeyword provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will get keywords from 1plux profile api.
+ * This module can work only with AppNexusBidAdapter.
+ * @module modules/dgkeywordProvider
+ * @requires module:modules/realTimeData
+ */
+
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+/**
+ * get keywords from api server. and set keywords.
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
+ * @param {Object} moduleConfig
+ * @param {Object} userConsent
+ */
+export function getDgKeywordsAndSet(reqBidsConfigObj, callback, moduleConfig, userConsent) {
+  const URL = 'https://mediaconsortium.profiles.tagger.opecloud.com/api/v1?url=';
+  const PROFILE_TIMEOUT_MS = 1000;
+  const timeout = (moduleConfig && moduleConfig.params && moduleConfig.params.timeout && Number(moduleConfig.params.timeout) > 0) ? Number(moduleConfig.params.timeout) : PROFILE_TIMEOUT_MS;
+  const url = (moduleConfig && moduleConfig.params && moduleConfig.params.url) ? moduleConfig.params.url : URL + encodeURIComponent(window.location.href);
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  let isFinish = false;
+  utils.logMessage('[dgkeyword sub module]', adUnits, timeout);
+  let setKeywordTargetBidders = getTargetBidderOfDgKeywords(adUnits);
+  if (setKeywordTargetBidders.length <= 0) {
+    utils.logMessage('[dgkeyword sub module] no dgkeyword targets.');
+    callback();
+  } else {
+    utils.logMessage('[dgkeyword sub module] dgkeyword targets:', setKeywordTargetBidders);
+    utils.logMessage('[dgkeyword sub module] get targets from profile api start.');
+    ajax(url, {
+      success: function(response) {
+        const res = JSON.parse(response);
+        if (!isFinish) {
+          utils.logMessage('[dgkeyword sub module] get targets from profile api end.');
+          if (res) {
+            let keywords = {};
+            if (res['s'] != null && res['s'].length > 0) {
+              keywords['opeaud'] = res['s'];
+            }
+            if (res['t'] != null && res['t'].length > 0) {
+              keywords['opectx'] = res['t'];
+            }
+            if (Object.keys(keywords).length > 0) {
+              const targetBidKeys = {}
+              for (let bid of setKeywordTargetBidders) {
+                // set keywords to params
+                bid.params.keywords = keywords;
+                if (!targetBidKeys[bid.bidder]) {
+                  targetBidKeys[bid.bidder] = true;
+                }
+              }
+
+              if (!reqBidsConfigObj._ignoreSetOrtb2) {
+                // set keywrods to ortb2
+                let addOrtb2 = {};
+                utils.deepSetValue(addOrtb2, 'site.keywords', keywords);
+                utils.deepSetValue(addOrtb2, 'user.keywords', keywords);
+                const ortb2 = {ortb2: addOrtb2};
+                reqBidsConfigObj.setBidderConfig({ bidders: Object.keys(targetBidKeys), config: ortb2 });
+              }
+            }
+          }
+          isFinish = true;
+        }
+        callback();
+      },
+      error: function(errorStatus) {
+        // error occur
+        utils.logError('[dgkeyword sub module] profile api access error.', errorStatus);
+        callback();
+      }
+    }, null, {
+      withCredentials: true,
+      contentType: 'application/json',
+    });
+    setTimeout(function () {
+      if (!isFinish) {
+        // profile api timeout
+        utils.logInfo('[dgkeyword sub module] profile api timeout. [timeout: ' + timeout + 'ms]');
+        isFinish = true;
+      }
+      callback();
+    }, timeout);
+  }
+}
+
+/**
+ * get all bidder which hava {dgkeyword: true} in params
+ * @param {Object} adUnits
+ */
+export function getTargetBidderOfDgKeywords(adUnits) {
+  let setKeywordTargetBidders = [];
+  for (let adUnit of adUnits) {
+    for (let bid of adUnit.bids) {
+      if (bid.params && bid.params['dgkeyword'] === true) {
+        delete bid.params['dgkeyword'];
+        setKeywordTargetBidders.push(bid);
+      }
+    }
+  }
+  return setKeywordTargetBidders;
+}
+
+/** @type {RtdSubmodule} */
+export const dgkeywordSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'dgkeyword',
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   * @param {string[]} adUnitsCodes
+   */
+  getBidRequestData: getDgKeywordsAndSet,
+  init: init,
+};
+
+function init(moduleConfig) {
+  return true;
+}
+
+function registerSubModule() {
+  submodule('realTimeData', dgkeywordSubmodule);
+}
+registerSubModule();
diff --git a/modules/dgkeywordRtdProvider.md b/modules/dgkeywordRtdProvider.md
new file mode 100644
index 00000000000..314475b45a8
--- /dev/null
+++ b/modules/dgkeywordRtdProvider.md
@@ -0,0 +1,29 @@
+ ## Integration
+
+1) Compile the Digital Garage Keyword Module and Appnexus Bid Adapter into your Prebid build:  
+
+```
+gulp build --modules="dgkeywordRtdProvider,appnexusBidAdapter,..."  
+```
+
+2) Use `setConfig` to instruct Prebid.js to initilize the dgkeyword module, as specified below.  
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders`  
+
+```javascript
+var DGKEYWORD_TIMEOUT = 1000;
+pbjs.setConfig({
+    realTimeData: {
+        auctionDelay: DGKEYWORD_TIMEOUT,
+        dataProviders: [{
+            name: 'dgkeyword',
+            waitForIt: true,
+            params: {
+                timeout: DGKEYWORD_TIMEOUT
+            }
+        }]
+    }
+});
+```
diff --git a/modules/digiTrustIdSystem.js b/modules/digiTrustIdSystem.js
deleted file mode 100644
index d8aa8be9376..00000000000
--- a/modules/digiTrustIdSystem.js
+++ /dev/null
@@ -1,460 +0,0 @@
-/**
- * This module adds DigiTrust ID support to the User ID module
- * The {@link module:modules/userId} module is required
- * If the full DigiTrust Id library is included the standard functions
- * will be invoked to obtain the user's DigiTrust Id.
- * When the full library is not included this will fall back to the
- * DigiTrust Identity API and generate a mock DigiTrust object.
- * @module modules/digiTrustIdSystem
- * @requires module:modules/userId
- */
-
-import * as utils from '../src/utils.js'
-import { ajax } from '../src/ajax.js';
-import { submodule } from '../src/hook.js';
-import { getStorageManager } from '../src/storageManager.js';
-
-const DT_VENDOR_ID = 64; // cmp gvlVendorId
-const storage = getStorageManager(DT_VENDOR_ID);
-
-var fallbackTimeout = 1550; // timeout value that allows userId system to execute first
-var fallbackTimer = 0; // timer Id for fallback init so we don't double call
-
-/**
- * Checks to see if the DigiTrust framework is initialized.
- * @function
- */
-function isInitialized() {
-  if (window.DigiTrust == null) {
-    return false;
-  }
-  // eslint-disable-next-line no-undef
-  return DigiTrust.isClient; // this is set to true after init
-}
-
-/**
- * Tests for presence of the DigiTrust object
- * */
-function isPresent() {
-  return (window.DigiTrust != null);
-}
-
-var noop = function () {
-};
-
-const MAX_RETRIES = 2;
-const DT_ID_SVC = 'https://prebid.digitru.st/id/v1';
-
-var isFunc = function (fn) {
-  return typeof (fn) === 'function';
-}
-
-var _savedId = null; // closure variable for storing Id to avoid additional requests
-
-function callApi(options) {
-  var ajaxOptions = {
-    method: 'GET',
-    withCredentials: true
-  };
-
-  ajax(
-    DT_ID_SVC,
-    {
-      success: options.success,
-      error: options.fail
-    },
-    null,
-    ajaxOptions
-  );
-}
-
-/**
- * Encode the Id per DigiTrust lib
- * @param {any} id
- */
-function encId(id) {
-  try {
-    if (typeof (id) !== 'string') {
-      id = JSON.stringify(id);
-    }
-    return btoa(id);
-  } catch (ex) {
-    return id;
-  }
-}
-
-/**
- * Writes the Identity into the expected DigiTrust cookie
- * @param {any} id
- */
-function writeDigiId(id) {
-  var key = 'DigiTrust.v1.identity';
-  var date = new Date();
-  date.setTime(date.getTime() + 604800000);
-  storage.setCookie(key, encId(id), date.toUTCString(), 'none');
-}
-
-/**
- * Tests to see if the current browser is FireFox
- */
-function isFirefoxBrowser(ua) {
-  ua = ua || navigator.userAgent;
-  ua = ua.toLowerCase();
-  if (ua.indexOf('firefox') !== -1) {
-    return true;
-  }
-  return false;
-}
-
-/**
- * Test to see if the user has a browser that is disallowed for making AJAX
- * requests due to the behavior not supported DigiTrust ID Cookie.
- */
-function isDisallowedBrowserForApiCall() {
-  if (utils.isSafariBrowser()) {
-    return true;
-  } else if (isFirefoxBrowser()) {
-    return true;
-  }
-  return false;
-}
-
-/**
- * Set up a DigiTrust facade object to mimic the API
- *
- */
-function initDigitrustFacade(config) {
-  clearTimeout(fallbackTimer);
-  fallbackTimer = 0;
-
-  var facade = {
-    isClient: true,
-    isMock: true,
-    _internals: {
-      callCount: 0,
-      initCallback: null
-    },
-    getUser: function (obj, callback) {
-      var isAsync = !!isFunc(callback);
-      var cb = isAsync ? callback : noop;
-      var errResp = { success: false };
-      var inter = facade._internals;
-      inter.callCount++;
-
-      // wrap the initializer callback, if present
-      var checkAndCallInitializeCb = function (idResponse) {
-        if (inter.callCount <= 1 && isFunc(inter.initCallback)) {
-          try {
-            inter.initCallback(idResponse);
-          } catch (ex) {
-            utils.logError('Exception in passed DigiTrust init callback', ex);
-          }
-        }
-      }
-
-      if (!isMemberIdValid(obj.member)) {
-        if (!isAsync) {
-          return errResp
-        } else {
-          cb(errResp);
-          return;
-        }
-      }
-
-      if (_savedId != null) {
-        if (isAsync) {
-          checkAndCallInitializeCb(_savedId);
-          //          cb(_savedId);
-          return;
-        } else {
-          return _savedId;
-        }
-      }
-
-      var opts = {
-        success: function (respText, result) {
-          var idResult = {
-            success: true
-          }
-          try {
-            idResult.identity = JSON.parse(respText);
-            _savedId = idResult; // Save result to the cache variable
-            writeDigiId(respText);
-          } catch (ex) {
-            idResult.success = false;
-            delete idResult.identity;
-          }
-          checkAndCallInitializeCb(idResult);
-        },
-        fail: function (statusErr, result) {
-          utils.logError('DigiTrustId API error: ' + statusErr);
-        }
-      }
-
-      // check gdpr vendor here. Full DigiTrust library has vendor check built in
-      gdprConsent.hasConsent(null, function (hasConsent) {
-        if (hasConsent) {
-          if (isDisallowedBrowserForApiCall()) {
-            let resultObj = {
-              success: false,
-              err: 'Your browser does not support DigiTrust Identity'
-            }
-            checkAndCallInitializeCb(resultObj);
-            return;
-          }
-          callApi(opts);
-        }
-      })
-
-      if (!isAsync) {
-        return errResp; // even if it will be successful later, without a callback we report a "failure in this moment"
-      }
-    }
-  }
-
-  if (config && isFunc(config.callback)) {
-    facade._internals.initCallback = config.callback;
-  }
-
-  if (window && window.DigiTrust == null) {
-    window.DigiTrust = facade;
-  }
-}
-
-/**
- * Tests to see if a member ID is valid within facade
- * @param {any} memberId
- */
-var isMemberIdValid = function (memberId) {
-  if (memberId && memberId.length > 0) {
-    return true;
-  } else {
-    utils.logError('[DigiTrust Prebid Client Error] Missing member ID, add the member ID to the function call options');
-    return false;
-  }
-};
-
-/**
- * DigiTrust consent handler for GDPR and __cmp.
- * */
-var gdprConsent = {
-  hasConsent: function (options, consentCb) {
-    options = options || { consentTimeout: 1500 };
-    var stopTimer;
-    var processed = false;
-    var consentAnswer = false;
-    if (typeof (window.__cmp) !== 'undefined') {
-      stopTimer = setTimeout(function () {
-        consentAnswer = false;
-        processed = true;
-        consentCb(consentAnswer);
-      }, options.consentTimeout);
-
-      window.__cmp('ping', null, function(pingAnswer) {
-        if (pingAnswer.gdprAppliesGlobally) {
-          window.__cmp('getVendorConsents', [DT_VENDOR_ID], function (result) {
-            if (processed) { return; } // timeout before cmp answer, cancel
-            clearTimeout(stopTimer);
-            var myconsent = result.vendorConsents[DT_VENDOR_ID];
-            consentCb(myconsent);
-          });
-        } else {
-          if (processed) { return; } // timeout before cmp answer, cancel
-          clearTimeout(stopTimer);
-          consentAnswer = true;
-          consentCb(consentAnswer);
-        }
-      });
-    } else {
-      // __cmp library is not preset.
-      // ignore this check and rely on id system GDPR consent management
-      consentAnswer = true;
-      consentCb(consentAnswer);
-    }
-  }
-}
-
-/**
- * Encapsulation of needed info for the callback return.
- *
- * @param {any} opts
- */
-var ResultWrapper = function (opts) {
-  var me = this;
-  this.idObj = null;
-
-  var idSystemFn = null;
-
-  /**
-   * Callback method that is passed back to the userId module.
-   *
-   * @param {function} callback
-   */
-  this.userIdCallback = function (callback) {
-    idSystemFn = callback;
-    if (me.idObj == null) {
-      me.idObj = _savedId;
-    }
-
-    if (me.idObj != null && isFunc(callback)) {
-      callback(wrapIdResult());
-    }
-  }
-
-  /**
-   * Return a wrapped result formatted for userId system
-   */
-  function wrapIdResult() {
-    if (me.idObj == null) {
-      me.idObj = _savedId;
-    }
-
-    if (me.idObj == null) {
-      return null;
-    }
-
-    var cp = me.configParams;
-    var exp = (cp && cp.storage && cp.storage.expires) || 60;
-
-    var rslt = {
-      data: null,
-      expires: exp
-    };
-    if (me.idObj && me.idObj.success && me.idObj.identity) {
-      rslt.data = me.idObj.identity;
-    } else {
-      rslt.err = 'Failure getting id';
-    }
-
-    return rslt;
-  }
-
-  this.retries = 0;
-  this.retryId = 0;
-
-  this.executeIdRequest = function (configParams) {
-    // eslint-disable-next-line no-undef
-    DigiTrust.getUser({ member: 'prebid' }, function (idResult) {
-      me.idObj = idResult;
-      var cb = function () {
-        if (isFunc(idSystemFn)) {
-          idSystemFn(wrapIdResult());
-        }
-      }
-
-      cb();
-      if (configParams && configParams.callback && isFunc(configParams.callback)) {
-        try {
-          configParams.callback(idResult);
-        } catch (ex) {
-          utils.logError('Failure in DigiTrust executeIdRequest', ex);
-        }
-      }
-    });
-  }
-}
-
-// An instance of the result wrapper object.
-var resultHandler = new ResultWrapper();
-
-/*
- * Internal implementation to get the Id and trigger callback
- */
-function getDigiTrustId(configParams) {
-  if (resultHandler.configParams == null) {
-    resultHandler.configParams = configParams;
-  }
-
-  // First see if we should initialize DigiTrust framework
-  if (isPresent() && !isInitialized()) {
-    initializeDigiTrust(configParams);
-    resultHandler.retryId = setTimeout(function () {
-      getDigiTrustId(configParams);
-    }, 100 * (1 + resultHandler.retries++));
-    return resultHandler.userIdCallback;
-  } else if (!isInitialized()) { // Second see if we should build a facade object
-    if (resultHandler.retries >= MAX_RETRIES) {
-      initDigitrustFacade(configParams); // initialize a facade object that relies on the AJAX call
-      resultHandler.executeIdRequest(configParams);
-    } else {
-      // use expanding envelope
-      if (resultHandler.retryId != 0) {
-        clearTimeout(resultHandler.retryId);
-      }
-      resultHandler.retryId = setTimeout(function () {
-        getDigiTrustId(configParams);
-      }, 100 * (1 + resultHandler.retries++));
-    }
-    return resultHandler.userIdCallback;
-  } else { // Third get the ID
-    resultHandler.executeIdRequest(configParams);
-    return resultHandler.userIdCallback;
-  }
-}
-
-function initializeDigiTrust(config) {
-  utils.logInfo('Digitrust Init');
-  var dt = window.DigiTrust;
-  if (dt && !dt.isClient && config != null) {
-    dt.initialize(config.init, config.callback);
-  } else if (dt == null) {
-    // Assume we are already on a delay and DigiTrust is not on page
-    initDigitrustFacade(config);
-  }
-}
-
-var testHook = {};
-
-/**
- * Exposes the test hook object by attaching to the digitrustIdModule.
- * This method is called in the unit tests to surface internals.
- */
-export function surfaceTestHook() {
-  digiTrustIdSubmodule['_testHook'] = testHook;
-  return testHook;
-}
-
-testHook.initDigitrustFacade = initDigitrustFacade; // expose for unit tests
-testHook.gdpr = gdprConsent;
-
-/** @type {Submodule} */
-export const digiTrustIdSubmodule = {
-  /**
-   * used to link submodule with config
-   * @type {string}
-   */
-  name: 'digitrust',
-  /**
-   * decode the stored id value for passing to bid requests
-   * @function
-   * @param {string} value
-   * @returns {{pubcid:string}}
-   */
-  decode: function (idData) {
-    try {
-      return { 'digitrustid': idData };
-    } catch (e) {
-      utils.logError('DigiTrust ID submodule decode error');
-    }
-  },
-  getId: function (configParams) {
-    return {callback: getDigiTrustId(configParams)};
-  },
-  _testInit: surfaceTestHook
-};
-
-// check for fallback init of DigiTrust
-function fallbackInit() {
-  if (resultHandler.retryId == 0 && !isInitialized()) {
-    // this triggers an init
-    var conf = {
-      member: 'fallback',
-      callback: noop
-    };
-    getDigiTrustId(conf);
-  }
-}
-
-fallbackTimer = setTimeout(fallbackInit, fallbackTimeout);
-
-submodule('userId', digiTrustIdSubmodule);
diff --git a/modules/digiTrustIdSystem.md b/modules/digiTrustIdSystem.md
deleted file mode 100644
index c0b274d3292..00000000000
--- a/modules/digiTrustIdSystem.md
+++ /dev/null
@@ -1,156 +0,0 @@
-## DigiTrust Universal Id Integration
-
-Setup
------
-The DigiTrust Id integration for Prebid may be used with or without the full
-DigiTrust library. This is an optional module that must be used in conjunction
-with the userId module.
-
-See the [Prebid Integration Guide for DigiTrust](https://github.com/digi-trust/dt-cdn/wiki/Prebid-Integration-for-DigiTrust-Id)
-and the [DigiTrust wiki](https://github.com/digi-trust/dt-cdn/wiki)
-for further instructions.
-
-
-## Example Prebid Configuration for Digitrust Id
-```
-        pbjs.que.push(function() {
-            pbjs.setConfig({
-                usersync: {
-                    userIds: [{
-						name: "digitrust",
-						params: {
-							init: {
-								member: 'example_member_id',
-								site: 'example_site_id'
-							},
-							callback: function (digiTrustResult) {
-							// This callback method is optional and used for error handling
-							// in many if not most cases.
-							/*
-								if (digiTrustResult.success) {
-									// Success in Digitrust init;
-									// 'DigiTrust Id (encrypted): ' + digiTrustResult.identity.id;
-								}
-								else {
-									// Digitrust init failed
-								}
-							*/
-							}
-						},
-						storage: {
-							type: "html5",
-							name: "pbjsdigitrust",
-							expires: 60
-						}
-					}]
-                }
-            });
-            pbjs.addAdUnits(adUnits);
-            pbjs.requestBids({
-                bidsBackHandler: sendAdserverRequest
-            });
-        });
-
-```
-
-
-## Building Prebid with DigiTrust Support
-Your Prebid build must include the modules for both **userId** and **digitrustIdLoader**. Follow the build instructions for Prebid as
-explained in the top level README.md file of the Prebid source tree.
-
-ex: $ gulp build --modules=userId,digitrustIdLoader
-
-### Step by step Prebid build instructions for DigiTrust 
-
-1. Download the Prebid source from [Prebid Git Repo](https://github.com/prebid/Prebid.js)
-2. Set up your environment as outlined in the [Readme File](https://github.com/prebid/Prebid.js/blob/master/README.md#Build)
-3. Execute the build command either with all modules or with the `userId` and `digitrustIdLoader` modules.
-   ```
-   $ gulp build --modules=userId,digitrustIdLoader
-   ```
-4. (Optional) Concatenate the DigiTrust source code to the end of your `prebid.js` file for a single source distribution.
-5. Upload the resulting source file to your CDN.
-
-
-## Deploying Prebid with DigiTrust ID support
-**Precondition:** You must be a DigiTrust member and have registered through the [DigiTrust Signup Process](http://www.digitru.st/signup/).
-Your assigned publisher ID will be required in the configuration settings for all deployment scenarios.
-
-There are three supported approaches to deploying the Prebid-integrated DigiTrust package:
-
-* "Bare bones" deployment using only the integrated DigiTrust module code.
-* Full DigiTrust with CDN referenced DigiTrust.js library.
-* Full DigiTrust packaged with Prebid or site js.
-
-### Bare Bones Deployment
-
-This deployment results in the smallest Javascript package and is the simplest deployment. 
-It is appropriate for testing or deployments where simplicity is key. This approach
-utilizes the REST API for ID generation. While there is less Javascript in use,
-the user may experience more network requests than the scenarios that include the full
-DigiTrust library.
-
-1. Build your Prebid package as above, skipping step 4.
-2. Add the DigiTrust initializer section to your Prebid initialization object as below, 
-   using your Member ID and Site ID.
-3. Add a reference to your Prebid package and the initialization code on all pages you wish
-   to utilize Prebid with integrated DigiTrust ID.
-
-
-
-
-### Full DigiTrust with CDN referenced DigiTrust library
-
-Both "Full DigiTrust" deployments will result in a larger initial Javascript payload.
-The end user may experience fewer overall network requests as the encrypted and anonymous
-DigiTrust ID can often be generated fully in client-side code. Utilizing the CDN reference
-to the official DigiTrust distribution insures you will be running the latest version of the library.
-
-The Full DigiTrust deployment is designed to work with both new DigiTrust with Prebid deployments, and with
-Prebid deployments by existing DigiTrust members. This allows you to migrate your code more slowly
-without losing DigiTrust support in the process.
-
-1. Deploy your built copy of `prebid.js` to your CDN.
-2. On each page reference both your `prebid.js` and a copy of the **DigiTrust** library. 
-   This may either be a copy downloaded from the [DigiTrust CDN](https://cdn.digitru.st/prod/1/digitrust.min.js) to your CDN, 
-   or directly referenced from the URL https://cdn.digitru.st/prod/1/digitrust.min.js. These may be added to the page in any order.
-3. Add a configuration section for Prebid that includes the `usersync` settings and the `digitrust` settings.
-
-### Full DigiTrust packaged with Prebid
-
-
-1. Deploy your built copy of `prebid.js` to your CDN. Be sure to perform *Step 4* of the build to concatenate or 
-   integrate the full DigiTrust library code with your Prebid package.
-2. On each page reference your `prebid.js`
-3. Add a configuration section for Prebid that includes the `usersync` settings and the `digitrust` settings. 
-   This code may also be appended to your Prebid package or placed in other initialization methods.
-
-
-
-## Parameter Descriptions for the `usersync` Configuration Section
-The below parameters apply only to the DigiTrust ID integration.
-
-| Param under usersync.userIds[] | Scope | Type | Description | Example |
-| --- | --- | --- | --- | --- |
-| name | Required | String | ID value for the DigiTrust module - `"digitrust"` | `"digitrust"` |
-| params | Required | Object | Details for DigiTrust initialization. | |
-| params.init | Required | Object | Initialization parameters, including the DigiTrust Publisher ID and Site ID. |  |
-| params.init.member | Required | String | DigiTrust Publisher Id | "A897dTzB" |
-| params.init.site | Required | String | DigiTrust Site Id | "MM2123" |
-| params.callback | Optional | Function | Callback method to fire after initialization of the DigiTrust framework. The argument indicates failure and success and the identity object upon success. |  |
-| 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. | `"pbjsdigitrust"` |
-| storage.expires | Optional | Integer | How long (in days) the user ID information will be stored. Default is 30 for UnifiedId and 1825 for PubCommonID | `365` |
-| value | Optional | Object | Used only if the page has a separate mechanism for storing the Unified 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 | `{"tdid": "D6885E90-2A7A-4E0F-87CB-7734ED1B99A3"}` |
-
-
-
-## Further Reading
-
-+ [DigiTrust Home Page](http://digitru.st)
-
-+ [DigiTrust integration guide](https://github.com/digi-trust/dt-cdn/wiki/Integration-Guide)
-
-+ [DigiTrust ID Encryption](https://github.com/digi-trust/dt-cdn/wiki/ID-encryption)
-
diff --git a/modules/districtmDMXBidAdapter.js b/modules/districtmDMXBidAdapter.js
index 03dca0b607d..ec0a0a2f2e6 100644
--- a/modules/districtmDMXBidAdapter.js
+++ b/modules/districtmDMXBidAdapter.js
@@ -1,46 +1,71 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import {config} from '../src/config.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'districtmDMX';
 
 const DMXURI = 'https://dmx.districtm.io/b/v1';
 
+const GVLID = 144;
+const VIDEO_MAPPING = {
+  playback_method: {
+    'auto_play_sound_on': 1,
+    'auto_play_sound_off': 2,
+    'click_to_play': 3,
+    'mouse_over': 4,
+    'viewport_sound_on': 5,
+    'viewport_sound_off': 6
+  }
+};
 export const spec = {
   code: BIDDER_CODE,
-  supportedFormat: ['banner'],
+  gvlid: GVLID,
+  aliases: ['dmx'],
+  supportedFormat: [BANNER, VIDEO],
+  supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid(bid) {
-    return !!(bid.params.dmxid && bid.params.memberid);
+    return !!(bid.params.memberid);
   },
   interpretResponse(response, bidRequest) {
     response = response.body || {};
     if (response.seatbid) {
       if (utils.isArray(response.seatbid)) {
-        const {seatbid} = response;
+        const { seatbid } = response;
         let winners = seatbid.reduce((bid, ads) => {
-          let ad = ads.bid.reduce(function(oBid, nBid) {
+          let ad = ads.bid.reduce(function (oBid, nBid) {
             if (oBid.price < nBid.price) {
               const bid = matchRequest(nBid.impid, bidRequest);
-              const {width, height} = defaultSize(bid);
+              const { width, height } = defaultSize(bid);
               nBid.cpm = parseFloat(nBid.price).toFixed(2);
               nBid.bidId = nBid.impid;
               nBid.requestId = nBid.impid;
               nBid.width = nBid.w || width;
               nBid.height = nBid.h || height;
+              nBid.ttl = 300;
+              nBid.mediaType = bid.mediaTypes && bid.mediaTypes.video ? 'video' : 'banner';
+              if (nBid.mediaType === 'video') {
+                nBid.vastXml = cleanVast(nBid.adm, nBid.nurl);
+                nBid.ttl = 3600;
+              }
               if (nBid.dealid) {
                 nBid.dealId = nBid.dealid;
               }
+              nBid.uuid = nBid.bidId;
               nBid.ad = nBid.adm;
               nBid.netRevenue = true;
               nBid.creativeId = nBid.crid;
               nBid.currency = 'USD';
-              nBid.ttl = 60;
+              nBid.meta = nBid.meta || {};
+              if (nBid.adomain && nBid.adomain.length > 0) {
+                nBid.meta.advertiserDomains = nBid.adomain;
+              }
               return nBid;
             } else {
               oBid.cpm = oBid.price;
               return oBid;
             }
-          }, {price: 0});
+          }, { price: 0 });
           if (ad.adm) {
             bid.push(ad)
           }
@@ -77,18 +102,25 @@ export const spec = {
       let params = config.getConfig('dmx');
       dmxRequest.user = params.user || {};
       let site = params.site || {};
-      dmxRequest.site = {...dmxRequest.site, ...site}
+      dmxRequest.site = { ...dmxRequest.site, ...site }
     } catch (e) {
 
     }
 
     let eids = [];
-    if (bidRequest && bidRequest.userId) {
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.digitrustid.data.id`), 'digitru.st', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid.org', 1);
-      bindUserId(eids, utils.deepAccess(bidRequest, `userId.tdid`), 'adserver.org', 1);
+    if (bidRequest[0] && bidRequest[0].userId) {
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.idl_env`), 'liveramp.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.id5id.uid`), 'id5-sync.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.pubcid`), 'pubcid.org', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.tdid`), 'adserver.org', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.criteoId`), 'criteo.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.britepoolid`), 'britepool.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.lipb.lipbid`), 'liveintent.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.intentiqid`), 'intentiq.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.lotamePanoramaId`), 'lotame.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.parrableId`), 'parrable.com', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.netId`), 'netid.de', 1);
+      bindUserId(eids, utils.deepAccess(bidRequest[0], `userId.sharedid`), 'sharedid.org', 1);
       dmxRequest.user = dmxRequest.user || {};
       dmxRequest.user.ext = dmxRequest.user.ext || {};
       dmxRequest.user.ext.eids = eids;
@@ -100,9 +132,12 @@ export const spec = {
       dmxRequest.regs = {};
       dmxRequest.regs.ext = {};
       dmxRequest.regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0;
-      dmxRequest.user = {};
-      dmxRequest.user.ext = {};
-      dmxRequest.user.ext.consent = bidderRequest.gdprConsent.consentString;
+
+      if (bidderRequest.gdprConsent.gdprApplies === true) {
+        dmxRequest.user = {};
+        dmxRequest.user.ext = {};
+        dmxRequest.user.ext.consent = bidderRequest.gdprConsent.consentString;
+      }
     }
     dmxRequest.regs = dmxRequest.regs || {};
     dmxRequest.regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
@@ -116,20 +151,37 @@ export const spec = {
       dmxRequest.source = {};
       dmxRequest.source.ext = {};
       dmxRequest.source.ext.schain = schain || {}
-    } catch (e) {}
+    } catch (e) { }
     let tosendtags = bidRequest.map(dmx => {
       var obj = {};
       obj.id = dmx.bidId;
-      obj.tagid = String(dmx.params.dmxid);
+      obj.tagid = String(dmx.params.dmxid || dmx.adUnitCode);
       obj.secure = 1;
-      obj.banner = {
-        topframe: 1,
-        w: cleanSizes(dmx.sizes, 'w'),
-        h: cleanSizes(dmx.sizes, 'h'),
-        format: cleanSizes(dmx.sizes).map(s => {
-          return {w: s[0], h: s[1]};
-        }).filter(obj => typeof obj.w === 'number' && typeof obj.h === 'number')
-      };
+      obj.bidfloor = getFloor(dmx);
+      if (dmx.mediaTypes && dmx.mediaTypes.video) {
+        obj.video = {
+          topframe: 1,
+          skip: dmx.mediaTypes.video.skip || 0,
+          linearity: dmx.mediaTypes.video.linearity || 1,
+          minduration: dmx.mediaTypes.video.minduration || 5,
+          maxduration: dmx.mediaTypes.video.maxduration || 60,
+          playbackmethod: dmx.mediaTypes.video.playbackmethod || [2],
+          api: getApi(dmx.mediaTypes.video),
+          mimes: dmx.mediaTypes.video.mimes || ['video/mp4'],
+          protocols: getProtocols(dmx.mediaTypes.video),
+          h: dmx.mediaTypes.video.playerSize[0][1],
+          w: dmx.mediaTypes.video.playerSize[0][0]
+        };
+      } else {
+        obj.banner = {
+          topframe: 1,
+          w: cleanSizes(dmx.sizes, 'w'),
+          h: cleanSizes(dmx.sizes, 'h'),
+          format: cleanSizes(dmx.sizes).map(s => {
+            return { w: s[0], h: s[1] };
+          }).filter(obj => typeof obj.w === 'number' && typeof obj.h === 'number')
+        };
+      }
       return obj;
     });
 
@@ -169,6 +221,27 @@ export const spec = {
   }
 }
 
+export function getFloor(bid) {
+  let floor = null;
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: bid.mediaTypes.video ? 'video' : 'banner',
+      size: bid.sizes.map(size => {
+        return {
+          w: size[0],
+          h: size[1]
+        }
+      })
+    });
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
+      floor = parseFloat(floorInfo.floor);
+    }
+  }
+  return floor !== null ? floor : bid.params.floor;
+}
+
 export function cleanSizes(sizes, value) {
   const supportedSize = [
     {
@@ -228,7 +301,7 @@ export function shuffle(sizes, list) {
     }
     results.push(current);
     results = list.filter(l => results.map(r => `${r[0]}x${r[1]}`).indexOf(`${l.size[0]}x${l.size[1]}`) !== -1);
-    results = results.sort(function(a, b) {
+    results = results.sort(function (a, b) {
       return b.s - a.s;
     })
     return results.map(r => r.size);
@@ -274,7 +347,7 @@ export function upto5(allimps, dmxRequest, bidderRequest, DMXURI) {
  *
  */
 export function matchRequest(id, bidRequest) {
-  const {bids} = bidRequest.bidderRequest;
+  const { bids } = bidRequest.bidderRequest;
   const [returnValue] = bids.filter(bid => bid.bidId === id);
   return returnValue;
 }
@@ -290,7 +363,7 @@ export function checkDeepArray(Arr) {
   }
 }
 export function defaultSize(thebidObj) {
-  const {sizes} = thebidObj;
+  const { sizes } = thebidObj;
   const returnObject = {};
   returnObject.width = checkDeepArray(sizes)[0];
   returnObject.height = checkDeepArray(sizes)[1];
@@ -310,4 +383,52 @@ export function bindUserId(eids, value, source, atype) {
     })
   }
 }
+
+export function getApi({ api }) {
+  let defaultValue = [2];
+  if (api && Array.isArray(api) && api.length > 0) {
+    return api
+  } else {
+    return defaultValue;
+  }
+}
+export function getPlaybackmethod(playback) {
+  if (Array.isArray(playback) && playback.length > 0) {
+    return playback.map(label => {
+      return VIDEO_MAPPING.playback_method[label]
+    })
+  }
+  return [2]
+}
+
+export function getProtocols({ protocols }) {
+  let defaultValue = [2, 3, 5, 6, 7, 8];
+  if (protocols && Array.isArray(protocols) && protocols.length > 0) {
+    return protocols;
+  } else {
+    return defaultValue;
+  }
+}
+
+export function cleanVast(str, nurl) {
+  try {
+    const toberemove = /]*?src\s*=\s*['\"]([^'\"]*?)['\"][^>]*?>/
+    const [img, url] = str.match(toberemove)
+    str = str.replace(toberemove, '')
+    if (img) {
+      if (url) {
+        const insrt = ``
+        str = str.replace('', `${insrt}`)
+      }
+    }
+    return str;
+  } catch (e) {
+    if (!nurl) {
+      return str
+    }
+    const insrt = ``
+    str = str.replace('', `${insrt}`)
+    return str
+  }
+}
 registerBidder(spec);
diff --git a/modules/districtmDmxBidAdapter.md b/modules/districtmDmxBidAdapter.md
index 792cf2e7305..5d5dd2affe6 100644
--- a/modules/districtmDmxBidAdapter.md
+++ b/modules/districtmDmxBidAdapter.md
@@ -20,13 +20,14 @@ The `districtmDmxAdapter` module allows publishers to include DMX Exchange deman
  ## Media Types
  
 * Banner
-
+* Video
 ## Bidder Parameters
 
 | Key | Scope | Type | Description
 | --- | --- | --- | ---
 | `dmxid` | Mandatory | Integer | Unique identifier of the placement, dmxid can be obtained in the district m Boost platform.
 | `memberid` | Mandatory | Integer | Unique identifier for your account, memberid can be obtained in the district m Boost platform.
+| `floor` | Optional | float | Most placement can have floor set in our platform, but this can now be set on the request too.
 
 # Ad Unit Configuration Example
 
@@ -48,6 +49,35 @@ The `districtmDmxAdapter` module allows publishers to include DMX Exchange deman
     }];
 ```
 
+# Ad Unit Configuration Example for video request
+
+```javascript
+        var videoAdUnit = {
+            code: 'video1',
+            sizes: [640,480],
+            mediaTypes: { video: {context: 'instream', //or 'outstream'
+                    playerSize: [[640, 480]],
+                    skipppable: true,
+                    minduration: 5,
+                    maxduration: 45,
+                    playback_method: ['auto_play_sound_off', 'viewport_sound_off'],
+                    mimes: ["application/javascript",
+                        "video/mp4"],
+
+                } },
+            bids: [
+                {
+                    bidder: 'districtmDMX',
+                    params: {
+                        dmxid: '100001',
+                        memberid: '100003',
+                    }
+                }
+         
+            ]
+        };
+```
+
 
 # Ad Unit Configuration when COPPA is needed
 
@@ -117,6 +147,35 @@ Our demand and adapter supports multiple sizes per placement, as such a single d
     }];
 ```
 
+Our bidder only supports instream context at the moment and we strongly like to put the media types and setting in the ad unit settings.
+If no value is set the default value will be applied.
+
+```javascript
+        var videoAdUnit = {
+            code: 'video1',
+            sizes: [640,480],
+            mediaTypes: { video: {context: 'instream', //or 'outstream'
+                    playerSize: [[640, 480]],
+                    skipppable: true,
+                    minduration: 5,
+                    maxduration: 45,
+                    playback_method: ['auto_play_sound_off', 'viewport_sound_off'],
+                    mimes: ["application/javascript",
+                        "video/mp4"],
+
+                } },
+            bids: [
+                {
+                    bidder: 'districtmDMX',
+                    params: {
+                        dmxid: '250258',
+                        memberid: '100600',
+                    }
+                }
+            ]
+        };
+```
+
 ###### 4. Implementation Checking
 
 Once the bidder is live in your Prebid configuration you may confirm it is making requests to our end point by looking for requests to `https://dmx.districtm.io/b/v1`. 
diff --git a/modules/dmdIdSystem.js b/modules/dmdIdSystem.js
new file mode 100644
index 00000000000..7cf7b9fac95
--- /dev/null
+++ b/modules/dmdIdSystem.js
@@ -0,0 +1,58 @@
+/**
+ * This module adds dmdId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/dmdIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+
+/** @type {Submodule} */
+export const dmdIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'dmdId',
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @returns {(Object|undefined)}
+   */
+  decode(value) {
+    return value && typeof value === 'string'
+      ? { 'dmdId': value }
+      : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function getId
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData}
+   * @param {Object} cacheIdObj - existing id, if any consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    try {
+      const configParams = (config && config.params) || {};
+      if (
+        !configParams ||
+        !configParams.api_key ||
+        typeof configParams.api_key !== 'string'
+      ) {
+        utils.logError('dmd submodule requires an api_key.');
+        return;
+      } else {
+        return cacheIdObj;
+      }
+    } catch (e) {
+      utils.logError(`dmdIdSystem encountered an error`, e);
+    }
+  },
+};
+
+submodule('userId', dmdIdSubmodule);
diff --git a/modules/dmdIdSystem.md b/modules/dmdIdSystem.md
new file mode 100644
index 00000000000..f2a5b76ade7
--- /dev/null
+++ b/modules/dmdIdSystem.md
@@ -0,0 +1,26 @@
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'dmdId',
+            storage: {
+                name: 'dmd-dgid',
+                type: 'cookie',
+                expires: 30
+            },
+            params: {
+                api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c', // provided by DMD
+            }
+        }]
+    }
+});
+
+#### DMD ID Configuration
+
+{: .table .table-bordered .table-striped }
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of Module | `"dmdId"` |
+| storage | Required | Object |  |
+| storage.name | Required | String | `dmd-dgid` |
+| params | Required | Object | Container of all module params. |  |
+| params.api_key | Required | String | This is your `api_key` as provided by DMD Marketing Corp. | `3fdbe297-3690-4f5c-9e11-ee9186a6d77c` |
\ No newline at end of file
diff --git a/modules/docereeBidAdapter.js b/modules/docereeBidAdapter.js
new file mode 100644
index 00000000000..f9f3e1bcc70
--- /dev/null
+++ b/modules/docereeBidAdapter.js
@@ -0,0 +1,65 @@
+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';
+const BIDDER_CODE = 'doceree';
+const END_POINT = 'https://bidder.doceree.com'
+
+export const spec = {
+  code: BIDDER_CODE,
+  url: '',
+  supportedMediaTypes: [ BANNER ],
+
+  isBidRequestValid: (bid) => {
+    const { placementId } = bid.params;
+    return !!placementId
+  },
+  buildRequests: (validBidRequests) => {
+    const serverRequests = [];
+    const { data } = config.getConfig('doceree.user')
+    const { page, domain, token } = config.getConfig('doceree.context')
+    const encodedUserInfo = window.btoa(encodeURIComponent(JSON.stringify(data)))
+
+    validBidRequests.forEach(function(validBidRequest) {
+      const { publisherUrl, placementId } = validBidRequest.params;
+      const url = publisherUrl || page
+      let queryString = '';
+      queryString = utils.tryAppendQueryString(queryString, 'id', placementId);
+      queryString = utils.tryAppendQueryString(queryString, 'publisherDomain', domain);
+      queryString = utils.tryAppendQueryString(queryString, 'pubRequestedURL', encodeURIComponent(url));
+      queryString = utils.tryAppendQueryString(queryString, 'loggedInUser', encodedUserInfo);
+      queryString = utils.tryAppendQueryString(queryString, 'currentUrl', url);
+      queryString = utils.tryAppendQueryString(queryString, 'prebidjs', true);
+      queryString = utils.tryAppendQueryString(queryString, 'token', token);
+      queryString = utils.tryAppendQueryString(queryString, 'requestId', validBidRequest.bidId);
+
+      serverRequests.push({
+        method: 'GET',
+        url: END_POINT + '/v1/adrequest?' + queryString
+      })
+    })
+    return serverRequests;
+  },
+  interpretResponse: (serverResponse, request) => {
+    const responseJson = serverResponse ? serverResponse.body : {};
+    const placementId = responseJson.DIVID;
+    const bidResponse = {
+      ad: responseJson.sourceHTML,
+      width: Number(responseJson.width),
+      height: Number(responseJson.height),
+      requestId: responseJson.guid,
+      netRevenue: true,
+      ttl: 30,
+      cpm: responseJson.cpmBid,
+      currency: responseJson.currency,
+      mediaType: 'banner',
+      creativeId: placementId,
+      meta: {
+        advertiserDomains: [responseJson.advertiserDomain]
+      }
+    };
+    return [bidResponse];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/docereeBidAdapter.md b/modules/docereeBidAdapter.md
new file mode 100644
index 00000000000..d977e11f40a
--- /dev/null
+++ b/modules/docereeBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: Doceree Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: sourbh.gupta@doceree.com
+```
+
+
+Connects to Doceree demand source to fetch bids.  
+Please use ```doceree``` as the bidder code. 
+
+
+# Test Parameters
+```
+var adUnits = [
+   {
+       code: 'doceree',
+       sizes: [
+          [300, 250]
+       ],
+       bids: [
+           {
+               bidder: "doceree",
+               params: {
+                    placementId: 'DOC_7jm9j5eqkl0xvc5w', //required
+                    publisherUrl: document.URL || window.location.href, //optional
+               }
+            }
+       ]
+   }
+];
+```
diff --git a/modules/dspxBidAdapter.js b/modules/dspxBidAdapter.js
index d05549601e1..9f17b69fb02 100644
--- a/modules/dspxBidAdapter.js
+++ b/modules/dspxBidAdapter.js
@@ -7,9 +7,11 @@ const BIDDER_CODE = 'dspx';
 const ENDPOINT_URL = 'https://buyer.dspx.tv/request/';
 const ENDPOINT_URL_DEV = 'https://dcbuyer.dspx.tv/request/';
 const DEFAULT_VAST_FORMAT = 'vast2';
+const GVLID = 602;
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   aliases: ['dspx'],
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
@@ -19,10 +21,6 @@ export const spec = {
     return validBidRequests.map(bidRequest => {
       const params = bidRequest.params;
 
-      const videoData = utils.deepAccess(bidRequest, 'mediaTypes.video') || {};
-      const sizes = utils.parseSizesInput(videoData.playerSize || bidRequest.sizes)[0];
-      const [width, height] = sizes.split('x');
-
       const placementId = params.placement;
       const rnd = Math.floor(Math.random() * 99999999999);
       const referrer = bidderRequest.refererInfo.referer;
@@ -32,26 +30,28 @@ export const spec = {
       let endpoint = isDev ? ENDPOINT_URL_DEV : ENDPOINT_URL;
       let payload = {};
 
-      if (isVideoRequest(bidRequest)) {
-        let vastFormat = params.vastFormat || DEFAULT_VAST_FORMAT;
+      if (isBannerRequest(bidRequest)) {
+        let size = getBannerSizes(bidRequest)[0];
         payload = {
-          _f: vastFormat,
+          _f: 'html',
           alternative: 'prebid_js',
           inventory_item_id: placementId,
-          srw: width,
-          srh: height,
+          srw: size.width,
+          srh: size.height,
           idt: 100,
           rnd: rnd,
           ref: referrer,
           bid_id: bidId,
         };
       } else {
+        let size = getVideoSizes(bidRequest)[0];
+        let vastFormat = params.vastFormat || DEFAULT_VAST_FORMAT;
         payload = {
-          _f: 'html',
+          _f: vastFormat,
           alternative: 'prebid_js',
           inventory_item_id: placementId,
-          srw: width,
-          srh: height,
+          srw: size.width,
+          srh: size.height,
           idt: 100,
           rnd: rnd,
           ref: referrer,
@@ -86,6 +86,14 @@ export const spec = {
       if (isDev) {
         payload.prebidDevMode = 1;
       }
+
+      if (bidRequest.userId && bidRequest.userId.netId) {
+        payload.did_netid = bidRequest.userId.netId;
+      }
+      if (bidRequest.userId && bidRequest.userId.uid2) {
+        payload.did_uid2 = bidRequest.userId.uid2;
+      }
+
       return {
         method: 'GET',
         url: endpoint,
@@ -112,7 +120,10 @@ export const spec = {
         currency: currency,
         netRevenue: netRevenue,
         type: response.type,
-        ttl: config.getConfig('_bidderTimeout')
+        ttl: config.getConfig('_bidderTimeout'),
+        meta: {
+          advertiserDomains: response.adomain || []
+        }
       };
       if (response.vastXml) {
         bidResponse.vastXml = response.vastXml;
@@ -120,10 +131,48 @@ export const spec = {
       } else {
         bidResponse.ad = response.adTag;
       }
+
       bidResponses.push(bidResponse);
     }
     return bidResponses;
+  },
+  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 (syncOptions.iframeEnabled) {
+      serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
+        type: 'iframe',
+        url: appendToUrl(url, gdprParams)
+      }));
+    }
+    if (syncOptions.pixelEnabled && serverResponses.length > 0) {
+      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) {
@@ -141,6 +190,16 @@ function objectToQueryString(obj, prefix) {
   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' || !!utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoRequest(bid);
+}
+
 /**
  * Check if it's a video bid request
  *
@@ -151,4 +210,48 @@ function isVideoRequest(bid) {
   return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
 }
 
+/**
+ * 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(utils.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(utils.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])
+}
+
 registerBidder(spec);
diff --git a/modules/emx_digitalBidAdapter.js b/modules/emx_digitalBidAdapter.js
index 6688d15d8e9..bcdcd7393f7 100644
--- a/modules/emx_digitalBidAdapter.js
+++ b/modules/emx_digitalBidAdapter.js
@@ -156,12 +156,24 @@ export const emxAdapter = {
       };
     }
 
+    return emxData;
+  },
+  getSupplyChain: (bidderRequest, emxData) => {
+    if (bidderRequest.bids[0] && bidderRequest.bids[0].schain) {
+      emxData.source = {
+        ext: {
+          schain: bidderRequest.bids[0].schain
+        }
+      };
+    }
+
     return emxData;
   }
 };
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 183,
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function (bid) {
     if (!bid || !bid.params) {
@@ -211,7 +223,7 @@ export const spec = {
 
     utils._each(validBidRequests, function (bid) {
       let tagid = utils.getBidIdParameter('tagid', bid.params);
-      let bidfloor = parseFloat(utils.getBidIdParameter('bidfloor', bid.params)) || 0;
+      let bidfloor = parseFloat(getBidFloor(bid)) || 0;
       let isVideo = !!bid.mediaTypes.video;
       let data = {
         id: bid.bidId,
@@ -236,6 +248,7 @@ export const spec = {
     };
 
     emxData = emxAdapter.getGdpr(bidderRequest, Object.assign({}, emxData));
+    emxData = emxAdapter.getSupplyChain(bidderRequest, Object.assign({}, emxData));
     if (bidderRequest && bidderRequest.uspConsent) {
       emxData.us_privacy = bidderRequest.uspConsent
     }
@@ -274,20 +287,55 @@ export const spec = {
           bidResponse = emxAdapter.formatVideoResponse(bidResponse, Object.assign({}, emxBid), bidRequest);
         }
         bidResponse.mediaType = (isVideo ? VIDEO : BANNER);
+
+        // support for adomain in prebid 5.0
+        if (emxBid.adomain && emxBid.adomain.length) {
+          bidResponse.meta = {
+            advertiserDomains: emxBid.adomain
+          };
+        }
+
         emxBidResponses.push(bidResponse);
       });
     }
     return emxBidResponses;
   },
-  getUserSyncs: function (syncOptions) {
+  getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     const syncs = [];
     if (syncOptions.iframeEnabled) {
+      let url = 'https://biddr.brealtime.com/check.html';
+      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+        // add 'gdpr' only if 'gdprApplies' is defined
+        if (typeof gdprConsent.gdprApplies === 'boolean') {
+          url += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+        } else {
+          url += `?gdpr_consent=${gdprConsent.consentString}`;
+        }
+      }
       syncs.push({
         type: 'iframe',
-        url: 'https://biddr.brealtime.com/check.html'
+        url: url
       });
     }
     return syncs;
   }
 };
+
+// support floors module in prebid 5.0
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return parseFloat(utils.getBidIdParameter('bidfloor', bid.params));
+  }
+
+  let floor = bid.getFloor({
+    currency: DEFAULT_CUR,
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.js b/modules/engageyaBidAdapter.js
new file mode 100644
index 00000000000..321b3287c2b
--- /dev/null
+++ b/modules/engageyaBidAdapter.js
@@ -0,0 +1,133 @@
+import {
+  BANNER,
+  NATIVE
+} from '../src/mediaTypes.js';
+
+const {
+  registerBidder
+} = require('../src/adapters/bidderFactory.js');
+const BIDDER_CODE = 'engageya';
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+const ENDPOINT_METHOD = 'GET';
+
+function getPageUrl() {
+  var pUrl = window.location.href;
+  if (isInIframe()) {
+    pUrl = document.referrer ? document.referrer : pUrl;
+  }
+  pUrl = encodeURIComponent(pUrl);
+  return pUrl;
+}
+
+function isInIframe() {
+  try {
+    var isInIframe = (window.self !== window.top);
+  } catch (e) {
+    isInIframe = true;
+  }
+  return isInIframe;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, NATIVE],
+  isBidRequestValid: function(bid) {
+    return bid && bid.params && bid.params.hasOwnProperty('widgetId') && bid.params.hasOwnProperty('websiteId') && !isNaN(bid.params.widgetId) && !isNaN(bid.params.websiteId);
+  },
+
+  buildRequests: function(validBidRequests, bidderRequest) {
+    var bidRequests = [];
+    if (validBidRequests && validBidRequests.length > 0) {
+      validBidRequests.forEach(function(bidRequest) {
+        if (bidRequest.params) {
+          var mediaType = bidRequest.hasOwnProperty('nativeParams') ? 1 : 2;
+          var imageWidth = -1;
+          var imageHeight = -1;
+          if (bidRequest.sizes && bidRequest.sizes.length > 0) {
+            imageWidth = bidRequest.sizes[0][0];
+            imageHeight = bidRequest.sizes[0][1];
+          } else if (bidRequest.nativeParams && bidRequest.nativeParams.image && bidRequest.nativeParams.image.sizes) {
+            imageWidth = bidRequest.nativeParams.image.sizes[0];
+            imageHeight = bidRequest.nativeParams.image.sizes[1];
+          }
+
+          var widgetId = bidRequest.params.widgetId;
+          var websiteId = bidRequest.params.websiteId;
+          var pageUrl = (bidRequest.params.pageUrl && bidRequest.params.pageUrl != '[PAGE_URL]') ? bidRequest.params.pageUrl : '';
+          if (!pageUrl) {
+            pageUrl = (bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : getPageUrl();
+          }
+          var bidId = bidRequest.bidId;
+          var finalUrl = ENDPOINT_URL + '?pubid=0&webid=' + websiteId + '&wid=' + widgetId + '&url=' + pageUrl + '&ireqid=' + bidId + '&pbtpid=' + mediaType + '&imw=' + imageWidth + '&imh=' + imageHeight;
+          if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprApplies && bidderRequest.consentString) {
+            finalUrl += '&is_gdpr=1&gdpr_consent=' + bidderRequest.consentString;
+          }
+          bidRequests.push({
+            url: finalUrl,
+            method: ENDPOINT_METHOD,
+            data: ''
+          });
+        }
+      });
+    }
+
+    return bidRequests;
+  },
+
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    if (serverResponse.body && serverResponse.body.recs && serverResponse.body.recs.length > 0) {
+      var response = serverResponse.body;
+      var isNative = response.pbtypeId == 1;
+      response.recs.forEach(function(rec) {
+        var imageSrc = rec.thumbnail_path.indexOf('http') == -1 ? 'https:' + rec.thumbnail_path : rec.thumbnail_path;
+        if (isNative) {
+          bidResponses.push({
+            requestId: response.ireqId,
+            cpm: rec.ecpm,
+            width: response.imageWidth,
+            height: response.imageHeight,
+            creativeId: rec.postId,
+            currency: 'USD',
+            netRevenue: false,
+            ttl: 360,
+            native: {
+              title: rec.title,
+              body: '',
+              image: {
+                url: imageSrc,
+                width: response.imageWidth,
+                height: response.imageHeight
+              },
+              privacyLink: '',
+              clickUrl: rec.clickUrl,
+              displayUrl: rec.url,
+              cta: '',
+              sponsoredBy: rec.displayName,
+              impressionTrackers: [],
+            },
+          });
+        } else {
+          // var htmlTag = "";
+          var htmlTag = '
';
+          var tag = rec.tag ? rec.tag : htmlTag;
+          bidResponses.push({
+            requestId: response.ireqId,
+            cpm: rec.ecpm,
+            width: response.imageWidth,
+            height: response.imageHeight,
+            creativeId: rec.postId,
+            currency: 'USD',
+            netRevenue: false,
+            ttl: 360,
+            ad: tag,
+          });
+        }
+      });
+    }
+
+    return bidResponses;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/engageyaBidAdapter.md b/modules/engageyaBidAdapter.md
new file mode 100644
index 00000000000..541ba548eeb
--- /dev/null
+++ b/modules/engageyaBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+
+```
+Module Name: Engageya's Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: reem@engageya.com
+```
+
+# Description
+
+Module that connects to Engageya's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+						widgetId: '',
+						websiteId: '',
+						pageUrl:'[PAGE_URL]'
+					}
+                }
+            ]
+        },{
+            code: 'test-div',
+            mediaTypes: {
+                native: {
+					image: {
+						required: true,
+						sizes: [236, 202]
+					},
+					title: {
+						required: true,
+						len: 80
+					},
+					sponsoredBy: {
+						required: true
+					},
+					clickUrl: {
+						required: true
+					},
+					body: {
+						required: true
+					}
+				}
+            },
+            bids: [
+                {
+                    bidder: "engageya",
+                    params: {
+                        widgetId: '',
+						websiteId: '',
+						pageUrl:'[PAGE_URL]'
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/enrichmentFpdModule.js b/modules/enrichmentFpdModule.js
new file mode 100644
index 00000000000..a1d815917e0
--- /dev/null
+++ b/modules/enrichmentFpdModule.js
@@ -0,0 +1,107 @@
+/**
+ * This module sets default values and validates ortb2 first part data
+ * @module modules/firstPartyData
+ */
+import * as utils from '../src/utils.js';
+import { submodule } from '../src/hook.js'
+import { getRefererInfo } from '../src/refererDetection.js'
+
+let ortb2 = {};
+let win = (window === window.top) ? window : window.top;
+
+/**
+ * Checks for referer and if exists merges into ortb2 global data
+ */
+function setReferer() {
+  if (getRefererInfo().referer) utils.mergeDeep(ortb2, { site: { ref: getRefererInfo().referer } });
+}
+
+/**
+ * Checks for canonical url and if exists merges into ortb2 global data
+ */
+function setPage() {
+  if (getRefererInfo().canonicalUrl) utils.mergeDeep(ortb2, { site: { page: getRefererInfo().canonicalUrl } });
+}
+
+/**
+ * Checks for canonical url and if exists retrieves domain and merges into ortb2 global data
+ */
+function setDomain() {
+  let parseDomain = function(url) {
+    if (!url || typeof url !== 'string' || url.length === 0) return;
+
+    var match = url.match(/^(?:https?:\/\/)?(?:www\.)?(.*?(?=(\?|\#|\/|$)))/i);
+
+    return match && match[1];
+  };
+
+  let domain = parseDomain(getRefererInfo().canonicalUrl)
+
+  if (domain) utils.mergeDeep(ortb2, { site: { domain: domain } });
+}
+
+/**
+ * Checks for screen/device width and height and sets dimensions
+ */
+function setDimensions() {
+  let width;
+  let height;
+
+  try {
+    width = win.innerWidth || win.document.documentElement.clientWidth || win.document.body.clientWidth;
+    height = win.innerHeight || win.document.documentElement.clientHeight || win.document.body.clientHeight;
+  } catch (e) {
+    width = window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth;
+    height = window.innerHeight || window.document.documentElement.clientHeight || window.document.body.clientHeight;
+  }
+
+  utils.mergeDeep(ortb2, { device: { w: width, h: height } });
+}
+
+/**
+ * Scans page for meta keywords, and if exists, merges into site.keywords
+ */
+function setKeywords() {
+  let keywords;
+
+  try {
+    keywords = win.document.querySelector("meta[name='keywords']");
+  } catch (e) {
+    keywords = window.document.querySelector("meta[name='keywords']");
+  }
+
+  if (keywords && keywords.content) utils.mergeDeep(ortb2, { site: { keywords: keywords.content.replace(/\s/g, '') } });
+}
+
+/**
+ * Resets modules global ortb2 data
+ */
+const resetOrtb2 = () => { ortb2 = {} };
+
+function runEnrichments() {
+  setReferer();
+  setPage();
+  setDomain();
+  setDimensions();
+  setKeywords();
+
+  return ortb2;
+}
+
+/**
+ * Sets default values to ortb2 if exists and adds currency and ortb2 setConfig callbacks on init
+ */
+export function initSubmodule(fpdConf, data) {
+  resetOrtb2();
+
+  return (!fpdConf.skipEnrichments) ? utils.mergeDeep(runEnrichments(), data) : data;
+}
+
+/** @type {firstPartyDataSubmodule} */
+export const enrichmentsSubmodule = {
+  name: 'enrichments',
+  queue: 2,
+  init: initSubmodule
+}
+
+submodule('firstPartyData', enrichmentsSubmodule)
diff --git a/modules/eplanningBidAdapter.js b/modules/eplanningBidAdapter.js
index ac5ba659ad7..dd96353dea3 100644
--- a/modules/eplanningBidAdapter.js
+++ b/modules/eplanningBidAdapter.js
@@ -1,4 +1,5 @@
 import * as utils from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
@@ -8,7 +9,7 @@ const BIDDER_CODE = 'eplanning';
 const rnd = Math.random();
 const DEFAULT_SV = 'ads.us.e-planning.net';
 const DEFAULT_ISV = 'i.e-planning.net';
-const PARAMS = ['ci', 'sv', 't', 'ml'];
+const PARAMS = ['ci', 'sv', 't', 'ml', 'sn'];
 const DOLLARS = 'USD';
 const NET_REVENUE = true;
 const TTL = 120;
@@ -16,6 +17,9 @@ const NULL_SIZE = '1x1';
 const FILE = 'file';
 const STORAGE_RENDER_PREFIX = 'pbsr_';
 const STORAGE_VIEW_PREFIX = 'pbvi_';
+const mobileUserAgent = isMobileUserAgent();
+const PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC = ['1x1', '300x50', '320x50', '300x250'];
+const PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC = ['1x1', '970x90', '970x250', '160x600', '300x600', '728x90', '300x250'];
 
 export const spec = {
   code: BIDDER_CODE,
@@ -43,7 +47,7 @@ export const spec = {
       url = 'https://' + urlConfig.isv + '/layers/t_pbjs_2.json';
       params = {};
     } else {
-      url = 'https://' + (urlConfig.sv || DEFAULT_SV) + '/hb/1/' + urlConfig.ci + '/' + dfpClientId + '/' + getDomain(pageUrl) + '/' + sec;
+      url = 'https://' + (urlConfig.sv || DEFAULT_SV) + '/pbjs/1/' + urlConfig.ci + '/' + dfpClientId + '/' + getDomain(pageUrl) + '/' + sec;
       const referrerUrl = bidderRequest.refererInfo.referer.reachedTop ? window.top.document.referrer : bidderRequest.refererInfo.referer;
 
       if (storage.hasLocalStorage()) {
@@ -54,7 +58,6 @@ export const spec = {
         rnd: rnd,
         e: spaces.str,
         ur: pageUrl || FILE,
-        r: 'pbjs',
         pbv: '$prebid.version$',
         ncb: '1',
         vs: spaces.vs
@@ -79,6 +82,13 @@ export const spec = {
       if (bidderRequest && bidderRequest.uspConsent) {
         params.ccpa = bidderRequest.uspConsent;
       }
+
+      if ((getGlobal()).getUserIds && typeof (getGlobal()).getUserIds === 'function') {
+        const userIds = (getGlobal()).getUserIds();
+        for (var id in userIds) {
+          params['e_' + id] = (typeof userIds[id] === 'object') ? encodeURIComponent(JSON.stringify(userIds[id])) : encodeURIComponent(userIds[id]);
+        }
+      }
     }
 
     return {
@@ -107,6 +117,11 @@ export const spec = {
               netRevenue: NET_REVENUE,
               currency: DOLLARS,
             };
+            if (ad.adom) {
+              bidResponse.meta = {
+                advertiserDomains: ad.adom
+              };
+            }
             bidResponses.push(bidResponse);
           });
         }
@@ -140,6 +155,18 @@ export const spec = {
   },
 }
 
+function getUserAgent() {
+  return window.navigator.userAgent;
+}
+function getInnerWidth() {
+  return utils.getWindowSelf().innerWidth;
+}
+function isMobileUserAgent() {
+  return getUserAgent().match(/(mobile)|(ip(hone|ad))|(android)|(blackberry)|(nokia)|(phone)|(opera\smini)/i);
+}
+function isMobileDevice() {
+  return (getInnerWidth() <= 1024) || window.orientation || mobileUserAgent;
+}
 function getUrlConfig(bidRequests) {
   if (isTestRequest(bidRequests)) {
     return getTestConfig(bidRequests.filter(br => br.params.t));
@@ -173,8 +200,32 @@ function getTestConfig(bidRequests) {
   };
 }
 
+function compareSizesByPriority(size1, size2) {
+  var priorityOrderForSizesAsc = isMobileDevice() ? PRIORITY_ORDER_FOR_MOBILE_SIZES_ASC : PRIORITY_ORDER_FOR_DESKTOP_SIZES_ASC;
+  var index1 = priorityOrderForSizesAsc.indexOf(size1);
+  var index2 = priorityOrderForSizesAsc.indexOf(size2);
+  if (index1 > -1) {
+    if (index2 > -1) {
+      return (index1 < index2) ? 1 : -1;
+    } else {
+      return -1;
+    }
+  } else {
+    return (index2 > -1) ? 1 : 0;
+  }
+}
+
+function getSizesSortedByPriority(sizes) {
+  return utils.parseSizesInput(sizes).sort(compareSizesByPriority);
+}
+
 function getSize(bid, first) {
-  return bid.sizes && bid.sizes.length ? utils.parseSizesInput(first ? bid.sizes[0] : bid.sizes).join(',') : NULL_SIZE;
+  var arraySizes = bid.sizes && bid.sizes.length ? getSizesSortedByPriority(bid.sizes) : [];
+  if (arraySizes.length) {
+    return first ? arraySizes[0] : arraySizes.join(',');
+  } else {
+    return NULL_SIZE;
+  }
 }
 
 function getSpacesStruct(bids) {
@@ -197,7 +248,14 @@ function getSpaces(bidRequests, ml) {
   let es = {str: '', vs: '', map: {}};
   es.str = Object.keys(spacesStruct).map(size => spacesStruct[size].map((bid, i) => {
     es.vs += getVs(bid);
-    let name = ml ? cleanName(bid.adUnitCode) : getSize(bid, true) + '_' + i;
+
+    let name;
+    if (ml) {
+      name = cleanName(bid.adUnitCode);
+    } else {
+      name = (bid.params && bid.params.sn) || (getSize(bid, true) + '_' + i);
+    }
+
     es.map[name] = bid.bidId;
     return name + ':' + getSize(bid);
   }).join('+')).join('+');
diff --git a/modules/etargetBidAdapter.js b/modules/etargetBidAdapter.js
index 5e07561044a..8a1b25cec70 100644
--- a/modules/etargetBidAdapter.js
+++ b/modules/etargetBidAdapter.js
@@ -1,5 +1,5 @@
-'use strict';
-
+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';
 
@@ -57,10 +57,40 @@ export const spec = {
       data: bidderRequest,
       bids: validBidRequests,
       netRevenue: netRevenue,
+      metaData: getMetaData(),
       bidder: 'etarget',
       gdpr: gdprObject
     };
 
+    function getMetaData() {
+      var mts = {};
+      var hmetas = document.getElementsByTagName('meta');
+      var wnames = ['title', 'og:title', 'description', 'og:description', 'og:url', 'base', 'keywords'];
+      try {
+        for (var k in hmetas) {
+          if (typeof hmetas[k] == 'object') {
+            var mname = hmetas[k].name || hmetas[k].getAttribute('property');
+            var mcont = hmetas[k].content;
+            if (!!mname && mname != 'null' && !!mcont) {
+              if (wnames.indexOf(mname) >= 0) {
+                if (!mts[mname]) {
+                  mts[mname] = [];
+                }
+                mts[mname].push(mcont);
+              }
+            }
+          }
+        }
+        mts['title'] = [(document.getElementsByTagName('title')[0] || []).innerHTML];
+        mts['base'] = [(document.getElementsByTagName('base')[0] || {}).href];
+        mts['referer'] = [document.location.href];
+        mts['ortb2'] = (config.getConfig('ortb2') || {});
+      } catch (e) {
+        mts.error = e;
+      }
+      return mts;
+    }
+
     function formRequestUrl(reqData) {
       var key;
       var url = [];
@@ -96,6 +126,7 @@ export const spec = {
           currency: data.win_cur,
           netRevenue: true,
           ttl: 360,
+          reason: data.reason ? data.reason : 'none',
           ad: data.banner,
           vastXml: data.vast_content,
           vastUrl: data.vast_link,
@@ -106,9 +137,14 @@ export const spec = {
           bidObject.gdpr = bidRequest.gdpr.gdpr;
           bidObject.gdpr_consent = bidRequest.gdpr.gdpr_consent;
         }
+
+        if (bid.adomain) {
+          utils.deepSetValue(bidObject, 'meta.advertiserDomains', Array.isArray(bid.adomain) ? bid.adomain : [bid.adomain]);
+        }
         bidRespones.push(bidObject);
       }
     }
+
     return bidRespones;
 
     function verifySize(adItem, validSizes) {
diff --git a/modules/fabrickIdSystem.js b/modules/fabrickIdSystem.js
new file mode 100644
index 00000000000..bb838788f07
--- /dev/null
+++ b/modules/fabrickIdSystem.js
@@ -0,0 +1,183 @@
+/**
+ * This module adds neustar's fabrickId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/fabrickIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+
+/** @type {Submodule} */
+export const fabrickIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'fabrickId',
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function decode
+   * @param {(Object|string)} value
+   * @returns {(Object|undefined)}
+   */
+  decode(value) {
+    if (value && value.fabrickId) {
+      return { 'fabrickId': value.fabrickId };
+    } else {
+      return undefined;
+    }
+  },
+
+  /**
+   * performs action to obtain id and return a value in the callback's response argument
+   * @function getId
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData}
+   * @param {Object} cacheIdObj - existing id, if any consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData, cacheIdObj) {
+    try {
+      const configParams = (config && config.params) || {};
+      if (window.fabrickMod1) {
+        window.fabrickMod1(configParams, consentData, cacheIdObj);
+      }
+      if (!configParams || !configParams.apiKey || typeof configParams.apiKey !== 'string') {
+        utils.logError('fabrick submodule requires an apiKey.');
+        return;
+      }
+      try {
+        let url = _getBaseUrl(configParams);
+        let keysArr = Object.keys(configParams);
+        for (let i in keysArr) {
+          let k = keysArr[i];
+          if (k === 'url' || k === 'refererInfo' || (k.length > 3 && k.substring(0, 3) === 'max')) {
+            continue;
+          }
+          let v = configParams[k];
+          if (Array.isArray(v)) {
+            for (let j in v) {
+              if (typeof v[j] === 'string' || typeof v[j] === 'number') {
+                url += `${k}=${v[j]}&`;
+              }
+            }
+          } else if (typeof v === 'string' || typeof v === 'number') {
+            url += `${k}=${v}&`;
+          }
+        }
+        // pull off the trailing &
+        url = url.slice(0, -1)
+        const referer = _getRefererInfo(configParams);
+        const refs = new Map();
+        _setReferrer(refs, referer.referer);
+        if (referer.stack && referer.stack[0]) {
+          _setReferrer(refs, referer.stack[0]);
+        }
+        _setReferrer(refs, referer.canonicalUrl);
+        _setReferrer(refs, window.location.href);
+
+        refs.forEach(v => {
+          url = appendUrl(url, 'r', v, configParams);
+        });
+
+        const resp = function (callback) {
+          const callbacks = {
+            success: response => {
+              if (window.fabrickMod2) {
+                return window.fabrickMod2(
+                  callback, response, configParams, consentData, cacheIdObj);
+              } else {
+                let responseObj;
+                if (response) {
+                  try {
+                    responseObj = JSON.parse(response);
+                  } catch (error) {
+                    utils.logError(error);
+                    responseObj = {};
+                  }
+                }
+                callback(responseObj);
+              }
+            },
+            error: error => {
+              utils.logError(`fabrickId fetch encountered an error`, error);
+              callback();
+            }
+          };
+          ajax(url, callbacks, null, {method: 'GET', withCredentials: true});
+        };
+        return {callback: resp};
+      } catch (e) {
+        utils.logError(`fabrickIdSystem encountered an error`, e);
+      }
+    } catch (e) {
+      utils.logError(`fabrickIdSystem encountered an error`, e);
+    }
+  }
+};
+
+function _getRefererInfo(configParams) {
+  if (configParams.refererInfo) {
+    return configParams.refererInfo;
+  } else {
+    return getRefererInfo();
+  }
+}
+
+function _getBaseUrl(configParams) {
+  if (configParams.url) {
+    return configParams.url;
+  } else {
+    return `https://fid.agkn.com/f?`;
+  }
+}
+
+function _setReferrer(refs, s) {
+  if (s) {
+    // store the longest one for the same URI
+    const url = s.split('?')[0];
+    // OR store the longest one for the same domain
+    // const url = s.split('?')[0].replace('http://','').replace('https://', '').split('/')[0];
+    if (refs.has(url)) {
+      const prevRef = refs.get(url);
+      if (s.length > prevRef.length) {
+        refs.set(url, s);
+      }
+    } else {
+      refs.set(url, s);
+    }
+  }
+}
+
+export function appendUrl(url, paramName, s, configParams) {
+  const maxUrlLen = (configParams && configParams.maxUrlLen) || 2000;
+  const maxRefLen = (configParams && configParams.maxRefLen) || 1000;
+  const maxSpaceAvailable = (configParams && configParams.maxSpaceAvailable) || 50;
+  //                     make sure we have enough space left to make it worthwhile
+  if (s && url.length < (maxUrlLen - maxSpaceAvailable)) {
+    let thisMaxRefLen = maxUrlLen - url.length;
+    if (thisMaxRefLen > maxRefLen) {
+      thisMaxRefLen = maxRefLen;
+    }
+
+    s = `&${paramName}=${encodeURIComponent(s)}`;
+
+    if (s.length >= thisMaxRefLen) {
+      s = s.substring(0, thisMaxRefLen);
+      if (s.charAt(s.length - 1) === '%') {
+        s = s.substring(0, thisMaxRefLen - 1);
+      } else if (s.charAt(s.length - 2) === '%') {
+        s = s.substring(0, thisMaxRefLen - 2);
+      }
+    }
+    return `${url}${s}`
+  } else {
+    return url;
+  }
+}
+
+submodule('userId', fabrickIdSubmodule);
diff --git a/modules/fabrickIdSystem.md b/modules/fabrickIdSystem.md
new file mode 100644
index 00000000000..268c861710a
--- /dev/null
+++ b/modules/fabrickIdSystem.md
@@ -0,0 +1,24 @@
+## Neustar Fabrick User ID Submodule
+
+Fabrick ID Module - https://www.home.neustar/fabrick
+Product and Sales Inquiries: 1-855-898-0036
+
+## Example configuration for publishers:
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'fabrickId',
+            storage: {
+                name: 'pbjs_fabrickId',
+                type: 'cookie',
+                expires: 7
+            },
+            params: {
+                apiKey: 'your apiKey', // provided to you by Neustar
+                e: '31c5543c1734d25c7206f5fd591525d0295bec6fe84ff82f946a34fe970a1e66' // example hash identifier (sha256)
+            }
+        }]
+    }
+});
+```
diff --git a/modules/feedadBidAdapter.js b/modules/feedadBidAdapter.js
index 3992f2db5e0..54a4ef0c998 100644
--- a/modules/feedadBidAdapter.js
+++ b/modules/feedadBidAdapter.js
@@ -1,13 +1,13 @@
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {BANNER} from '../src/mediaTypes.js';
 import {ajax} from '../src/ajax.js';
 
 /**
  * Version of the FeedAd bid adapter
  * @type {string}
  */
-const VERSION = '1.0.0';
+const VERSION = '1.0.2';
 
 /**
  * @typedef {object} FeedAdApiBidRequest
@@ -61,6 +61,11 @@ const VERSION = '1.0.0';
  * @property [device_platform] {1|2|3} 1 - Android | 2 - iOS | 3 - Windows
  */
 
+/**
+ * The IAB TCF 2.0 vendor ID for the FeedAd GmbH
+ */
+const TCF_VENDOR_ID = 781;
+
 /**
  * Bidder network identity code
  * @type {string}
@@ -71,7 +76,7 @@ const BIDDER_CODE = 'feedad';
  * The media types supported by FeedAd
  * @type {MediaType[]}
  */
-const MEDIA_TYPES = [VIDEO, BANNER];
+const MEDIA_TYPES = [BANNER];
 
 /**
  * Tag for logging
@@ -204,6 +209,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     referer: data.refererInfo.referer,
     transactionId: bid.transactionId
   });
+  if (bidderRequest.gdprConsent) {
+    data.consentIabTcf = bidderRequest.gdprConsent.consentString;
+    data.gdprApplies = bidderRequest.gdprConsent.gdprApplies;
+  }
   return {
     method: 'POST',
     url: `${API_ENDPOINT}${API_PATH_BID_REQUEST}`,
@@ -279,6 +288,7 @@ function trackingHandlerFactory(klass) {
  */
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: TCF_VENDOR_ID,
   supportedMediaTypes: MEDIA_TYPES,
   isBidRequestValid,
   buildRequests,
diff --git a/modules/feedadBidAdapter.md b/modules/feedadBidAdapter.md
index fd57025c29e..6f705df36b5 100644
--- a/modules/feedadBidAdapter.md
+++ b/modules/feedadBidAdapter.md
@@ -18,9 +18,6 @@ Prebid.JS adapter that connects to the FeedAd demand sources.
             mediaTypes: {
                 banner: { // supports all banner sizes
                     sizes: [[300, 250]],
-                },
-                video: { // supports only outstream video
-                    context: 'outstream'
                 }
             },
             bids: [
diff --git a/modules/flocIdSystem.js b/modules/flocIdSystem.js
new file mode 100644
index 00000000000..e4bd31e49df
--- /dev/null
+++ b/modules/flocIdSystem.js
@@ -0,0 +1,110 @@
+/**
+ * This module adds flocId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/flocId
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import {submodule} from '../src/hook.js'
+
+const MODULE_NAME = 'flocId';
+
+/**
+ * Add meta tag to support enabling of floc origin trial
+ * @function
+ * @param {string} token - configured token for origin-trial
+ */
+function enableOriginTrial(token) {
+  const tokenElement = document.createElement('meta');
+  tokenElement.httpEquiv = 'origin-trial';
+  tokenElement.content = token;
+  document.head.appendChild(tokenElement);
+}
+
+/**
+ * Get the interest cohort.
+ * @param successCallback
+ * @param errorCallback
+ */
+function getFlocData(successCallback, errorCallback) {
+  document.interestCohort()
+    .then((data) => {
+      successCallback(data);
+    }).catch((error) => {
+      errorCallback(error);
+    });
+}
+
+/**
+ * Encode the id
+ * @param value
+ * @returns {string|*}
+ */
+function encodeId(value) {
+  const result = {};
+  if (value) {
+    result.flocId = value;
+    utils.logInfo('Decoded value ' + JSON.stringify(result));
+    return result;
+  }
+  return undefined;
+}
+
+/** @type {Submodule} */
+export const flocIdSubmodule = {
+  /**
+   * 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 {{flocId:{ id: string }} or undefined if value doesn't exists
+   */
+  decode(value) {
+    return (value) ? encodeId(value) : undefined;
+  },
+  /**
+   * If chrome and cohort enabled performs action to obtain id and return a value in the callback's response argument
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config) {
+    // Block usage of storage of cohort ID
+    const checkStorage = (config && config.storage);
+    if (checkStorage) {
+      utils.logError('User ID - flocId submodule storage should not defined');
+      return;
+    }
+    // Validate feature is enabled
+    const isFlocEnabled = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime) && !!document.featurePolicy && !!document.featurePolicy.features() && document.featurePolicy.features().includes('interest-cohort');
+
+    if (isFlocEnabled) {
+      const configParams = (config && config.params) || {};
+      if (configParams && (typeof configParams.token === 'string')) {
+        // Insert meta-tag with token from configuration
+        enableOriginTrial(configParams.token);
+      }
+      // Example expected output { "id": "14159", "version": "chrome.1.0" }
+      let returnCallback = (cb) => {
+        getFlocData((data) => {
+          returnCallback = () => { return data; }
+          utils.logInfo('Cohort id: ' + JSON.stringify(data));
+          cb(data);
+        }, (err) => {
+          utils.logInfo(err);
+          cb(undefined);
+        });
+      };
+
+      return {callback: returnCallback};
+    }
+  }
+};
+
+submodule('userId', flocIdSubmodule);
diff --git a/modules/flocIdSystem.md b/modules/flocIdSystem.md
new file mode 100644
index 00000000000..07184700a14
--- /dev/null
+++ b/modules/flocIdSystem.md
@@ -0,0 +1,34 @@
+## FloC ID User ID Submodule
+
+### Building Prebid with Floc Id Support
+Your Prebid build must include the modules for both **userId** and **flocIdSystem** submodule. Follow the build instructions for Prebid as
+explained in the top level README.md file of the Prebid source tree.
+
+ex: $ gulp build --modules=userId,flocIdSystem
+
+### Prebid Params
+
+Individual params may be set for the FloC ID User ID Submodule. 
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'flocId',
+            params: {
+                      token: "Registered token or default sharedid.org token"
+             }
+        }]
+    }
+});
+```
+
+### Parameter Descriptions for the `userSync` Configuration Section
+The below parameters apply only to the FloC ID User ID Module integration.
+
+| Params under usersync.userIds[]| Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the Floc ID module - `"flocId"` | `"flocId"` |
+| params | Optional | Object | Details for flocId syncing. | |
+| params.token | Optional | Object | Publisher registered token.To get new token, register https://developer.chrome.com/origintrials/#/trials/active for Federated Learning of Cohorts. Default sharedid.org token:  token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"|  token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"
+ |
+| storage | Not Allowed | Object | Will ask browser for cohort everytime. Setting storage will fail id lookup ||
diff --git a/modules/fpdModule/index.js b/modules/fpdModule/index.js
new file mode 100644
index 00000000000..427547a4e4d
--- /dev/null
+++ b/modules/fpdModule/index.js
@@ -0,0 +1,58 @@
+/**
+ * This module sets default values and validates ortb2 first part data
+ * @module modules/firstPartyData
+ */
+import { config } from '../../src/config.js';
+import { module, getHook } from '../../src/hook.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+import { addBidderRequests } from '../../src/auction.js';
+
+let submodules = [];
+
+/**
+ * enable submodule in User ID
+ * @param {RtdSubmodule} submodule
+ */
+export function registerSubmodules(submodule) {
+  submodules.push(submodule);
+}
+
+export function init() {
+  let modConf = config.getConfig('firstPartyData') || {};
+  let ortb2 = config.getConfig('ortb2') || {};
+
+  submodules.sort((a, b) => {
+    return ((a.queue || 1) - (b.queue || 1));
+  }).forEach(submodule => {
+    ortb2 = submodule.init(modConf, ortb2);
+  });
+
+  config.setConfig({ortb2});
+}
+
+/**
+ * BidderRequests hook to intiate module and reset modules ortb2 data object
+ */
+function addBidderRequestHook(fn, bidderRequests) {
+  init();
+  fn.call(this, bidderRequests);
+  // Removes hook after run
+  addBidderRequests.getHooks({ hook: addBidderRequestHook }).remove();
+}
+
+/**
+ * Sets bidderRequests hook
+ */
+function setupHook() {
+  getHook('addBidderRequests').before(addBidderRequestHook);
+}
+
+module('firstPartyData', registerSubmodules);
+
+// Runs setupHook on initial load
+setupHook();
+
+/**
+ * Global function to reinitiate module
+ */
+(getGlobal()).refreshFpd = setupHook;
diff --git a/modules/fpdModule/index.md b/modules/fpdModule/index.md
new file mode 100644
index 00000000000..638c966883a
--- /dev/null
+++ b/modules/fpdModule/index.md
@@ -0,0 +1,46 @@
+# Overview
+
+```
+Module Name: First Party Data Module
+```
+
+# Description
+
+Module to perform the following functions to allow for consistent set of first party data using the following submodules.
+
+Enrichment Submodule:
+- populate available data into object: referer, meta-keywords, cur
+
+Validation Submodule:
+- verify OpenRTB datatypes, remove/warn any that are likely to choke downstream readers
+- verify that certain OpenRTB attributes are not specified
+- optionally suppress user FPD based on the existence of _pubcid_optout
+
+
+1. Module initializes on first load and set bidRequestHook 
+2. When hook runs, corresponding submodule init functions are run to perform enrichments/validations dependant on submodule
+3. After hook complete, it is disabled - meaning module only runs on first auction
+4. To reinitiate the module, run pbjs.refreshFPD(), which allows module to rerun as if initial load
+
+
+This module will automatically run first party data enrichments and validations dependant on which submodules are included. There is no configuration required. In order to load the module and submodule(s) and opt out of either enrichements or validations, use the below opt out configuration
+
+# Module Control Configuration
+
+```
+
+pbjs.setConfig({
+    firstPartyData: {
+        skipValidations: true, // default to false
+        skipEnrichments: true // default to false
+    }
+});
+
+```
+
+# Requirements
+
+At least one of the submodules must be included in order to successfully run the corresponding above operations.
+
+enrichmentFpdModule
+validationFpdModule
\ No newline at end of file
diff --git a/modules/freewheel-sspBidAdapter.js b/modules/freewheel-sspBidAdapter.js
index 5e3717ce1fe..fa2f7b4cd6b 100644
--- a/modules/freewheel-sspBidAdapter.js
+++ b/modules/freewheel-sspBidAdapter.js
@@ -72,7 +72,7 @@ function getPricing(xmlNode) {
       price: priceNode.textContent || priceNode.innerText
     };
   } else {
-    utils.logWarn('PREBID - ' + BIDDER_CODE + ': Can\'t get pricing data. Is price awareness enabled?');
+    utils.logWarn('PREBID - ' + BIDDER_CODE + ': No bid received or missing pricing extension.');
   }
 
   return princingData;
@@ -102,22 +102,49 @@ function getCreativeId(xmlNode) {
   return creaId;
 }
 
-function getDealId(xmlNode) {
-  var dealId = '';
+function getValueFromKeyInImpressionNode(xmlNode, key) {
+  var value = '';
   var impNodes = xmlNode.querySelectorAll('Impression'); // Nodelist.forEach is not supported in IE and Edge
-  // Workaround given here https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10638731/
-
+  var isRootViewKeyPresent = false;
+  var isAdsDisplayStartedPresent = false;
   Array.prototype.forEach.call(impNodes, function (el) {
-    var queries = el.textContent.substring(el.textContent.indexOf('?') + 1).split('&');
+    if (isRootViewKeyPresent && isAdsDisplayStartedPresent) {
+      return value;
+    }
+    isRootViewKeyPresent = false;
+    isAdsDisplayStartedPresent = false;
+    var text = el.textContent;
+    var queries = text.substring(el.textContent.indexOf('?') + 1).split('&');
+    var tempValue = '';
     Array.prototype.forEach.call(queries, function (item) {
       var split = item.split('=');
-      if (split[0] == 'dealId') {
-        dealId = split[1];
+      if (split[0] == key) {
+        tempValue = split[1];
+      }
+      if (split[0] == 'reqType' && split[1] == 'AdsDisplayStarted') {
+        isAdsDisplayStartedPresent = true;
+      }
+      if (split[0] == 'rootViewKey') {
+        isRootViewKeyPresent = true;
       }
     });
+    if (isAdsDisplayStartedPresent) {
+      value = tempValue;
+    }
   });
+  return value;
+}
+
+function getDealId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'dealId');
+}
+
+function getBannerId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'adId');
+}
 
-  return dealId;
+function getCampaignId(xmlNode) {
+  return getValueFromKeyInImpressionNode(xmlNode, 'campaignId');
 }
 
 /**
@@ -373,7 +400,8 @@ export const spec = {
     const princingData = getPricing(xmlDoc);
     const creativeId = getCreativeId(xmlDoc);
     const dealId = getDealId(xmlDoc);
-
+    const campaignId = getCampaignId(xmlDoc);
+    const bannerId = getBannerId(xmlDoc);
     const topWin = getTopMostWindow();
     if (!topWin.freewheelssp_cache) {
       topWin.freewheelssp_cache = {};
@@ -392,7 +420,10 @@ export const spec = {
         currency: princingData.currency,
         netRevenue: true,
         ttl: 360,
-        dealId: dealId
+        meta: { advertiserDomains: princingData.adomain && utils.isArray(princingData.adomain) ? princingData.adomain : [] },
+        dealId: dealId,
+        campaignId: campaignId,
+        bannerId: bannerId
       };
 
       if (bidrequest.mediaTypes.video) {
@@ -407,16 +438,25 @@ export const spec = {
     return bidResponses;
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, usPrivacy) {
+    var gdprParams = '';
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
     if (syncOptions && syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: USER_SYNC_URL
+        url: USER_SYNC_URL + gdprParams
       }];
     } else {
       return [];
     }
   },
+};
 
-}
 registerBidder(spec);
diff --git a/modules/gamoshiBidAdapter.js b/modules/gamoshiBidAdapter.js
index 1316d74e430..68233ce7814 100644
--- a/modules/gamoshiBidAdapter.js
+++ b/modules/gamoshiBidAdapter.js
@@ -3,6 +3,7 @@ import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {config} from '../src/config.js';
 import {Renderer} from '../src/Renderer.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const ENDPOINTS = {
   'gamoshi': 'https://rtb.gamoshi.io'
@@ -37,12 +38,29 @@ export const helper = {
       }
     }
     return BANNER;
+  },
+  getBidFloor(bid) {
+    if (!utils.isFn(bid.getFloor)) {
+      return bid.params.bidfloor ? bid.params.bidfloor : null;
+    }
+
+    let bidFloor = bid.getFloor({
+      mediaType: '*',
+      size: '*',
+      currency: 'USD'
+    });
+
+    if (utils.isPlainObject(bidFloor) && !isNaN(bidFloor.floor) && bidFloor.currency === 'USD') {
+      return bidFloor.floor;
+    }
+
+    return null;
   }
 };
 
 export const spec = {
   code: 'gamoshi',
-  aliases: ['gambid', 'cleanmedia', '9MediaOnline'],
+  aliases: ['gambid', '9MediaOnline'],
   supportedMediaTypes: ['banner', 'video'],
 
   isBidRequestValid: function (bid) {
@@ -105,13 +123,13 @@ export const spec = {
         id: transactionId,
         instl: params.instl === 1 ? 1 : 0,
         tagid: adUnitCode,
-        bidfloor: params.bidfloor || 0,
+        bidfloor: helper.getBidFloor(bidRequest) || 0,
         bidfloorcur: 'USD',
         secure: 1
       };
 
       const hasFavoredMediaType =
-        params.favoredMediaType && this.supportedMediaTypes.includes(params.favoredMediaType);
+        params.favoredMediaType && includes(this.supportedMediaTypes, params.favoredMediaType);
 
       if (!mediaTypes || mediaTypes.banner) {
         if (!hasFavoredMediaType || params.favoredMediaType === BANNER) {
@@ -132,11 +150,19 @@ export const spec = {
           const playerSize = mediaTypes.video.playerSize || sizes;
           const videoImp = Object.assign({}, imp, {
             video: {
-              protocols: params.protocols || [1, 2, 3, 4, 5, 6],
+              protocols: bidRequest.mediaTypes.video.protocols || params.protocols || [1, 2, 3, 4, 5, 6],
               pos: params.pos || 0,
               ext: {
                 context: mediaTypes.video.context
-              }
+              },
+              mimes: bidRequest.mediaTypes.video.mimes,
+              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,
+              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
             }
           });
 
@@ -157,7 +183,7 @@ export const spec = {
 
       let eids = [];
       if (bidRequest && bidRequest.userId) {
-        addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 'ID5ID');
+        addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id.uid`), 'id5-sync.com', 'ID5ID');
         addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.tdid`), 'adserver.org', 'TDID');
       }
       if (eids.length > 0) {
@@ -197,9 +223,15 @@ export const spec = {
         creativeId: bid.crid || bid.adid,
         netRevenue: true,
         currency: bid.cur || response.cur,
-        mediaType: helper.getMediaType(bid)
+        mediaType: helper.getMediaType(bid),
       };
 
+      if (bid.adomain && bid.adomain.length) {
+        outBid.meta = {
+          advertiserDomains: bid.adomain
+        }
+      }
+
       if (utils.deepAccess(bidRequest.bidRequest, 'mediaTypes.' + outBid.mediaType)) {
         if (outBid.mediaType === BANNER) {
           outBids.push(Object.assign({}, outBid, {ad: bid.adm}));
diff --git a/modules/gamoshiBidAdapter.md b/modules/gamoshiBidAdapter.md
index 6e930375059..49b727cecae 100644
--- a/modules/gamoshiBidAdapter.md
+++ b/modules/gamoshiBidAdapter.md
@@ -3,7 +3,7 @@
 ```
 Module Name:  Gamoshi Bid Adapter
 Module Type:  Bidder Adapter
-Maintainer:   salomon@gamoshi.com
+Maintainer:   dev@gamoshi.com
 ```
 
 # Description
diff --git a/modules/gdprEnforcement.js b/modules/gdprEnforcement.js
index 6a3fbdce1f2..02a2da3a7a4 100644
--- a/modules/gdprEnforcement.js
+++ b/modules/gdprEnforcement.js
@@ -11,39 +11,151 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { registerSyncInner } from '../src/adapters/bidderFactory.js';
 import { getHook } from '../src/hook.js';
 import { validateStorageEnforcement } from '../src/storageManager.js';
+import events from '../src/events.js';
+import CONSTANTS from '../src/constants.json';
 
-const purpose1 = 'storage';
+const TCF2 = {
+  'purpose1': { id: 1, name: 'storage' },
+  'purpose2': { id: 2, name: 'basicAds' },
+  'purpose7': { id: 7, name: 'measurement' }
+}
+
+/*
+  These rules would be used if `consentManagement.gdpr.rules` is undefined by the publisher.
+*/
+const DEFAULT_RULES = [{
+  purpose: 'storage',
+  enforcePurpose: true,
+  enforceVendor: true,
+  vendorExceptions: []
+}, {
+  purpose: 'basicAds',
+  enforcePurpose: true,
+  enforceVendor: true,
+  vendorExceptions: []
+}];
+
+export let purpose1Rule;
+export let purpose2Rule;
+export let purpose7Rule;
+
+export let enforcementRules;
+
+const storageBlocked = [];
+const biddersBlocked = [];
+const analyticsBlocked = [];
 
 let addedDeviceAccessHook = false;
-let enforcementRules;
 
-function getGvlid() {
-  let gvlid;
-  const bidderCode = config.getCurrentBidder();
+// Helps in stubbing these functions in unit tests.
+export const internal = {
+  getGvlidForBidAdapter,
+  getGvlidForUserIdModule,
+  getGvlidForAnalyticsAdapter
+};
+
+/**
+ * Returns GVL ID for a Bid adapter / an USERID submodule / an Analytics adapter.
+ * If modules of different types have the same moduleCode: For example, 'appnexus' is the code for both Bid adapter and Analytics adapter,
+ * then, we assume that their GVL IDs are same. This function first checks if GVL ID is defined for a Bid adapter, if not found, tries to find User ID
+ * submodule's GVL ID, if not found, tries to find Analytics adapter's GVL ID. In this process, as soon as it finds a GVL ID, it returns it
+ * without going to the next check.
+ * @param {{string|Object}} - module
+ * @return {number} - GVL ID
+ */
+export function getGvlid(module) {
+  let gvlid = null;
+  if (module) {
+    // Check user defined GVL Mapping in pbjs.setConfig()
+    const gvlMapping = config.getConfig('gvlMapping');
+
+    // For USER ID Module, we pass the submodule object itself as the "module" parameter, this check is required to grab the module code
+    const moduleCode = typeof module === 'string' ? module : module.name;
+
+    // Return GVL ID from user defined gvlMapping
+    if (gvlMapping && gvlMapping[moduleCode]) {
+      gvlid = gvlMapping[moduleCode];
+      return gvlid;
+    }
+
+    gvlid = internal.getGvlidForBidAdapter(moduleCode) || internal.getGvlidForUserIdModule(module) || internal.getGvlidForAnalyticsAdapter(moduleCode);
+  }
+  return gvlid;
+}
+
+/**
+ * Returns GVL ID for a bid adapter. If the adapter does not have an associated GVL ID, it returns 'null'.
+ * @param  {string=} bidderCode - The 'code' property of the Bidder spec.
+ * @return {number} GVL ID
+ */
+function getGvlidForBidAdapter(bidderCode) {
+  let gvlid = null;
+  bidderCode = bidderCode || config.getCurrentBidder();
   if (bidderCode) {
     const bidder = adapterManager.getBidAdapter(bidderCode);
-    gvlid = bidder.getSpec().gvlid;
-  } else {
-    utils.logWarn('Current module not found');
+    if (bidder && bidder.getSpec) {
+      gvlid = bidder.getSpec().gvlid;
+    }
   }
   return gvlid;
 }
 
 /**
- * This function takes in rules and consentData as input and validates against the consentData provided. If it returns true Prebid will allow the next call else it will log a warning
- * @param {Object} rules enforcement rules set in config
- * @param {Object} consentData gdpr consent data
+ * Returns GVL ID for an userId submodule. If an userId submodules does not have an associated GVL ID, it returns 'null'.
+ * @param {Object} userIdModule
+ * @return {number} GVL ID
+ */
+function getGvlidForUserIdModule(userIdModule) {
+  return (typeof userIdModule === 'object' ? userIdModule.gvlid : null);
+}
+
+/**
+ * Returns GVL ID for an analytics adapter. If an analytics adapter does not have an associated GVL ID, it returns 'null'.
+ * @param {string} code - 'provider' property on the analytics adapter config
+ * @return {number} GVL ID
+ */
+function getGvlidForAnalyticsAdapter(code) {
+  return adapterManager.getAnalyticsAdapter(code) && (adapterManager.getAnalyticsAdapter(code).gvlid || null);
+}
+
+/**
+ * This function takes in a rule and consentData and validates against the consentData provided. Depending on what it returns,
+ * the caller may decide to suppress a TCF-sensitive activity.
+ * @param {Object} rule - enforcement rules set in config
+ * @param {Object} consentData - gdpr consent data
+ * @param {string=} currentModule - Bidder code of the current module
+ * @param {number=} gvlId - GVL ID for the module
  * @returns {boolean}
  */
-function validateRules(rule, consentData, currentModule, gvlid) {
-  // if vendor has exception => always true
+export function validateRules(rule, consentData, currentModule, gvlId) {
+  const purposeId = TCF2[Object.keys(TCF2).filter(purposeName => TCF2[purposeName].name === rule.purpose)[0]].id;
+
+  // return 'true' if vendor present in 'vendorExceptions'
   if (includes(rule.vendorExceptions || [], currentModule)) {
     return true;
   }
-  // if enforcePurpose is false or purpose was granted isAllowed is true, otherwise false
-  const purposeAllowed = rule.enforcePurpose === false || utils.deepAccess(consentData, 'vendorData.purpose.consents.1') === true;
-  // if enforceVendor is false or vendor was granted isAllowed is true, otherwise false
-  const vendorAllowed = rule.enforceVendor === false || utils.deepAccess(consentData, `vendorData.vendor.consents.${gvlid}`) === true;
+
+  // get data from the consent string
+  const purposeConsent = utils.deepAccess(consentData, `vendorData.purpose.consents.${purposeId}`);
+  const vendorConsent = utils.deepAccess(consentData, `vendorData.vendor.consents.${gvlId}`);
+  const liTransparency = utils.deepAccess(consentData, `vendorData.purpose.legitimateInterests.${purposeId}`);
+
+  /*
+    Since vendor exceptions have already been handled, the purpose as a whole is allowed if it's not being enforced
+    or the user has consented. Similar with vendors.
+  */
+  const purposeAllowed = rule.enforcePurpose === false || purposeConsent === true;
+  const vendorAllowed = rule.enforceVendor === false || vendorConsent === true;
+
+  /*
+    Few if any vendors should be declaring Legitimate Interest for Device Access (Purpose 1), but some are claiming
+    LI for Basic Ads (Purpose 2). Prebid.js can't check to see who's declaring what legal basis, so if LI has been
+    established for Purpose 2, allow the auction to take place and let the server sort out the legal basis calculation.
+  */
+  if (purposeId === 2) {
+    return (purposeAllowed && vendorAllowed) || (liTransparency === true);
+  }
+
   return purposeAllowed && vendorAllowed;
 }
 
@@ -65,22 +177,26 @@ export function deviceAccessHook(fn, gvlid, moduleName, result) {
     const consentData = gdprDataHandler.getConsentData();
     if (consentData && consentData.gdprApplies) {
       if (consentData.apiVersion === 2) {
-        if (!gvlid) {
-          gvlid = getGvlid();
+        const curBidder = config.getCurrentBidder();
+        // Bidders have a copy of storage object with bidder code binded. Aliases will also pass the same bidder code when invoking storage functions and hence if alias tries to access device we will try to grab the gvl id for alias instead of original bidder
+        if (curBidder && (curBidder != moduleName) && adapterManager.aliasRegistry[curBidder] === moduleName) {
+          gvlid = getGvlid(curBidder);
+        } else {
+          gvlid = getGvlid(moduleName) || gvlid;
         }
-        const curModule = moduleName || config.getCurrentBidder();
-        const purpose1Rule = find(enforcementRules, hasPurpose1);
+        const curModule = moduleName || curBidder;
         let isAllowed = validateRules(purpose1Rule, consentData, curModule, gvlid);
         if (isAllowed) {
           result.valid = true;
           fn.call(this, gvlid, moduleName, result);
         } else {
-          utils.logWarn(`User denied Permission for Device access for ${curModule}`);
+          curModule && utils.logWarn(`TCF2 denied device access for ${curModule}`);
           result.valid = false;
+          storageBlocked.push(curModule);
           fn.call(this, gvlid, moduleName, result);
         }
       } else {
-        utils.logInfo('Enforcing TCF2 only');
+        // The module doesn't enforce TCF1.1 strings
         result.valid = true;
         fn.call(this, gvlid, moduleName, result);
       }
@@ -100,21 +216,17 @@ export function userSyncHook(fn, ...args) {
   const consentData = gdprDataHandler.getConsentData();
   if (consentData && consentData.gdprApplies) {
     if (consentData.apiVersion === 2) {
-      const gvlid = getGvlid();
       const curBidder = config.getCurrentBidder();
-      if (gvlid) {
-        const purpose1Rule = find(enforcementRules, hasPurpose1);
-        let isAllowed = validateRules(purpose1Rule, consentData, curBidder, gvlid);
-        if (isAllowed) {
-          fn.call(this, ...args);
-        } else {
-          utils.logWarn(`User sync not allowed for ${curBidder}`);
-        }
+      const gvlid = getGvlid(curBidder);
+      let isAllowed = validateRules(purpose1Rule, consentData, curBidder, gvlid);
+      if (isAllowed) {
+        fn.call(this, ...args);
       } else {
         utils.logWarn(`User sync not allowed for ${curBidder}`);
+        storageBlocked.push(curBidder);
       }
     } else {
-      utils.logInfo('Enforcing TCF2 only');
+      // The module doesn't enforce TCF1.1 strings
       fn.call(this, ...args);
     }
   } else {
@@ -132,24 +244,20 @@ export function userIdHook(fn, submodules, consentData) {
   if (consentData && consentData.gdprApplies) {
     if (consentData.apiVersion === 2) {
       let userIdModules = submodules.map((submodule) => {
-        const gvlid = submodule.submodule.gvlid;
+        const gvlid = getGvlid(submodule.submodule);
         const moduleName = submodule.submodule.name;
-        if (gvlid) {
-          const purpose1Rule = find(enforcementRules, hasPurpose1);
-          let isAllowed = validateRules(purpose1Rule, consentData, moduleName, gvlid);
-          if (isAllowed) {
-            return submodule;
-          } else {
-            utils.logWarn(`User denied permission to fetch user id for ${moduleName} User id module`);
-          }
+        let isAllowed = validateRules(purpose1Rule, consentData, moduleName, gvlid);
+        if (isAllowed) {
+          return submodule;
         } else {
           utils.logWarn(`User denied permission to fetch user id for ${moduleName} User id module`);
+          storageBlocked.push(moduleName);
         }
         return undefined;
       }).filter(module => module)
-      fn.call(this, userIdModules, {...consentData, hasValidated: true});
+      fn.call(this, userIdModules, { ...consentData, hasValidated: true });
     } else {
-      utils.logInfo('Enforcing TCF2 only');
+      // The module doesn't enforce TCF1.1 strings
       fn.call(this, submodules, consentData);
     }
   } else {
@@ -157,28 +265,137 @@ export function userIdHook(fn, submodules, consentData) {
   }
 }
 
-const hasPurpose1 = (rule) => { return rule.purpose === purpose1 }
+/**
+ * Checks if bidders are allowed in the auction.
+ * Enforces "purpose 2 (Basic Ads)" of TCF v2.0 spec
+ * @param {Function} fn - Function reference to the original function.
+ * @param {Array} adUnits
+ */
+export function makeBidRequestsHook(fn, adUnits, ...args) {
+  const consentData = gdprDataHandler.getConsentData();
+  if (consentData && consentData.gdprApplies) {
+    if (consentData.apiVersion === 2) {
+      adUnits.forEach(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => {
+          const currBidder = bid.bidder;
+          const gvlId = getGvlid(currBidder);
+          if (includes(biddersBlocked, currBidder)) return false;
+          const isAllowed = !!validateRules(purpose2Rule, consentData, currBidder, gvlId);
+          if (!isAllowed) {
+            utils.logWarn(`TCF2 blocked auction for ${currBidder}`);
+            biddersBlocked.push(currBidder);
+          }
+          return isAllowed;
+        });
+      });
+      fn.call(this, adUnits, ...args);
+    } else {
+      // The module doesn't enforce TCF1.1 strings
+      fn.call(this, adUnits, ...args);
+    }
+  } else {
+    fn.call(this, adUnits, ...args);
+  }
+}
+
+/**
+ * Checks if Analytics adapters are allowed to send data to their servers for furhter processing.
+ * Enforces "purpose 7 (Measurement)" of TCF v2.0 spec
+ * @param {Function} fn - Function reference to the original function.
+ * @param {Array} config - Configuration object passed to pbjs.enableAnalytics()
+ */
+export function enableAnalyticsHook(fn, config) {
+  const consentData = gdprDataHandler.getConsentData();
+  if (consentData && consentData.gdprApplies) {
+    if (consentData.apiVersion === 2) {
+      if (!utils.isArray(config)) {
+        config = [config]
+      }
+      config = config.filter(conf => {
+        const analyticsAdapterCode = conf.provider;
+        const gvlid = getGvlid(analyticsAdapterCode);
+        const isAllowed = !!validateRules(purpose7Rule, consentData, analyticsAdapterCode, gvlid);
+        if (!isAllowed) {
+          analyticsBlocked.push(analyticsAdapterCode);
+          utils.logWarn(`TCF2 blocked analytics adapter ${conf.provider}`);
+        }
+        return isAllowed;
+      });
+      fn.call(this, config);
+    } else {
+      // This module doesn't enforce TCF1.1 strings
+      fn.call(this, config);
+    }
+  } else {
+    fn.call(this, config);
+  }
+}
+
+/**
+ * Compiles the TCF2.0 enforcement results into an object, which is emitted as an event payload to "tcf2Enforcement" event.
+ */
+function emitTCF2FinalResults() {
+  // remove null and duplicate values
+  const formatArray = function (arr) {
+    return arr.filter((i, k) => i !== null && arr.indexOf(i) === k);
+  }
+  const tcf2FinalResults = {
+    storageBlocked: formatArray(storageBlocked),
+    biddersBlocked: formatArray(biddersBlocked),
+    analyticsBlocked: formatArray(analyticsBlocked)
+  };
+
+  events.emit(CONSTANTS.EVENTS.TCF2_ENFORCEMENT, tcf2FinalResults);
+}
+
+events.on(CONSTANTS.EVENTS.AUCTION_END, emitTCF2FinalResults);
+
+/*
+  Set of callback functions used to detect presence of a TCF rule, passed as the second argument to find().
+*/
+const hasPurpose1 = (rule) => { return rule.purpose === TCF2.purpose1.name }
+const hasPurpose2 = (rule) => { return rule.purpose === TCF2.purpose2.name }
+const hasPurpose7 = (rule) => { return rule.purpose === TCF2.purpose7.name }
 
 /**
- * A configuration function that initializes some module variables, as well as add hooks
- * @param {Object} config GDPR enforcement config object
+ * A configuration function that initializes some module variables, as well as adds hooks
+ * @param {Object} config - GDPR enforcement config object
  */
 export function setEnforcementConfig(config) {
   const rules = utils.deepAccess(config, 'gdpr.rules');
   if (!rules) {
-    utils.logWarn('GDPR enforcement rules not defined, exiting enforcement module');
-    return;
+    utils.logWarn('TCF2: enforcing P1 and P2 by default');
+    enforcementRules = DEFAULT_RULES;
+  } else {
+    enforcementRules = rules;
+  }
+
+  purpose1Rule = find(enforcementRules, hasPurpose1);
+  purpose2Rule = find(enforcementRules, hasPurpose2);
+  purpose7Rule = find(enforcementRules, hasPurpose7);
+
+  if (!purpose1Rule) {
+    purpose1Rule = DEFAULT_RULES[0];
   }
 
-  enforcementRules = rules;
-  const hasDefinedPurpose1 = find(enforcementRules, hasPurpose1);
-  if (hasDefinedPurpose1 && !addedDeviceAccessHook) {
+  if (!purpose2Rule) {
+    purpose2Rule = DEFAULT_RULES[1];
+  }
+
+  if (purpose1Rule && !addedDeviceAccessHook) {
     addedDeviceAccessHook = true;
     validateStorageEnforcement.before(deviceAccessHook, 49);
     registerSyncInner.before(userSyncHook, 48);
     // Using getHook as user id and gdprEnforcement are both optional modules. Using import will auto include the file in build
     getHook('validateGdprEnforcement').before(userIdHook, 47);
   }
+  if (purpose2Rule) {
+    getHook('makeBidRequests').before(makeBidRequestsHook);
+  }
+
+  if (purpose7Rule) {
+    getHook('enableAnalyticsCb').before(enableAnalyticsHook);
+  }
 }
 
 config.getConfig('consentManagement', config => setEnforcementConfig(config.consentManagement));
diff --git a/modules/geoedgeRtdProvider.js b/modules/geoedgeRtdProvider.js
new file mode 100644
index 00000000000..001ef67b66a
--- /dev/null
+++ b/modules/geoedgeRtdProvider.js
@@ -0,0 +1,213 @@
+/**
+ * This module adds geoedge provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch creative wrapper from geoedge server
+ * The module will place geoedge RUM client on bid responses markup
+ * @module modules/geoedgeProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} key
+ * @property {?Object} bidders
+ * @property {?boolean} wap
+ * @property {?string} keyName
+ */
+
+import { submodule } from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { generateUUID, insertElement, isEmpty, logError } from '../src/utils.js';
+
+/** @type {string} */
+const SUBMODULE_NAME = 'geoedge';
+/** @type {string} */
+export const WRAPPER_URL = 'https://wrappers.geoedge.be/wrapper.html';
+/** @type {string} */
+/* eslint-disable no-template-curly-in-string */
+export const HTML_PLACEHOLDER = '${creative}';
+/** @type {string} */
+const PV_ID = generateUUID();
+/** @type {string} */
+const HOST_NAME = 'https://rumcdn.geoedge.be';
+/** @type {string} */
+const FILE_NAME = 'grumi.js';
+/** @type {function} */
+export let getClientUrl = (key) => `${HOST_NAME}/${key}/${FILE_NAME}`;
+/** @type {string} */
+export let wrapper
+/** @type {boolean} */;
+let wrapperReady;
+/** @type {boolean} */;
+let preloaded;
+
+/**
+ * fetches the creative wrapper
+ * @param {function} sucess - success callback
+ */
+export function fetchWrapper(success) {
+  if (wrapperReady) {
+    return success(wrapper);
+  }
+  ajax(WRAPPER_URL, success);
+}
+
+/**
+ * sets the wrapper and calls preload client
+ * @param {string} responseText
+ */
+export function setWrapper(responseText) {
+  wrapperReady = true;
+  wrapper = responseText;
+}
+
+/**
+ * preloads the client
+  * @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);
+}
+
+/**
+ * creates identity function for string replace without special replacement patterns
+ * @param {string} str
+ * @return {function}
+ */
+function replacer(str) {
+  return function () {
+    return str;
+  }
+}
+
+export function wrapHtml(wrapper, html) {
+  return wrapper.replace(HTML_PLACEHOLDER, replacer(html));
+}
+
+/**
+ * generate macros dictionary from bid response
+ * @param {Object} bid
+ * @param {string} key
+ * @return {Object}
+ */
+function getMacros(bid, key) {
+  return {
+    '${key}': key,
+    '%%ADUNIT%%': bid.adUnitCode,
+    '%%WIDTH%%': bid.width,
+    '%%HEIGHT%%': bid.height,
+    '%%PATTERN:hb_adid%%': bid.adId,
+    '%%PATTERN:hb_bidder%%': bid.bidderCode,
+    '%_isHb!': true,
+    '%_hbcid!': bid.creativeId || '',
+    '%%PATTERN:hb_pb%%': bid.pbHg,
+    '%%SITE%%': location.hostname,
+    '%_pimp%': PV_ID
+  };
+}
+
+/**
+ * replace macro placeholders in a string with values from a dictionary
+ * @param {string} wrapper
+ * @param {Object} macros
+ * @return {string}
+ */
+function replaceMacros(wrapper, macros) {
+  var re = new RegExp('\\' + Object.keys(macros).join('|'), 'gi');
+
+  return wrapper.replace(re, function(matched) {
+    return macros[matched];
+  });
+}
+
+/**
+ * build final creative html with creative wrapper
+ * @param {Object} bid
+ * @param {string} wrapper
+ * @param {string} html
+ * @return {string}
+ */
+function buildHtml(bid, wrapper, html, key) {
+  let macros = getMacros(bid, key);
+  wrapper = replaceMacros(wrapper, macros);
+  return wrapHtml(wrapper, html);
+}
+
+/**
+ * muatates the bid ad property
+ * @param {Object} bid
+ * @param {string} ad
+ */
+function mutateBid(bid, ad) {
+  bid.ad = ad;
+}
+
+/**
+ * wraps a bid object with the creative wrapper
+ * @param {Object} bid
+ * @param {string} key
+ */
+export function wrapBidResponse(bid, key) {
+  let wrapped = buildHtml(bid, wrapper, bid.ad, key);
+  mutateBid(bid, wrapped);
+}
+
+/**
+ * checks if bidder's bids should be monitored
+ * @param {string} bidder
+ * @return {boolean}
+ */
+function isSupportedBidder(bidder, paramsBidders) {
+  return isEmpty(paramsBidders) || paramsBidders[bidder] === true;
+}
+
+/**
+ * checks if bid should be monitored
+ * @param {Object} bid
+ * @return {boolean}
+ */
+function shouldWrap(bid, params) {
+  let supportedBidder = isSupportedBidder(bid.bidderCode, params.bidders);
+  let donePreload = params.wap ? preloaded : true;
+  return wrapperReady && supportedBidder && donePreload;
+}
+
+function conditionallyWrap(bidResponse, config, userConsent) {
+  let params = config.params;
+  if (shouldWrap(bidResponse, params)) {
+    wrapBidResponse(bidResponse, params.key);
+  }
+}
+
+function init(config, userConsent) {
+  let params = config.params;
+  if (!params || !params.key) {
+    logError('missing key for geoedge RTD module provider');
+    return false;
+  }
+  preloadClient(params.key);
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const geoedgeSubmodule = {
+  /**
+     * used to link submodule with realTimeData
+     * @type {string}
+     */
+  name: SUBMODULE_NAME,
+  init,
+  onBidResponseEvent: conditionallyWrap
+};
+
+export function beforeInit() {
+  fetchWrapper(setWrapper);
+  submodule('realTimeData', geoedgeSubmodule);
+}
+
+beforeInit();
diff --git a/modules/geoedgeRtdProvider.md b/modules/geoedgeRtdProvider.md
new file mode 100644
index 00000000000..5414606612c
--- /dev/null
+++ b/modules/geoedgeRtdProvider.md
@@ -0,0 +1,67 @@
+## Overview
+
+Module Name: Geoedge Rtd provider
+Module Type: Rtd Provider
+Maintainer: guy.books@geoedge.com
+
+The Geoedge Realtime module lets publishers block bad ads such as automatic redirects, malware, offensive creatives and landing pages.
+To use this module, you'll need to work with [Geoedge](https://www.geoedge.com/publishers-real-time-protection/) to get an account and cutomer key.
+
+## Integration
+
+1) Build the geoedge RTD module into the Prebid.js package with:
+
+```
+gulp build --modules=geoedgeRtdProvider,...
+```
+
+2) Use `setConfig` to instruct Prebid.js to initilize the geoedge module, as specified below.
+
+## Configuration
+
+This module is configured as part of the `realTimeData.dataProviders` object:
+
+```javascript
+pbjs.setConfig({
+    realTimeData: {
+        dataProviders: [{
+            name: 'geoedge',
+            params: {
+                key: '123123', 
+                bidders: {
+                    'bidderA': true, // monitor bids form this bidder
+                    'bidderB': false // do not monitor bids form this bidder.
+                },
+                wap: true
+            }
+        }]
+    }
+});
+```
+
+Parameters details:
+
+{: .table .table-bordered .table-striped }
+|Name |Type |Description |Notes |
+| :------------ | :------------ | :------------ |:------------ |
+|name | String | Real time data module name |Required, always 'geoedge' |
+|params | Object | | |
+|params.key | String | Customer key |Required, contact Geoedge to get your key |
+|params.bidders | Object | Bidders to monitor |Optional, list of bidder to include / exclude from monitoring. Omitting this will monitor bids from all bidders. |
+|params.wap |Boolean |Wrap after preload |Optional, defaults to `false`. Set to `true` if you want to monitor only after the module has preloaded the monitoring client. |
+
+## Example
+
+To view an integration example:
+ 
+1) in your cli run:
+
+```
+gulp serve --modules=appnexusBidAdapter,geoedgeRtdProvider
+```
+
+2) in your browser, navigate to:
+
+```
+http://localhost:9999/integrationExamples/gpt/geoedgeRtdProvider_example.html
+```
diff --git a/modules/gjirafaBidAdapter.js b/modules/gjirafaBidAdapter.js
new file mode 100644
index 00000000000..df33369d6ad
--- /dev/null
+++ b/modules/gjirafaBidAdapter.js
@@ -0,0 +1,119 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'gjirafa';
+const ENDPOINT_URL = 'https://central.gjirafa.com/bid';
+const DIMENSION_SEPARATOR = 'x';
+const SIZE_SEPARATOR = ';';
+
+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) {
+    return !!(bid.params.propertyId && 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.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let propertyId = '';
+    let pageViewGuid = '';
+    let storageId = '';
+    let bidderRequestId = '';
+    let url = '';
+    let contents = [];
+    let data = {};
+
+    let placements = validBidRequests.map(bidRequest => {
+      if (!propertyId) { propertyId = bidRequest.params.propertyId; }
+      if (!pageViewGuid && bidRequest.params) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
+      if (!storageId && bidRequest.params) { storageId = bidRequest.params.storageId || ''; }
+      if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
+      if (!url && bidderRequest) { url = bidderRequest.refererInfo.referer; }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
+
+      let adUnitId = bidRequest.adUnitCode;
+      let placementId = bidRequest.params.placementId;
+      let sizes = generateSizeParam(bidRequest.sizes);
+
+      return {
+        sizes: sizes,
+        adUnitId: adUnitId,
+        placementId: placementId,
+        bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
+      };
+    });
+
+    let body = {
+      propertyId: propertyId,
+      pageViewGuid: pageViewGuid,
+      storageId: storageId,
+      url: url,
+      requestid: bidderRequestId,
+      placements: placements,
+      contents: contents,
+      data: data
+    }
+
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: body
+    }];
+  },
+  /**
+   * 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 responses = serverResponse.body;
+    const bidResponses = [];
+    for (var i = 0; i < responses.length; i++) {
+      const bidResponse = {
+        requestId: responses[i].BidId,
+        cpm: responses[i].CPM,
+        width: responses[i].Width,
+        height: responses[i].Height,
+        creativeId: responses[i].CreativeId,
+        currency: responses[i].Currency,
+        netRevenue: responses[i].NetRevenue,
+        ttl: responses[i].TTL,
+        referrer: responses[i].Referrer,
+        ad: responses[i].Ad,
+        vastUrl: responses[i].VastUrl,
+        mediaType: responses[i].MediaType,
+        meta: {
+          advertiserDomains: Array.isArray(responses[i].ADomain) ? responses[i].ADomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+}
+
+/**
+* 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);
+}
+
+registerBidder(spec);
diff --git a/modules/gjirafaBidAdapter.md b/modules/gjirafaBidAdapter.md
index 1ec8222d8de..fb4960d61f6 100644
--- a/modules/gjirafaBidAdapter.md
+++ b/modules/gjirafaBidAdapter.md
@@ -1,36 +1,67 @@
 # Overview
-Module Name: Gjirafa Bidder Adapter Module 
-Type: Bidder Adapter 
-Maintainer: agonq@gjirafa.com
+Module Name: Gjirafa Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
 
 # Description
 Gjirafa Bidder Adapter for Prebid.js.
 
 # Test Parameters
+```js
 var adUnits = [
-{
-    code: 'test-div',
-    sizes: [[728, 90]],  // leaderboard
-    bids: [
-        {
-             bidder: 'gjirafa',
-             params: {
-				placementId: '71-3'
-             }
-        }
-    ]
-},{
-    code: 'test-div',
-    sizes: [[300, 250]],   // mobile rectangle
-    bids: [
-        {
-             bidder: 'gjirafa',
-             params: {
-				minCPM: 0.0001,
-				minCPC: 0.001,
-				explicit: true
-             }
-        }
-    ]
-}
-];
\ No newline at end of file
+    {
+        code: 'test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [728, 90]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',   //Required
+                placementId: '846841',  //Required
+                data: {                 //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    },
+    {
+        code: 'test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'gjirafa',
+            params: {
+                propertyId: '105227',  //Required
+                placementId: '846836', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    }
+];
+```
diff --git a/modules/glimpseBidAdapter.js b/modules/glimpseBidAdapter.js
index 969c04bb451..9ef46f62f1d 100644
--- a/modules/glimpseBidAdapter.js
+++ b/modules/glimpseBidAdapter.js
@@ -3,6 +3,17 @@ import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'glimpse';
 
+function transformEachBidResponse(glimpseBid) {
+  const bid = glimpseBid;
+  bid.meta = { advertiserDomains: [] };
+
+  if (glimpseBid.adomain) {
+    bid.meta.advertiserDomains = glimpseBid.adomain;
+  }
+
+  return bid;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   url: 'https://api.glimpseprotocol.io/cloud/v1/vault/prebid',
@@ -45,10 +56,10 @@ export const spec = {
   },
 
   interpretResponse: (serverResponse, _) => {
-    const bids = [];
+    let bids = [];
     try {
       const { body } = serverResponse;
-      bids.push(...body);
+      bids = body.map(transformEachBidResponse);
     } catch (error) {}
 
     return bids;
diff --git a/modules/glomexBidAdapter.js b/modules/glomexBidAdapter.js
new file mode 100644
index 00000000000..617a1a3d721
--- /dev/null
+++ b/modules/glomexBidAdapter.js
@@ -0,0 +1,89 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import find from 'core-js-pure/features/array/find.js'
+import { BANNER } from '../src/mediaTypes.js'
+
+const ENDPOINT = 'https://prebid.mes.glomex.cloud/request-bid'
+const BIDDER_CODE = 'glomex'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function (bid) {
+    if (bid && bid.params && bid.params.integrationId) {
+      return true
+    }
+    return false
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest = {}) {
+    const refererInfo = bidderRequest.refererInfo || {};
+    const gdprConsent = bidderRequest.gdprConsent || {};
+
+    return {
+      method: 'POST',
+      url: `${ENDPOINT}`,
+      data: {
+        auctionId: bidderRequest.auctionId,
+        refererInfo: {
+          isAmp: refererInfo.isAmp,
+          numIframes: refererInfo.numIframes,
+          reachedTop: refererInfo.reachedTop,
+          referer: refererInfo.referer
+        },
+        gdprConsent: {
+          consentString: gdprConsent.consentString,
+          gdprApplies: gdprConsent.gdprApplies
+        },
+        bidRequests: validBidRequests.map(({ params, sizes, bidId, adUnitCode }) => ({
+          bidId,
+          adUnitCode,
+          params,
+          sizes
+        }))
+      },
+      options: {
+        withCredentials: false,
+        contentType: 'application/json'
+      },
+      validBidRequests: validBidRequests,
+    }
+  },
+
+  interpretResponse: function (serverResponse, originalBidRequest) {
+    const bidResponses = []
+
+    originalBidRequest.validBidRequests.forEach(function (bidRequest) {
+      if (!serverResponse.body) {
+        return
+      }
+
+      const matchedBid = find(serverResponse.body.bids, function (bid) {
+        return String(bidRequest.bidId) === String(bid.id)
+      })
+
+      if (matchedBid) {
+        const bidResponse = {
+          requestId: bidRequest.bidId,
+          cpm: matchedBid.cpm,
+          width: matchedBid.width,
+          height: matchedBid.height,
+          creativeId: matchedBid.creativeId,
+          dealId: matchedBid.dealId,
+          currency: matchedBid.currency,
+          netRevenue: matchedBid.netRevenue,
+          ttl: matchedBid.ttl,
+          ad: matchedBid.ad,
+          meta: {
+            advertiserDomains: matchedBid.adomain ? matchedBid.adomain : []
+          }
+        }
+
+        bidResponses.push(bidResponse)
+      }
+    })
+    return bidResponses
+  }
+};
+
+registerBidder(spec)
diff --git a/modules/glomexBidAdapter.md b/modules/glomexBidAdapter.md
new file mode 100644
index 00000000000..d52ed88ff16
--- /dev/null
+++ b/modules/glomexBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+```
+Module Name: Glomex Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: integration-squad@services.glomex.com
+```
+
+# Description
+
+Module to use the Glomex Player with prebid.js
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+                code: "banner",
+                mediaTypes: {
+                    banner: {
+                        sizes: [[640, 360]]
+                    }
+                },
+                bids: [{
+                   bidder: "glomex",
+                   params: {
+                       integrationId: '4059a11hkdzuf65i',
+                       playlistId: 'v-bdui4dz7vjq9'
+                   }
+                }]
+           }
+       ];
+```
diff --git a/modules/gmosspBidAdapter.js b/modules/gmosspBidAdapter.js
index d9dc8f7641a..bf57e63d53c 100644
--- a/modules/gmosspBidAdapter.js
+++ b/modules/gmosspBidAdapter.js
@@ -29,7 +29,7 @@ export const spec = {
   buildRequests: function (validBidRequests, bidderRequest) {
     const bidRequests = [];
 
-    const url = bidderRequest.refererInfo.referer;
+    const urlInfo = getUrlInfo(bidderRequest.refererInfo);
     const cur = getCurrencyType();
     const dnt = utils.getDNT() ? '1' : '0';
 
@@ -46,7 +46,8 @@ export const spec = {
       queryString = utils.tryAppendQueryString(queryString, 'bid', bid);
       queryString = utils.tryAppendQueryString(queryString, 'ver', ver);
       queryString = utils.tryAppendQueryString(queryString, 'sid', sid);
-      queryString = utils.tryAppendQueryString(queryString, 'url', url);
+      queryString = utils.tryAppendQueryString(queryString, 'url', urlInfo.url);
+      queryString = utils.tryAppendQueryString(queryString, 'ref', urlInfo.ref);
       queryString = utils.tryAppendQueryString(queryString, 'cur', cur);
       queryString = utils.tryAppendQueryString(queryString, 'dnt', dnt);
 
@@ -93,6 +94,10 @@ export const spec = {
       ttl: res.ttl || 300
     };
 
+    if (res.adomains) {
+      utils.deepSetValue(bid, 'meta.advertiserDomains', Array.isArray(res.adomains) ? res.adomains : [res.adomains]);
+    }
+
     return [bid];
   },
 
@@ -131,4 +136,31 @@ function getCurrencyType() {
   return 'JPY';
 }
 
+function getUrlInfo(refererInfo) {
+  return {
+    url: getUrl(refererInfo),
+    ref: getReferrer(),
+  };
+}
+
+function getUrl(refererInfo) {
+  if (refererInfo && refererInfo.referer) {
+    return refererInfo.referer;
+  }
+
+  try {
+    return window.top.location.href;
+  } catch (e) {
+    return window.location.href;
+  }
+}
+
+function getReferrer() {
+  try {
+    return window.top.document.referrer;
+  } catch (e) {
+    return document.referrer;
+  }
+}
+
 registerBidder(spec);
diff --git a/modules/gnetBidAdapter.js b/modules/gnetBidAdapter.js
new file mode 100644
index 00000000000..3469c897a6a
--- /dev/null
+++ b/modules/gnetBidAdapter.js
@@ -0,0 +1,101 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'gnet';
+const ENDPOINT = 'https://adserver.gnetproject.com/prebid.php';
+
+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.websiteId && bid.params.externalId);
+  },
+
+  /**
+   * 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 bidRequests = [];
+    const referer = bidderRequest.refererInfo.referer;
+
+    utils._each(validBidRequests, (request) => {
+      const data = {};
+
+      data.referer = referer;
+      data.adUnitCode = request.adUnitCode;
+      data.bidId = request.bidId;
+      data.transactionId = request.transactionId;
+
+      data.sizes = utils.parseSizesInput(request.sizes);
+
+      data.params = request.params;
+
+      const payloadString = JSON.stringify(data);
+
+      bidRequests.push({
+        method: 'POST',
+        url: ENDPOINT,
+        mode: 'no-cors',
+        options: {
+          withCredentials: false,
+        },
+        data: payloadString
+      });
+    });
+
+    return bidRequests;
+  },
+
+  /**
+   * 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, requests) {
+    if (typeof serverResponse !== 'object') {
+      return [];
+    }
+
+    const res = serverResponse && serverResponse.body;
+
+    if (utils.isEmpty(res)) {
+      return [];
+    }
+
+    if (res.bids) {
+      const bids = [];
+      utils._each(res.bids, (bidData) => {
+        const bid = {
+          requestId: bidData.bidId,
+          cpm: bidData.cpm,
+          currency: bidData.currency,
+          width: bidData.width,
+          height: bidData.height,
+          ad: bidData.ad,
+          ttl: 300,
+          creativeId: bidData.creativeId,
+          netRevenue: true,
+        };
+        bids.push(bid);
+      });
+
+      return bids;
+    }
+
+    return [];
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/gnetBidAdapter.md b/modules/gnetBidAdapter.md
new file mode 100644
index 00000000000..6dac9be17b6
--- /dev/null
+++ b/modules/gnetBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: Gnet Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: roberto.wu@grumft.com
+```
+
+# Description
+
+Module that connects to Example's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: '/150790500/4_ZONA_IAB_300x250_5',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],
+                }
+            },
+            bids: [
+                {
+                    bidder: 'gnet',
+                    params: {
+                        websiteId: '4',
+                        externalId: '4d52cccf30309282256012cf30309282'
+                    }
+                }
+            ]
+        }
+    ];
\ No newline at end of file
diff --git a/modules/gothamadsBidAdapter.js b/modules/gothamadsBidAdapter.js
new file mode 100644
index 00000000000..ff6fa5221f3
--- /dev/null
+++ b/modules/gothamadsBidAdapter.js
@@ -0,0 +1,342 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'gothamads';
+const ACCOUNTID_MACROS = '[account_id]';
+const URL_ENDPOINT = `https://us-e-node1.gothamads.com/bid?pass=${ACCOUNTID_MACROS}&integration=prebidjs`;
+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) => {
+    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.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.logMessage(e);
+    };
+
+    let bids = [];
+    for (let bidRequest of validBidRequests) {
+      let impObject = prepareImpObject(bidRequest);
+      let data = {
+        id: bidRequest.bidId,
+        test: config.getConfig('debug') ? 1 : 0,
+        cur: ['USD'],
+        device: {
+          w: winTop.screen.width,
+          h: winTop.screen.height,
+          language: (navigator && navigator.language) ? navigator.language.indexOf('-') != -1 ? navigator.language.split('-')[0] : navigator.language : '',
+        },
+        site: {
+          page: location.pathname,
+          host: location.host
+        },
+        source: {
+          tid: bidRequest.transactionId
+        },
+        regs: {
+          coppa: config.getConfig('coppa') === true ? 1 : 0,
+          ext: {}
+        },
+        tmax: bidRequest.timeout,
+        imp: [impObject],
+      };
+
+      if (bidRequest.gdprConsent && bidRequest.gdprConsent.gdprApplies) {
+        utils.deepSetValue(data, 'regs.ext.gdpr', bidRequest.gdprConsent.gdprApplies ? 1 : 0);
+        utils.deepSetValue(data, 'user.ext.consent', bidRequest.gdprConsent.consentString);
+      }
+
+      if (bidRequest.uspConsent !== undefined) {
+        utils.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 GothamAdsResponse = serverResponse.body;
+
+    let bids = [];
+    for (let response of GothamAdsResponse) {
+      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 utils.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 = {
+    id: bidRequest.transactionId,
+    ver: NATIVE_VERSION,
+  };
+
+  const assets = utils._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(utils.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 {
+    utils.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/gothamadsBidAdapter.md b/modules/gothamadsBidAdapter.md
new file mode 100644
index 00000000000..3105dff6c6c
--- /dev/null
+++ b/modules/gothamadsBidAdapter.md
@@ -0,0 +1,104 @@
+# Overview
+
+```
+Module Name: GothamAds SSP Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@gothamads.com
+```
+
+# Description
+
+Module that connects to GothamAds SSP demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+                code: 'placementId',
+                      mediaTypes: {
+                          banner: {
+                              sizes: [[300, 250], [300,600]]
+                              }
+                              },
+                bids: [{
+                        bidder: 'gothamads',
+                        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: 'gothamads',
+                            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: 'gothamads',
+                params: {
+                        placementId: 'hash',
+                    accountId: 'accountId'
+                }
+            }
+    ]
+  }
+            ];
+```
\ No newline at end of file
diff --git a/modules/gptPreAuction.js b/modules/gptPreAuction.js
new file mode 100644
index 00000000000..ee2b5406453
--- /dev/null
+++ b/modules/gptPreAuction.js
@@ -0,0 +1,103 @@
+import { config } from '../src/config.js';
+import * as utils from '../src/utils.js';
+import { getHook } from '../src/hook.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const MODULE_NAME = 'GPT Pre-Auction';
+export let _currentConfig = {};
+let hooksAdded = false;
+
+export const appendGptSlots = adUnits => {
+  const { customGptSlotMatching } = _currentConfig;
+
+  if (!utils.isGptPubadsDefined()) {
+    return;
+  }
+
+  const adUnitMap = adUnits.reduce((acc, adUnit) => {
+    acc[adUnit.code] = adUnit;
+    return acc;
+  }, {});
+
+  window.googletag.pubads().getSlots().forEach(slot => {
+    const matchingAdUnitCode = find(Object.keys(adUnitMap), customGptSlotMatching
+      ? customGptSlotMatching(slot)
+      : utils.isAdUnitCodeMatchingSlot(slot));
+
+    if (matchingAdUnitCode) {
+      const adUnit = adUnitMap[matchingAdUnitCode];
+      adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+      adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+      adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
+
+      const context = adUnit.ortb2Imp.ext.data;
+      context.adserver = context.adserver || {};
+      context.adserver.name = 'gam';
+      context.adserver.adslot = slot.getAdUnitPath();
+    }
+  });
+};
+
+export const appendPbAdSlot = adUnit => {
+  adUnit.ortb2Imp = adUnit.ortb2Imp || {};
+  adUnit.ortb2Imp.ext = adUnit.ortb2Imp.ext || {};
+  adUnit.ortb2Imp.ext.data = adUnit.ortb2Imp.ext.data || {};
+  const context = adUnit.ortb2Imp.ext.data;
+  const { customPbAdSlot } = _currentConfig;
+
+  if (customPbAdSlot) {
+    context.pbadslot = customPbAdSlot(adUnit.code, utils.deepAccess(context, 'adserver.adslot'));
+    return;
+  }
+
+  // use context.pbAdSlot if set
+  if (context.pbadslot) {
+    return;
+  }
+  // use data attribute 'data-adslotid' if set
+  try {
+    const adUnitCodeDiv = document.getElementById(adUnit.code);
+    if (adUnitCodeDiv.dataset.adslotid) {
+      context.pbadslot = adUnitCodeDiv.dataset.adslotid;
+      return;
+    }
+  } catch (e) {}
+  // banner adUnit, use GPT adunit if defined
+  if (utils.deepAccess(context, 'adserver.adslot')) {
+    context.pbadslot = context.adserver.adslot;
+    return;
+  }
+  context.pbadslot = adUnit.code;
+};
+
+export const makeBidRequestsHook = (fn, adUnits, ...args) => {
+  appendGptSlots(adUnits);
+  adUnits.forEach(adUnit => {
+    appendPbAdSlot(adUnit);
+  });
+  return fn.call(this, adUnits, ...args);
+};
+
+const handleSetGptConfig = moduleConfig => {
+  _currentConfig = utils.pick(moduleConfig, [
+    'enabled', enabled => enabled !== false,
+    'customGptSlotMatching', customGptSlotMatching =>
+      typeof customGptSlotMatching === 'function' && customGptSlotMatching,
+    'customPbAdSlot', customPbAdSlot => typeof customPbAdSlot === 'function' && customPbAdSlot,
+  ]);
+
+  if (_currentConfig.enabled) {
+    if (!hooksAdded) {
+      getHook('makeBidRequests').before(makeBidRequestsHook);
+      hooksAdded = true;
+    }
+  } else {
+    utils.logInfo(`${MODULE_NAME}: Turning off module`);
+    _currentConfig = {};
+    getHook('makeBidRequests').getHooks({hook: makeBidRequestsHook}).remove();
+    hooksAdded = false;
+  }
+};
+
+config.getConfig('gptPreAuction', config => handleSetGptConfig(config.gptPreAuction));
+handleSetGptConfig({});
diff --git a/modules/gridBidAdapter.js b/modules/gridBidAdapter.js
index d18effa349b..d4aceaea162 100644
--- a/modules/gridBidAdapter.js
+++ b/modules/gridBidAdapter.js
@@ -1,11 +1,11 @@
 import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
-import {config} from '../src/config.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'grid';
-const ENDPOINT_URL = 'https://grid.bidswitch.net/hb';
+const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson';
 const SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
@@ -40,69 +40,154 @@ export const spec = {
    *
    * @param {BidRequest[]} validBidRequests - an array of bids
    * @param {bidderRequest} bidderRequest bidder request object
-   * @return ServerRequest Info describing the request to the server.
+   * @return {ServerRequest[]} Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
-    const bids = validBidRequests || [];
+    if (!validBidRequests.length) {
+      return null;
+    }
     let pageKeywords = null;
-    let reqId;
+    let jwpseg = null;
+    let content = null;
+    let schain = null;
+    let userId = null;
+    let userIdAsEids = null;
+    let user = null;
+    let userExt = null;
+    let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
+
+    const referer = refererInfo ? encodeURIComponent(refererInfo.referer) : '';
+    const imp = [];
+    const bidsMap = {};
 
-    bids.forEach(bid => {
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode, mediaTypes} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
+    validBidRequests.forEach((bid) => {
+      if (!bidderRequestId) {
+        bidderRequestId = bid.bidderRequestId;
+      }
+      if (!auctionId) {
+        auctionId = bid.auctionId;
+      }
+      if (!schain) {
+        schain = bid.schain;
+      }
+      if (!userId) {
+        userId = bid.userId;
+      }
+      if (!userIdAsEids) {
+        userIdAsEids = bid.userIdAsEids;
+      }
+      const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp} = bid;
+      bidsMap[bidId] = bid;
+      if (!pageKeywords && !utils.isEmpty(keywords)) {
+        pageKeywords = utils.transformBidderParamKeywords(keywords);
+      }
+      const bidFloor = _getFloor(mediaTypes || {}, bid);
+      const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
+      if (jwTargeting) {
+        if (!jwpseg && jwTargeting.segments) {
+          jwpseg = jwTargeting.segments;
+        }
+        if (!content && jwTargeting.content) {
+          content = jwTargeting.content;
+        }
+      }
+      let impObj = {
+        id: bidId,
+        tagid: uid.toString(),
+        ext: {
+          divid: adUnitCode
+        }
+      };
+      if (ortb2Imp && ortb2Imp.ext && ortb2Imp.ext.data) {
+        impObj.ext.data = ortb2Imp.ext.data;
+        if (impObj.ext.data.adserver && impObj.ext.data.adserver.adslot) {
+          impObj.ext.gpid = impObj.ext.data.adserver.adslot;
+        }
+      }
 
-      if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
-        pageKeywords = utils.transformBidderParamKeywords(bid.params.keywords);
+      if (bidFloor) {
+        impObj.bidfloor = bidFloor;
       }
 
-      const addedSizes = {};
-      sizesId.forEach((sizeId) => {
-        addedSizes[sizeId] = true;
-      });
-      const bannerSizesId = utils.parseSizesInput(utils.deepAccess(mediaTypes, 'banner.sizes'));
-      const videoSizesId = utils.parseSizesInput(utils.deepAccess(mediaTypes, 'video.playerSize'));
-      bannerSizesId.concat(videoSizesId).forEach((sizeId) => {
-        if (!addedSizes[sizeId]) {
-          addedSizes[sizeId] = true;
-          sizesId.push(sizeId);
+      if (!mediaTypes || mediaTypes[BANNER]) {
+        const banner = createBannerRequest(bid, mediaTypes ? mediaTypes[BANNER] : {});
+        if (banner) {
+          impObj.banner = banner;
         }
-      });
+      }
+      if (mediaTypes && mediaTypes[VIDEO]) {
+        const video = createVideoRequest(bid, mediaTypes[VIDEO]);
+        if (video) {
+          impObj.video = video;
+        }
+      }
 
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
+      if (impObj.banner || impObj.video) {
+        imp.push(impObj);
       }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
-      } else {
-        slotsMap[adUnitCode].bids.push(bid);
+    });
+
+    const source = {
+      tid: auctionId,
+      ext: {
+        wrapper: 'Prebid_js',
+        wrapper_version: '$prebid.version$'
       }
-      const slot = slotsMap[adUnitCode];
+    };
 
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
+    if (schain) {
+      source.ext.schain = schain;
+    }
 
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
-    });
+    const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+
+    let request = {
+      id: bidderRequestId,
+      site: {
+        page: referer
+      },
+      tmax,
+      source,
+      imp
+    };
+
+    if (content) {
+      request.site.content = content;
+    }
+
+    if (jwpseg && jwpseg.length) {
+      user = {
+        data: [{
+          name: 'iow_labs_pub_data',
+          segment: jwpseg.map((seg) => {
+            return {name: 'jwpseg', value: seg};
+          })
+        }]
+      };
+    }
+
+    if (gdprConsent && gdprConsent.consentString) {
+      userExt = {consent: gdprConsent.consentString};
+    }
+
+    if (userIdAsEids && userIdAsEids.length) {
+      userExt = userExt || {};
+      userExt.eids = [...userIdAsEids];
+    }
+
+    if (userExt && Object.keys(userExt).length) {
+      user = user || {};
+      user.ext = userExt;
+    }
+
+    if (user) {
+      request.user = user;
+    }
 
     const configKeywords = utils.transformBidderParamKeywords({
-      'user': utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || null,
-      'context': utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || null
+      'user': utils.deepAccess(config.getConfig('ortb2.user'), 'keywords') || null,
+      'context': utils.deepAccess(config.getConfig('ortb2.site'), 'keywords') || null
     });
 
     if (configKeywords.length) {
@@ -113,43 +198,40 @@ export const spec = {
       pageKeywords.forEach(deleteValues);
     }
 
-    const payload = {
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
     if (pageKeywords) {
-      payload.keywords = JSON.stringify(pageKeywords);
+      request.ext = {
+        keywords: pageKeywords
+      };
     }
 
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
-      }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
-      }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+    if (gdprConsent && gdprConsent.gdprApplies) {
+      request.regs = {
+        ext: {
+          gdpr: gdprConsent.gdprApplies ? 1 : 0
         }
-        payload.gdpr_applies =
-          (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-            ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
       }
-      if (bidderRequest.uspConsent) {
-        payload.us_privacy = bidderRequest.uspConsent;
+    }
+
+    if (uspConsent) {
+      if (!request.regs) {
+        request.regs = {ext: {}};
       }
+      request.regs.ext.us_privacy = uspConsent;
+    }
+
+    if (config.getConfig('coppa') === true) {
+      if (!request.regs) {
+        request.regs = {};
+      }
+      request.regs.coppa = 1;
     }
 
     return {
-      method: 'GET',
+      method: 'POST',
       url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
+      data: JSON.stringify(request),
+      newFormat: true,
+      bidsMap
     };
   },
   /**
@@ -162,7 +244,6 @@ export const spec = {
   interpretResponse: function(serverResponse, bidRequest) {
     serverResponse = serverResponse && serverResponse.body;
     const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
 
     let errorMessage;
 
@@ -173,7 +254,7 @@ export const spec = {
 
     if (!errorMessage && serverResponse.seatbid) {
       serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, bidResponses);
+        _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses);
       });
     }
     if (errorMessage) utils.logError(errorMessage);
@@ -203,6 +284,33 @@ export const spec = {
   }
 };
 
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Object} bid
+ * @returns {Number} floor
+ */
+function _getFloor (mediaTypes, bid) {
+  const curMediaType = mediaTypes.video ? 'video' : 'banner';
+  let floor = bid.params.bidFloor || 0;
+
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: curMediaType,
+      size: bid.sizes.map(([w, h]) => ({w, h}))
+    });
+
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
+  }
+
+  return floor;
+}
+
 function isPopulatedArray(arr) {
   return !!(utils.isArray(arr) && arr.length > 0);
 }
@@ -224,68 +332,46 @@ function _getBidFromResponse(respItem) {
   return respItem && respItem.bid && respItem.bid[0];
 }
 
-function _addBidResponse(serverBid, bidsMap, bidResponses) {
+function _addBidResponse(serverBid, bidRequest, bidResponses) {
   if (!serverBid) return;
   let errorMessage;
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
   if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'USD',
-          netRevenue: false,
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
+    const bid = bidRequest.bidsMap[serverBid.impid];
+    if (bid) {
+      const bidResponse = {
+        requestId: bid.bidId, // bid.bidderRequestId,
+        cpm: serverBid.price,
+        width: serverBid.w,
+        height: serverBid.h,
+        creativeId: serverBid.auid, // bid.bidId,
+        currency: 'USD',
+        netRevenue: true,
+        ttl: TIME_TO_LIVE,
+        meta: {
+          advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+        },
+        dealId: serverBid.dealid
+      };
 
-        if (serverBid.content_type === 'video') {
-          bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
-          bidResponse.adResponse = {
-            content: bidResponse.vastXml
-          };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            });
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
-        }
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
+      if (serverBid.content_type === 'video') {
+        bidResponse.vastXml = serverBid.adm;
+        bidResponse.mediaType = VIDEO;
+        bidResponse.adResponse = {
+          content: bidResponse.vastXml
+        };
+        if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
+          bidResponse.renderer = createRenderer(bidResponse, {
+            id: bid.bidId,
+            url: RENDERER_URL
           });
         }
+      } else {
+        bidResponse.ad = serverBid.adm;
+        bidResponse.mediaType = BANNER;
       }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
+      bidResponses.push(bidResponse);
     }
   }
   if (errorMessage) {
@@ -293,6 +379,42 @@ function _addBidResponse(serverBid, bidsMap, bidResponses) {
   }
 }
 
+function createVideoRequest(bid, mediaType) {
+  const {playerSize, mimes, durationRangeSec, protocols} = mediaType;
+  const size = (playerSize || bid.sizes || [])[0];
+  if (!size) return;
+
+  let result = utils.parseGPTSingleSizeArrayToRtbSize(size);
+
+  if (mimes) {
+    result.mimes = mimes;
+  }
+
+  if (durationRangeSec && durationRangeSec.length === 2) {
+    result.minduration = durationRangeSec[0];
+    result.maxduration = durationRangeSec[1];
+  }
+
+  if (protocols && protocols.length) {
+    result.protocols = protocols;
+  }
+
+  return result;
+}
+
+function createBannerRequest(bid, mediaType) {
+  const sizes = mediaType.sizes || bid.sizes;
+  if (!sizes || !sizes.length) return;
+
+  let format = sizes.map((size) => utils.parseGPTSingleSizeArrayToRtbSize(size));
+  let result = utils.parseGPTSingleSizeArrayToRtbSize(sizes[0]);
+
+  if (format.length) {
+    result.format = format
+  }
+  return result;
+}
+
 function outstreamRender (bid) {
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
diff --git a/modules/gridBidAdapter.md b/modules/gridBidAdapter.md
index 77b9bbf0f36..6a7075ccb00 100644
--- a/modules/gridBidAdapter.md
+++ b/modules/gridBidAdapter.md
@@ -20,7 +20,7 @@ Grid bid adapter supports Banner and Video (instream and outstream).
                        bidder: "grid",
                        params: {
                            uid: '1',
-                           priceType: 'gross' // by default is 'net'
+                           bidFloor: 0.5
                        }
                    }
                ]
@@ -32,7 +32,6 @@ Grid bid adapter supports Banner and Video (instream and outstream).
                        bidder: "grid",
                        params: {
                            uid: 2,
-                           priceType: 'gross',
                            keywords: {
                                brandsafety: ['disaster'],
                                topic: ['stress', 'fear']
diff --git a/modules/gridNMBidAdapter.js b/modules/gridNMBidAdapter.js
index ffd6c1b250c..4ab8464b115 100644
--- a/modules/gridNMBidAdapter.js
+++ b/modules/gridNMBidAdapter.js
@@ -24,6 +24,8 @@ const LOG_ERROR_MESS = {
   hasNoArrayOfBids: 'Seatbid from response has no array of bid objects - '
 };
 
+const VIDEO_KEYS = ['mimes', 'protocols', 'startdelay', 'placement', 'linearity', 'skip', 'skipmin', 'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate', 'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend', 'delivery', 'pos', 'companionad', 'api', 'companiontype'];
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [ VIDEO ],
@@ -39,11 +41,12 @@ export const spec = {
       !bid.params.secid || !utils.isStr(bid.params.secid) ||
       !bid.params.pubid || !utils.isStr(bid.params.pubid);
 
+    const video = utils.deepAccess(bid, 'mediaTypes.video') || {};
+    const { protocols = video.protocols, mimes = video.mimes } = utils.deepAccess(bid, 'params.video') || {};
     if (!invalid) {
-      invalid = !bid.params.video || !bid.params.video.protocols || !bid.params.video.mimes;
+      invalid = !protocols || !mimes;
     }
     if (!invalid) {
-      const {protocols, mimes} = bid.params.video;
       invalid = !utils.isArray(mimes) || !mimes.length || mimes.filter((it) => !(it && utils.isStr(it))).length;
       if (!invalid) {
         invalid = !utils.isArray(protocols) || !protocols.length || protocols.filter((it) => !(utils.isNumber(it) && it > 0 && !(it % 1))).length;
@@ -63,7 +66,7 @@ export const spec = {
     const requests = [];
 
     bids.forEach(bid => {
-      const {params, bidderRequestId, sizes} = bid;
+      const { params, bidderRequestId, sizes } = bid;
       const payload = {
         sizes: utils.parseSizesInput(sizes).join(','),
         r: bidderRequestId,
@@ -91,11 +94,32 @@ export const spec = {
         }
       }
 
+      const video = utils.deepAccess(bid, 'mediaTypes.video') || {};
+      const paramsVideo = Object.assign({}, params.video);
+      VIDEO_KEYS.forEach((key) => {
+        if (!(key in paramsVideo) && key in video) {
+          paramsVideo[key] = video[key];
+        }
+      });
+
+      if (!paramsVideo.size && video.playerSize && video.playerSize.length === 2) {
+        paramsVideo.size = video.playerSize.join('x');
+      }
+
+      if (!('mind' in paramsVideo) && 'minduration' in video) {
+        paramsVideo.mind = video.minduration;
+      }
+      if (!('maxd' in paramsVideo) && 'maxduration' in video) {
+        paramsVideo.maxd = video.maxduration;
+      }
+
+      const paramsToSend = Object.assign({}, params, {video: paramsVideo});
+
       requests.push({
         method: 'POST',
         url: ENDPOINT_URL + '?' + utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
         bid: bid,
-        data: params // content
+        data: paramsToSend // content
       });
     });
 
@@ -134,17 +158,19 @@ export const spec = {
           }
           const bidResponse = {
             requestId: bid.bidId,
-            bidderCode: spec.code,
             cpm: serverBid.price,
             width: serverBid.w,
             height: serverBid.h,
             creativeId: serverBid.auid || bid.bidderRequestId,
             currency: 'USD',
-            netRevenue: false,
+            netRevenue: true,
             ttl: TIME_TO_LIVE,
             dealId: serverBid.dealid,
             vastXml: serverBid.adm,
             mediaType: VIDEO,
+            meta: {
+              advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+            },
             adResponse: {
               content: serverBid.adm
             }
diff --git a/modules/gumgumBidAdapter.js b/modules/gumgumBidAdapter.js
index 54d845be7ad..ceb6a1a9c96 100644
--- a/modules/gumgumBidAdapter.js
+++ b/modules/gumgumBidAdapter.js
@@ -135,7 +135,8 @@ function isBidRequestValid (bid) {
     params,
     adUnitCode
   } = bid;
-  const id = params.inScreen || params.inScreenPubID || params.inSlot || params.ICV || params.video || params.inVideo;
+  const legacyParamID = params.inScreen || params.inScreenPubID || params.inSlot || params.ICV || params.video || params.inVideo;
+  const id = legacyParamID || params.slot || params.native || params.zone || params.pubID;
 
   if (invalidRequestIds[id]) {
     utils.logWarn(`[GumGum] Please check the implementation for ${id} for the placement ${adUnitCode}`);
@@ -143,6 +144,8 @@ function isBidRequestValid (bid) {
   }
 
   switch (true) {
+    case !!(params.zone): break;
+    case !!(params.pubId): break;
     case !!(params.inScreen): break;
     case !!(params.inScreenPubID): break;
     case !!(params.inSlot): break;
@@ -198,6 +201,35 @@ function _getVidParams (attributes) {
   };
 }
 
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Number} bidfloor
+ * @param {Object} bid
+ * @returns {Number} floor
+ */
+function _getFloor (mediaTypes, staticBidFloor, bid) {
+  const curMediaType = Object.keys(mediaTypes)[0] || 'banner';
+  const bidFloor = { floor: 0, currency: 'USD' };
+
+  if (typeof bid.getFloor === 'function') {
+    const { currency, floor } = bid.getFloor({
+      mediaType: curMediaType,
+      size: '*'
+    });
+    floor && (bidFloor.floor = floor);
+    currency && (bidFloor.currency = currency);
+
+    if (staticBidFloor && floor && currency === 'USD') {
+      bidFloor.floor = Math.max(staticBidFloor, parseFloat(floor));
+    }
+  } else if (staticBidFloor) {
+    bidFloor.floor = staticBidFloor
+  }
+
+  return bidFloor;
+}
+
 /**
  * Make a server request from the list of BidRequests.
  *
@@ -217,42 +249,60 @@ function buildRequests (validBidRequests, bidderRequest) {
       params = {},
       schain,
       transactionId,
-      userId = {}
+      userId = {},
+      ortb2Imp
     } = bidRequest;
-    const bannerSizes = mediaTypes.banner && mediaTypes.banner.sizes;
+    const { currency, floor } = _getFloor(mediaTypes, params.bidfloor, bidRequest);
+    let sizes = [1, 1];
     let data = {};
+    let gpid = '';
 
-    if (pageViewId) {
-      data.pv = pageViewId;
-    }
-    if (params.bidfloor) {
-      data.fp = params.bidfloor;
+    // ADJS-1024
+    if (utils.deepAccess(ortb2Imp, 'ext.data.adserver.name')) {
+      gpid = ortb2Imp.ext.data.adserver.adslot
     }
-    if (params.inScreenPubID) {
-      data.pubId = params.inScreenPubID;
-      data.pi = 2;
+
+    if (mediaTypes.banner) {
+      sizes = mediaTypes.banner.sizes;
+    } else if (mediaTypes.video) {
+      sizes = mediaTypes.video.playerSize;
+      data = _getVidParams(mediaTypes.video);
     }
-    if (params.inScreen) {
-      data.t = params.inScreen;
-      data.pi = 2;
+
+    if (pageViewId) {
+      data.pv = pageViewId;
     }
-    if (params.inSlot) {
-      data.si = parseInt(params.inSlot, 10);
-      data.pi = 3;
+
+    if (floor) {
+      data.fp = floor;
+      data.fpc = currency;
     }
-    if (params.ICV) {
-      data.ni = parseInt(params.ICV, 10);
-      data.pi = 5;
+
+    if (params.iriscat && typeof params.iriscat === 'string') {
+      data.iriscat = params.iriscat;
     }
-    if (params.videoPubID) {
-      data = Object.assign(data, _getVidParams(mediaTypes.video));
-      data.pubId = params.videoPubID;
-      data.pi = 7;
+
+    if (params.irisid && typeof params.irisid === 'string') {
+      data.irisid = params.irisid;
     }
-    if (params.video) {
-      data = Object.assign(data, _getVidParams(mediaTypes.video));
-      data.t = params.video;
-      data.pi = 7;
+
+    if (params.zone || params.pubId) {
+      params.zone ? (data.t = params.zone) : (data.pubId = params.pubId);
+
+      data.pi = 2; // inscreen
+      // override pi if the following is found
+      if (params.slot) {
+        data.si = parseInt(params.slot, 10);
+        data.pi = 3;
+        data.bf = sizes.reduce((acc, curSlotDim) => `${acc}${acc && ','}${curSlotDim[0]}x${curSlotDim[1]}`, '');
+      } else if (params.native) {
+        data.ni = parseInt(params.native, 10);
+        data.pi = 5;
+      } else if (mediaTypes.video) {
+        data.pi = mediaTypes.video.linearity === 2 ? 6 : 7; // invideo : video
+      }
+    } else { // legacy params
+      data = { ...data, ...handleLegacyParams(params, sizes) }
     }
     if (params.inVideo) {
       data = Object.assign(data, _getVidParams(mediaTypes.video));
@@ -278,15 +328,50 @@ function buildRequests (validBidRequests, bidderRequest) {
       tId: transactionId,
       pi: data.pi,
       selector: params.selector,
-      sizes: bannerSizes,
+      sizes,
       url: BID_ENDPOINT,
       method: 'GET',
+      gpid: gpid,
       data: Object.assign(data, _getBrowserParams(topWindowUrl), _getDigiTrustQueryParams(userId), _getTradeDeskIDParam(userId))
     })
   });
   return bids;
 }
 
+function handleLegacyParams (params, sizes) {
+  const data = {};
+  if (params.inScreenPubID) {
+    data.pubId = params.inScreenPubID;
+    data.pi = 2;
+  }
+  if (params.inScreen) {
+    data.t = params.inScreen;
+    data.pi = 2;
+  }
+  if (params.inSlot) {
+    data.si = parseInt(params.inSlot, 10);
+    data.pi = 3;
+    data.bf = sizes.reduce((acc, curSlotDim) => `${acc}${acc && ','}${curSlotDim[0]}x${curSlotDim[1]}`, '');
+  }
+  if (params.ICV) {
+    data.ni = parseInt(params.ICV, 10);
+    data.pi = 5;
+  }
+  if (params.videoPubID) {
+    data.pubId = params.videoPubID;
+    data.pi = 7;
+  }
+  if (params.video) {
+    data.t = params.video;
+    data.pi = 7;
+  }
+  if (params.inVideo) {
+    data.t = params.inVideo;
+    data.pi = 6;
+  }
+  return data;
+}
+
 /**
  * Unpack the response from the server into a list of bids.
  *
@@ -299,7 +384,7 @@ function interpretResponse (serverResponse, bidRequest) {
 
   if (!serverResponseBody || serverResponseBody.err) {
     const data = bidRequest.data || {}
-    const id = data.t || data.si || data.ni || data.pubId;
+    const id = data.si || data.ni || data.t || data.pubId;
     const delayTime = serverResponseBody ? serverResponseBody.err.drt : DELAY_REQUEST_TIME;
     invalidRequestIds[id] = { productId: data.pi, timestamp: new Date().getTime() };
 
@@ -313,10 +398,16 @@ function interpretResponse (serverResponse, bidRequest) {
     ad: {
       price: 0,
       id: 0,
-      markup: ''
+      markup: '',
+      width: 0,
+      height: 0
     },
     pag: {
       pvid: 0
+    },
+    meta: {
+      adomain: [],
+      mediaType: ''
     }
   }
   const {
@@ -324,19 +415,31 @@ function interpretResponse (serverResponse, bidRequest) {
       price: cpm,
       id: creativeId,
       markup,
-      cur
+      cur,
+      width: responseWidth,
+      height: responseHeight
     },
     cw: wrapper,
     pag: {
       pvid
     },
-    jcsi
+    jcsi,
+    meta: {
+      adomain: advertiserDomains,
+      mediaType: type
+    }
   } = Object.assign(defaultResponse, serverResponseBody)
   let data = bidRequest.data || {}
   let product = data.pi
+  let mediaType = (product === 6 || product === 7) ? VIDEO : BANNER
   let isTestUnit = (product === 3 && data.si === 9)
-  let sizes = utils.parseSizesInput(bidRequest.sizes)
+  // use response sizes if available
+  let sizes = responseWidth && responseHeight ? [`${responseWidth}x${responseHeight}`] : utils.parseSizesInput(bidRequest.sizes)
   let [width, height] = sizes[0].split('x')
+  let metaData = {
+    advertiserDomains: advertiserDomains || [],
+    mediaType: type || mediaType
+  }
 
   // return 1x1 when breakout expected
   if ((product === 2 || product === 5) && includes(sizes, '1x1')) {
@@ -355,9 +458,9 @@ function interpretResponse (serverResponse, bidRequest) {
     bidResponses.push({
       // dealId: DEAL_ID,
       // referrer: REFERER,
-      ...(product === 7 && { vastXml: markup }),
       ad: wrapper ? getWrapperCode(wrapper, Object.assign({}, serverResponseBody, { bidRequest })) : markup,
-      ...(product === 6 && {ad: markup}),
+      ...(mediaType === VIDEO && {ad: markup, vastXml: markup}),
+      mediaType,
       cpm: isTestUnit ? 0.1 : cpm,
       creativeId,
       currency: cur || 'USD',
@@ -365,7 +468,8 @@ function interpretResponse (serverResponse, bidRequest) {
       netRevenue: true,
       requestId: bidRequest.id,
       ttl: TIME_TO_LIVE,
-      width
+      width,
+      meta: metaData
     })
   }
   return bidResponses
diff --git a/modules/gumgumBidAdapter.md b/modules/gumgumBidAdapter.md
index f47666e9628..57d56235d1c 100644
--- a/modules/gumgumBidAdapter.md
+++ b/modules/gumgumBidAdapter.md
@@ -8,14 +8,87 @@ Maintainer: engineering@gumgum.com
 
 # Description
 
-GumGum adapter for Prebid.js 1.0
+GumGum adapter for Prebid.js
+Please note that both video and in-video products require a mediaType of video. 
+In-screen and slot products should have a mediaType of banner.
 
 # Test Parameters
 ```
+var adUnits = [
+  {
+    code: 'slot-placement',
+    sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          slot: '15901', // GumGum Slot ID given to the client,
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'inscreen-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'dc9d6be1', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  },{
+    code: 'video-placement',
+    sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 1,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    },
+    bids: [
+      {
+        bidder: 'gumgum',
+        params: {
+          zone: 'ggumtest', // GumGum Zone ID given to the client
+          bidfloor: 0.03 // CPM bid floor
+        }
+      }
+    ]
+  }
+];
+```
+
+# Legacy Test Parameters
+```
 var adUnits = [
   {
     code: 'test-div',
     sizes: [[300, 250]],
+    mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -28,6 +101,11 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+        banner: {
+          sizes: [[1, 1]],
+        }
+    },
     bids: [
       {
         bidder: 'gumgum',
@@ -40,6 +118,18 @@ var adUnits = [
   },{
     code: 'test-div',
     sizes: [[300, 50]],
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        minduration: 1,
+        maxduration: 2,
+        linearity: 2,
+        startdelay: 1,
+        placement: 1,
+        protocols: [1, 2]
+      }
+    }
     bids: [
       {
         bidder: 'gumgum',
diff --git a/modules/h12mediaBidAdapter.js b/modules/h12mediaBidAdapter.js
index 0d2c22a3f68..7b736780226 100644
--- a/modules/h12mediaBidAdapter.js
+++ b/modules/h12mediaBidAdapter.js
@@ -1,6 +1,5 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import find from 'core-js-pure/features/array/find.js';
 const BIDDER_CODE = 'h12media';
 const DEFAULT_URL = 'https://bidder.h12-media.com/prebid/';
 const DEFAULT_CURRENCY = 'USD';
@@ -16,21 +15,31 @@ export const spec = {
   },
 
   buildRequests: function(validBidRequests, bidderRequest) {
-    const requestUrl = validBidRequests[0].params.endpointdom || DEFAULT_URL;
-    const isiframe = !((window.self === window.top) || window.frameElement);
+    const isiframe = utils.inIframe();
     const screenSize = getClientDimensions();
     const docSize = getDocumentDimensions();
 
-    const bidrequests = validBidRequests.map((bidRequest) => {
+    return validBidRequests.map((bidRequest) => {
       const bidderParams = bidRequest.params;
-      const adUnitElement = document.getElementById(bidRequest.adUnitCode);
+      const requestUrl = bidderParams.endpointdom || DEFAULT_URL;
+      let pubsubid = bidderParams.pubsubid || '';
+      if (pubsubid && pubsubid.length > 32) {
+        utils.logError('Bidder param \'pubsubid\' should be not more than 32 chars.');
+        pubsubid = '';
+      }
+      const pubcontainerid = bidderParams.pubcontainerid;
+      const adUnitElement = document.getElementById(pubcontainerid || bidRequest.adUnitCode);
       const ishidden = !isVisible(adUnitElement);
-      const coords = {
+      const framePos = getFramePos();
+      const coords = isiframe ? {
+        x: framePos[0],
+        y: framePos[1],
+      } : {
         x: adUnitElement && adUnitElement.getBoundingClientRect().x,
         y: adUnitElement && adUnitElement.getBoundingClientRect().y,
       };
 
-      return {
+      const bidrequest = {
         bidId: bidRequest.bidId,
         transactionId: bidRequest.transactionId,
         adunitId: bidRequest.adUnitCode,
@@ -40,33 +49,46 @@ export const spec = {
         adunitSize: bidRequest.mediaTypes.banner.sizes || [],
         coords,
         ishidden,
+        pubsubid,
+        pubcontainerid,
       };
-    });
 
-    return {
-      method: 'POST',
-      url: requestUrl,
-      options: {withCredentials: false},
-      data: {
-        gdpr: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false,
-        gdpr_cs: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? bidderRequest.gdprConsent.consentString : '',
-        topLevelUrl: window.top.location.href,
-        refererUrl: bidderRequest.refererInfo ? bidderRequest.refererInfo.referer : '',
-        isiframe,
-        version: '$prebid.version$',
-        visitorInfo: {
-          localTime: getLocalDateFormatted(),
-          dayOfWeek: new Date().getDay(),
-          screenWidth: screenSize[0],
-          screenHeight: screenSize[1],
-          docWidth: docSize[0],
-          docHeight: docSize[1],
-          scrollbarx: window.scrollX,
-          scrollbary: window.scrollY,
+      let windowTop;
+      try {
+        windowTop = window.top;
+      } catch (e) {
+        utils.logMessage(e);
+        windowTop = window;
+      }
+
+      return {
+        method: 'POST',
+        url: requestUrl,
+        options: {withCredentials: true},
+        data: {
+          gdpr: !!utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies', false),
+          gdpr_cs: utils.deepAccess(bidderRequest, 'gdprConsent.consentString', ''),
+          usp: !!utils.deepAccess(bidderRequest, 'uspConsent', false),
+          usp_cs: utils.deepAccess(bidderRequest, 'uspConsent', ''),
+          topLevelUrl: utils.deepAccess(bidderRequest, 'refererInfo.referer', ''),
+          refererUrl: windowTop.document.referrer,
+          isiframe,
+          version: '$prebid.version$',
+          ExtUserIDs: bidRequest.userId,
+          visitorInfo: {
+            localTime: getLocalDateFormatted(),
+            dayOfWeek: new Date().getDay(),
+            screenWidth: screenSize[0],
+            screenHeight: screenSize[1],
+            docWidth: docSize[0],
+            docHeight: docSize[1],
+            scrollbarx: windowTop.scrollX,
+            scrollbary: windowTop.scrollY,
+          },
+          bidrequest,
         },
-        bidrequests,
-      },
-    };
+      };
+    });
   },
 
   interpretResponse: function(serverResponse, bidRequests) {
@@ -74,29 +96,28 @@ export const spec = {
     try {
       const serverBody = serverResponse.body;
       if (serverBody) {
-        if (serverBody.bids) {
-          serverBody.bids.forEach(bidBody => {
-            const bidRequest = find(bidRequests.data.bidrequests, bid => bid.bidId === bidBody.bidId);
-            const bidResponse = {
-              currency: serverBody.currency || DEFAULT_CURRENCY,
-              netRevenue: serverBody.netRevenue || DEFAULT_NET_REVENUE,
-              ttl: serverBody.ttl || DEFAULT_TTL,
-              requestId: bidBody.bidId,
-              cpm: bidBody.cpm,
-              width: bidBody.width,
-              height: bidBody.height,
-              creativeId: bidBody.creativeId,
-              ad: bidBody.ad,
-              meta: bidBody.meta,
-              mediaType: 'banner',
-            };
-            if (bidRequest) {
-              bidResponse.pubid = bidRequest.pubid;
-              bidResponse.placementid = bidRequest.placementid;
-              bidResponse.size = bidRequest.size;
-            }
-            bidResponses.push(bidResponse);
-          });
+        if (serverBody.bid) {
+          const bidBody = serverBody.bid;
+          const bidRequest = bidRequests.data.bidrequest;
+          const bidResponse = {
+            currency: serverBody.currency || DEFAULT_CURRENCY,
+            netRevenue: serverBody.netRevenue || DEFAULT_NET_REVENUE,
+            ttl: serverBody.ttl || DEFAULT_TTL,
+            requestId: bidBody.bidId,
+            cpm: bidBody.cpm,
+            width: bidBody.width,
+            height: bidBody.height,
+            creativeId: bidBody.creativeId,
+            ad: bidBody.ad,
+            meta: bidBody.meta,
+            mediaType: 'banner',
+          };
+          if (bidRequest) {
+            bidResponse.pubid = bidRequest.pubid;
+            bidResponse.placementid = bidRequest.placementid;
+            bidResponse.size = bidRequest.size;
+          }
+          bidResponses.push(bidResponse);
         }
       }
       return bidResponses;
@@ -105,47 +126,50 @@ export const spec = {
     }
   },
 
-  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
-    const serverBody = serverResponses[0].body;
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, usPrivacy) {
     const syncs = [];
+    const uspApplies = !!utils.deepAccess(usPrivacy, 'uspConsent', false);
+    const uspString = utils.deepAccess(usPrivacy, 'uspConsent', '');
     gdprConsent = gdprConsent || {
       gdprApplies: false, consentString: '',
     };
 
-    if (serverBody) {
-      if (serverBody.bids) {
-        serverBody.bids.forEach(bidBody => {
-          const userSyncUrls = bidBody.usersync || [];
-          const userSyncUrlProcess = url => {
-            return url
-              .replace('{gdpr}', gdprConsent.gdprApplies)
-              .replace('{gdpr_cs}', gdprConsent.consentString);
-          }
+    const userSyncUrlProcess = url => {
+      return url
+        .replace('{gdpr}', gdprConsent.gdprApplies)
+        .replace('{gdpr_cs}', gdprConsent.consentString)
+        .replace('{usp}', uspApplies)
+        .replace('{usp_cs}', uspString);
+    }
 
-          userSyncUrls.forEach(sync => {
-            if (syncOptions.iframeEnabled && sync.type === 'iframe' && sync.url) {
-              syncs.push({
-                type: 'iframe',
-                url: userSyncUrlProcess(sync.url),
-              });
-            }
-            if (syncOptions.pixelEnabled && sync.type === 'image' && sync.url) {
-              syncs.push({
-                type: 'image',
-                url: userSyncUrlProcess(sync.url),
-              });
-            }
+    serverResponses.forEach(serverResponse => {
+      const userSyncUrls = serverResponse.body.usersync || [];
+      userSyncUrls.forEach(sync => {
+        if (syncOptions.iframeEnabled && sync.type === 'iframe' && sync.url) {
+          syncs.push({
+            type: 'iframe',
+            url: userSyncUrlProcess(sync.url),
           });
-        });
-      }
-    }
+        }
+        if (syncOptions.pixelEnabled && sync.type === 'image' && sync.url) {
+          syncs.push({
+            type: 'image',
+            url: userSyncUrlProcess(sync.url),
+          });
+        }
+      })
+    });
 
     return syncs;
   },
 }
 
 function getContext(elem) {
-  return elem && window.document.body.contains(elem) ? window : (window.top.document.body.contains(elem) ? top : undefined);
+  try {
+    return elem && window.document.body.contains(elem) ? window : (window.top.document.body.contains(elem) ? top : undefined);
+  } catch (e) {
+    return undefined;
+  }
 }
 
 function isDefined(val) {
@@ -206,4 +230,24 @@ function getLocalDateFormatted() {
   return `${d.getFullYear()}-${two(d.getMonth() + 1)}-${two(d.getDate())} ${two(d.getHours())}:${two(d.getMinutes())}:${two(d.getSeconds())}`;
 }
 
+function getFramePos() {
+  let t = window;
+  let m = 0;
+  let frmLeft = 0;
+  let frmTop = 0;
+  do {
+    m = m + 1;
+    try {
+      if (m > 1) {
+        t = t.parent
+      }
+      frmLeft = frmLeft + t.frameElement.getBoundingClientRect().left;
+      frmTop = frmTop + t.frameElement.getBoundingClientRect().top;
+    } catch (o) { /* keep looping */
+    }
+  } while ((m < 100) && (t.parent !== t.self))
+
+  return [frmLeft, frmTop];
+}
+
 registerBidder(spec);
diff --git a/modules/haloIdSystem.js b/modules/haloIdSystem.js
new file mode 100644
index 00000000000..4a0330367f5
--- /dev/null
+++ b/modules/haloIdSystem.js
@@ -0,0 +1,77 @@
+/**
+ * This module adds HaloID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/haloIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {submodule} from '../src/hook.js';
+import * as utils from '../src/utils.js';
+
+const MODULE_NAME = 'haloId';
+const AU_GVLID = 561;
+
+export const storage = getStorageManager(AU_GVLID, 'halo');
+
+/** @type {Submodule} */
+export const haloIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {{value:string}} value
+   * @returns {{haloId:Object}}
+   */
+  decode(value) {
+    let haloId = storage.getDataFromLocalStorage('auHaloId');
+    if (utils.isStr(haloId)) {
+      return {haloId: haloId};
+    }
+    return (value && typeof value['haloId'] === 'string') ? { 'haloId': value['haloId'] } : 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) {
+    const url = `https://id.halo.ad.gt/api/v1/pbhid`;
+
+    const resp = function (callback) {
+      let haloId = storage.getDataFromLocalStorage('auHaloId');
+      if (utils.isStr(haloId)) {
+        const responseObj = {haloId: haloId};
+        callback(responseObj);
+      } else {
+        const callbacks = {
+          success: response => {
+            let responseObj;
+            if (response) {
+              try {
+                responseObj = JSON.parse(response);
+              } catch (error) {
+                utils.logError(error);
+              }
+            }
+            callback(responseObj);
+          },
+          error: error => {
+            utils.logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+            callback();
+          }
+        };
+        ajax(url, callbacks, undefined, {method: 'GET'});
+      }
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', haloIdSubmodule);
diff --git a/modules/haloIdSystem.md b/modules/haloIdSystem.md
new file mode 100644
index 00000000000..0be0be27f5d
--- /dev/null
+++ b/modules/haloIdSystem.md
@@ -0,0 +1,32 @@
+## Audigent Halo User ID Submodule
+
+Audigent Halo ID Module. For assistance setting up your module please contact us at [prebid@audigent.com](prebid@audigent.com).
+
+### Prebid Params
+
+Individual params may be set for the Audigent Halo ID Submodule. At least one identifier must be set in the params.
+
+```
+pbjs.setConfig({
+    usersync: {
+        userIds: [{
+            name: 'haloId',
+            storage: {
+                name: 'haloId',
+                type: 'html5'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the HaloID User ID Module integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the HaloID module - `"haloId"` | `"haloId"` |
+| 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. | `"haloid"` |
+| 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 Halo 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 | `{"haloId": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}` |
diff --git a/modules/haloRtdProvider.js b/modules/haloRtdProvider.js
new file mode 100644
index 00000000000..b57787aab14
--- /dev/null
+++ b/modules/haloRtdProvider.js
@@ -0,0 +1,192 @@
+/**
+ * This module adds the Audigent Halo provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch real-time data from Audigent
+ * @module modules/haloRtdProvider
+ * @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, isPlainObject, mergeDeep, logError} from '../src/utils.js';
+
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'halo';
+const AU_GVLID = 561;
+
+export const HALOID_LOCAL_NAME = 'auHaloId';
+export const RTD_LOCAL_NAME = 'auHaloRtd';
+export const storage = getStorageManager(AU_GVLID, SUBMODULE_NAME);
+
+/**
+ * Deep set an object unless value present.
+ * @param {Object} obj
+ * @param {String} path
+ * @param {Object} val
+ */
+const 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;
+};
+
+/**
+ * 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);
+}
+
+/**
+ * Param or default.
+ * @param {String} param
+ * @param {String} defaultVal
+ */
+function paramOrDefault(param, defaultVal, arg) {
+  if (isFn(param)) {
+    return param(arg);
+  } else if (isStr(param)) {
+    return param;
+  }
+  return defaultVal;
+}
+
+/**
+ * Add real-time data & merge segments.
+ * @param {Object} bidConfig
+ * @param {Object} rtd
+ * @param {Object} rtdConfig
+ */
+export function addRealTimeData(bidConfig, rtd, rtdConfig) {
+  let ortb2 = config.getConfig('ortb2') || {};
+
+  if (rtdConfig.params && rtdConfig.params.handleRtd) {
+    rtdConfig.params.handleRtd(bidConfig, rtd, rtdConfig, config);
+  } else if (rtd.ortb2) {
+    config.setConfig({ortb2: mergeLazy(ortb2, rtd.ortb2)});
+  }
+}
+
+/**
+ * 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) {
+  if (rtdConfig && isPlainObject(rtdConfig.params) && rtdConfig.params.segmentCache) {
+    let jsonData = storage.getDataFromLocalStorage(RTD_LOCAL_NAME);
+
+    if (jsonData) {
+      let data = JSON.parse(jsonData);
+
+      if (data.rtd) {
+        addRealTimeData(bidConfig, data.rtd, rtdConfig);
+        onDone();
+        return;
+      }
+    }
+  }
+
+  const userIds = (getGlobal()).getUserIds();
+
+  let haloId = storage.getDataFromLocalStorage(HALOID_LOCAL_NAME);
+  if (isStr(haloId)) {
+    userIds.haloId = haloId;
+    getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+  } else {
+    var script = document.createElement('script');
+    script.type = 'text/javascript';
+
+    window.pubHaloCb = (haloId) => {
+      userIds.haloId = haloId;
+      getRealTimeDataAsync(bidConfig, onDone, rtdConfig, userConsent, userIds);
+    }
+
+    const haloIdUrl = rtdConfig.params && rtdConfig.params.haloIdUrl;
+    script.src = paramOrDefault(haloIdUrl, 'https://id.halo.ad.gt/api/v1/haloid', userIds);
+    document.getElementsByTagName('head')[0].appendChild(script);
+  }
+}
+
+/**
+ * Async rtd retrieval from Audigent
+ * @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', config.getConfig('ortb2'));
+    reqParams = rtdConfig.params.requestParams;
+  }
+
+  if (isPlainObject(window.pubHaloPm)) {
+    reqParams.pubHaloPm = window.pubHaloPm;
+  }
+
+  const url = `https://seg.halo.ad.gt/api/v1/rtd`;
+  ajax(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
+ * @param {Objkect} userConsent
+ * @return {boolean}
+ */
+function init(provider, userConsent) {
+  return true;
+}
+
+/** @type {RtdSubmodule} */
+export const haloSubmodule = {
+  name: SUBMODULE_NAME,
+  getBidRequestData: getRealTimeData,
+  init: init
+};
+
+submodule(MODULE_NAME, haloSubmodule);
diff --git a/modules/haloRtdProvider.md b/modules/haloRtdProvider.md
new file mode 100644
index 00000000000..4307618bb60
--- /dev/null
+++ b/modules/haloRtdProvider.md
@@ -0,0 +1,123 @@
+## Audigent Halo Real-time Data Submodule
+
+Audigent is a next-generation data management platform and a first-of-a-kind
+"data agency" containing some of the most exclusive content-consuming audiences
+across desktop, mobile and social platforms.
+
+This real-time data module provides quality segmentation that can be
+provided to bid request objects destined for different SSPs in order to optimize
+targeting. Audigent maintains a large database of first-party Tradedesk Unified
+ID, Audigent Halo ID and other id provider mappings to various third-party
+segment types that are utilizable across different SSPs.  With this module,
+these segments and other data can be retrieved and supplied to your pages
+and the bidstream in real-time during the bid request cycle.
+
+### Publisher Usage
+
+Compile the Halo RTD module into your Prebid build:
+
+`gulp build --modules=userId,unifiedIdSystem,rtdModule,haloRtdProvider,appnexusBidAdapter`
+
+Add the Halo RTD provider to your Prebid config. In this example we will configure
+publisher 1234 to retrieve segments from Audigent. See the
+"Parameter Descriptions" below for more detailed information of the
+configuration parameters. Please work with your Audigent Prebid support team
+(prebid@audigent.com) on which version of Prebid.js supports different bidder
+and segment configurations.
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: auctionDelay,
+        dataProviders: [
+            {
+                name: "halo",
+                waitForIt: true,
+                params: {
+                    segmentCache: false,
+                    requestParams: {
+                        publisherId: 1234
+                    }
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Parameter Descriptions for the Halo Configuration Section
+
+| Name  |Type | Description   | Notes  |
+| :------------ | :------------ | :------------ |:------------ |
+| name | String | Real time data module name | Always 'halo' |
+| waitForIt | Boolean | Required to ensure that the auction is delayed until prefetch is complete | Optional. Defaults to false |
+| params | Object | | |
+| params.handleRtd | Function | A passable RTD handler that allows custom adunit and ortb2 logic to be configured. The function signature is (bidConfig, rtd, rtdConfig, pbConfig) => {}. | Optional |
+| params.segmentCache | Boolean | This parameter tells the Halo RTD module to attempt reading segments from a local storage cache instead of always requesting them from the Audigent server. | Optional. Defaults to false. |
+| params.requestParams | Object | Publisher partner specific configuration options, such as optional publisher id and other segment query related metadata to be submitted to Audigent's backend with each request.  Contact prebid@audigent.com for more information. | Optional |
+| params.haloIdUrl | String | Parameter to specify alternate haloid endpoint url. | Optional |
+
+### Publisher Customized RTD Handling
+As indicated above, it is possible to provide your own bid augmentation
+functions rather than simply merging supplied data.  This is useful if you
+want to perform custom bid augmentation and logic with Halo real-time data
+prior to the bid request being sent. Simply add your custom logic to the
+optional handleRtd parameter and provide your custom RTD handling logic there.
+
+Please see the following example, which provides a function to modify bids for
+a bid adapter called adBuzz and perform custom logic on bidder parameters.
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: auctionDelay,
+        dataProviders: [
+            {
+                name: "halo",
+                waitForIt: true,
+                params: {
+                    handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+                        var adUnits = bidConfig.adUnits;
+                        for (var i = 0; i < adUnits.length; i++) {
+                            var adUnit = adUnits[i];
+                            for (var j = 0; j < adUnit.bids.length; j++) {
+                                var bid = adUnit.bids[j];
+                                if (bid.bidder == 'adBuzz' && rtd['adBuzz'][0].value != 'excludeSeg') {
+                                    bid.params.adBuzzCustomSegments.push(rtd['adBuzz'][0].id);
+                                }
+                            }
+                        }
+                    },
+                    segmentCache: false,
+                    requestParams: {
+                        publisherId: 1234
+                    }
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+The handleRtd function can also be used to configure custom ortb2 data
+processing. Please see the examples available in the haloRtdProvider_spec.js
+tests and work with your Audigent Prebid integration team (prebid@audigent.com)
+on how to best configure your own Halo RTD & Open RTB data handlers.
+
+### Testing
+
+To view an example of available segments returned by Audigent's backends:
+
+`gulp serve --modules=userId,unifiedIdSystem,rtdModule,haloRtdProvider,appnexusBidAdapter`
+
+and then point your browser at:
+
+`http://localhost:9999/integrationExamples/gpt/haloRtdProvider_example.html`
+
+
+
+
diff --git a/modules/haxmediaBidAdapter.js b/modules/haxmediaBidAdapter.js
new file mode 100644
index 00000000000..c4ce2eb3663
--- /dev/null
+++ b/modules/haxmediaBidAdapter.js
@@ -0,0 +1,107 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'haxmedia';
+const AD_URL = 'https://balancer.haxmedia.io/?c=o&m=multi';
+
+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;
+  }
+}
+
+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) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } 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;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/haxmediaBidAdapter.md b/modules/haxmediaBidAdapter.md
new file mode 100644
index 00000000000..f661a9e4e71
--- /dev/null
+++ b/modules/haxmediaBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: haxmedia Bidder Adapter
+Module Type: haxmedia Bidder Adapter
+Maintainer: haxmixqk@haxmediapartners.io
+```
+
+# Description
+
+Module that connects to haxmedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'haxmedia',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/hybridBidAdapter.js b/modules/hybridBidAdapter.js
index 5671756e0b2..15f8acd824f 100644
--- a/modules/hybridBidAdapter.js
+++ b/modules/hybridBidAdapter.js
@@ -10,12 +10,14 @@ const DSP_ENDPOINT = 'https://hbe198.hybrid.ai/prebidhb';
 const TRAFFIC_TYPE_WEB = 1;
 const PLACEMENT_TYPE_BANNER = 1;
 const PLACEMENT_TYPE_VIDEO = 2;
+const PLACEMENT_TYPE_IN_IMAGE = 3;
 const TTL = 60;
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
 
 const placementTypes = {
   'banner': PLACEMENT_TYPE_BANNER,
-  'video': PLACEMENT_TYPE_VIDEO
+  'video': PLACEMENT_TYPE_VIDEO,
+  'inImage': PLACEMENT_TYPE_IN_IMAGE
 };
 
 function buildBidRequests(validBidRequests) {
@@ -26,7 +28,8 @@ function buildBidRequests(validBidRequests) {
       transactionId: validBidRequest.transactionId,
       sizes: validBidRequest.sizes,
       placement: placementTypes[params.placement],
-      placeId: params.placeId
+      placeId: params.placeId,
+      imageUrl: params.imageUrl || ''
     };
 
     return bidRequest;
@@ -75,7 +78,10 @@ function buildBid(bidData) {
     creativeId: bidData.bidId,
     currency: bidData.currency,
     netRevenue: true,
-    ttl: TTL
+    ttl: TTL,
+    meta: {
+      advertiserDomains: bidData.advertiserDomains || [],
+    }
   };
 
   if (bidData.placement === PLACEMENT_TYPE_VIDEO) {
@@ -94,6 +100,33 @@ function buildBid(bidData) {
         bid.renderer = createRenderer(bid);
       }
     }
+  } else if (bidData.placement === PLACEMENT_TYPE_IN_IMAGE) {
+    bid.mediaType = BANNER;
+    bid.inImageContent = {
+      content: {
+        content: bidData.content,
+        actionUrls: {}
+      }
+    };
+    let actionUrls = bid.inImageContent.content.actionUrls;
+    actionUrls.loadUrls = bidData.inImage.loadtrackers || [];
+    actionUrls.impressionUrls = bidData.inImage.imptrackers || [];
+    actionUrls.scrollActUrls = bidData.inImage.startvisibilitytrackers || [];
+    actionUrls.viewUrls = bidData.inImage.viewtrackers || [];
+    actionUrls.stopAnimationUrls = bidData.inImage.stopanimationtrackers || [];
+    actionUrls.closeBannerUrls = bidData.inImage.closebannertrackers || [];
+
+    if (bidData.inImage.but) {
+      let inImageOptions = bid.inImageContent.content.inImageOptions = {};
+      inImageOptions.hasButton = true;
+      inImageOptions.buttonLogoUrl = bidData.inImage.but_logo;
+      inImageOptions.buttonProductUrl = bidData.inImage.but_prod;
+      inImageOptions.buttonHead = bidData.inImage.but_head;
+      inImageOptions.buttonHeadColor = bidData.inImage.but_head_colour;
+      inImageOptions.dynparams = bidData.inImage.dynparams || {};
+    }
+
+    bid.ad = wrapAd(bid, bidData);
   } else {
     bid.ad = bidData.content;
     bid.mediaType = BANNER;
@@ -116,6 +149,30 @@ function hasVideoMandatoryParams(mediaTypes) {
   return isHasVideoContext && isPlayerSize;
 }
 
+function wrapAd(bid, bidData) {
+  return `
+    
+    
+        
+        
+        
+        
+    
+    
+        

+        
+    
+  `;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -133,6 +190,7 @@ export const spec = {
       !!bid.params.placement &&
       (
         (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'banner') ||
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'inImage' && !!bid.params.imageUrl) ||
         (getMediaTypeFromBid(bid) === VIDEO && bid.params.placement === 'video' && hasVideoMandatoryParams(bid.mediaTypes))
       )
     );
diff --git a/modules/hybridBidAdapter.md b/modules/hybridBidAdapter.md
index 245f010970a..098d8642415 100644
--- a/modules/hybridBidAdapter.md
+++ b/modules/hybridBidAdapter.md
@@ -52,3 +52,187 @@ var adUnits = [{
 }];
 ```
 
+# Sample In-Image Ad Unit
+
+```js
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        banner: {
+            sizes: [0, 0]
+        }
+    },
+    bids: [{
+        bidder: "hybrid",
+        params: {
+            placement: "inImage",
+            placeId: "102030405060708090000020",
+            imageUrl: "https://hybrid.ai/images/image.jpg"
+        }
+    }]
+}];
+```
+
+# Example page with In-Image
+
+```html
+
+
+
+	
+	Prebid.js Banner Example
+	
+	
+    
+
+
+	
Prebid.js InImage Banner Test

+	

+        
+        
+    

+
+
+```
+
+# Example page with In-Image and GPT
+
+```html
+
+
+
+	
+	Prebid.js Banner Example
+	
+	
+	
+	
+
+
+	
Prebid.js Banner Ad Unit Test

+	

+		
+		
+	

+
+
+```
diff --git a/modules/iasRtdProvider.js b/modules/iasRtdProvider.js
new file mode 100644
index 00000000000..bbd2529bf86
--- /dev/null
+++ b/modules/iasRtdProvider.js
@@ -0,0 +1,124 @@
+import { submodule } from '../src/hook.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import * as utils from '../src/utils.js';
+import { ajaxBuilder } from '../src/ajax.js';
+
+/** @type {string} */
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'ias';
+
+/**
+ * Module init
+ * @param {Object} provider
+ * @param {Object} userConsent
+ * @return {boolean}
+ */
+export function init(config, userConsent) {
+  return true;
+}
+
+function stringifySlotSizes(sizes) {
+  let result = '';
+  if (utils.isArray(sizes)) {
+    result = sizes.reduce((acc, size) => {
+      acc.push(size.join('.'));
+      return acc;
+    }, []);
+    result = '[' + result.join(',') + ']';
+  }
+  return result;
+}
+
+function stringifySlot(bidRequest) {
+  const id = bidRequest.code;
+  const ss = stringifySlotSizes(bidRequest.sizes);
+  const p = bidRequest.bids[0].params.adUnitPath;
+  const slot = { id, ss, p };
+  const keyValues = utils.getKeys(slot).map(function (key) {
+    return [key, slot[key]].join(':');
+  });
+  return '{' + keyValues.join(',') + '}';
+}
+
+function stringifyWindowSize() {
+  return [window.innerWidth || -1, window.innerHeight || -1].join('.');
+}
+
+function stringifyScreenSize() {
+  return [(window.screen && window.screen.width) || -1, (window.screen && window.screen.height) || -1].join('.');
+}
+
+function getPageLevelKeywords(response) {
+  let result = {};
+  if (response.brandSafety) {
+    shallowMerge(result, response.brandSafety);
+  }
+  result.fr = response.fr;
+  result.custom = response.custom;
+  return result;
+}
+
+function shallowMerge(dest, src) {
+  utils.getKeys(src).reduce((dest, srcKey) => {
+    dest[srcKey] = src[srcKey];
+    return dest;
+  }, dest);
+}
+
+function getBidRequestData(reqBidsConfigObj, callback, config) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+
+  let isFinish = false;
+
+  const IAS_HOST = 'https://pixel.adsafeprotected.com/services/pub';
+  const { pubId } = config.params;
+  const anId = pubId;
+  let queries = [];
+  queries.push(['anId', anId]);
+
+  queries = queries.concat(adUnits.reduce(function (acc, request) {
+    acc.push(['slot', stringifySlot(request)]);
+    return acc;
+  }, []));
+
+  queries.push(['wr', stringifyWindowSize()]);
+  queries.push(['sr', stringifyScreenSize()]);
+  queries.push(['url', encodeURIComponent(window.location.href)]);
+
+  const queryString = encodeURI(queries.map(qs => qs.join('=')).join('&'));
+
+  const ajax = ajaxBuilder();
+
+  ajax(`${IAS_HOST}?${queryString}`, {
+    success: function (response, request) {
+      if (!isFinish) {
+        if (request.status === 200) {
+          const iasResponse = JSON.parse(response);
+          adUnits.forEach(adUnit => {
+            adUnit.bids.forEach(bid => {
+              const rtd = bid.rtd || {};
+              const iasRtd = {};
+              iasRtd[SUBMODULE_NAME] = Object.assign({}, rtd[SUBMODULE_NAME], getPageLevelKeywords(iasResponse));
+              bid.rtd = Object.assign({}, rtd, iasRtd);
+            });
+          });
+        }
+        isFinish = true;
+      }
+      callback();
+    },
+    error: function () {
+      utils.logError('failed to retrieve targeting information');
+      callback();
+    }
+  });
+}
+
+/** @type {RtdSubmodule} */
+export const iasSubModule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: getBidRequestData
+};
+
+submodule(MODULE_NAME, iasSubModule);
diff --git a/modules/iasRtdProvider.md b/modules/iasRtdProvider.md
new file mode 100644
index 00000000000..d8c46ff2697
--- /dev/null
+++ b/modules/iasRtdProvider.md
@@ -0,0 +1,9 @@
+# Overview
+
+Module Name: Integral Ad Science(IAS) Rtd Provider
+Module Type: Rtd Provider
+Maintainer: raguilar@integralads.com
+
+# Description
+
+RTD provider for Integral Ad Science(IAS) Contact raguilar@integralads.com for information.
diff --git a/modules/id5AnalyticsAdapter.js b/modules/id5AnalyticsAdapter.js
new file mode 100644
index 00000000000..abf23d2925d
--- /dev/null
+++ b/modules/id5AnalyticsAdapter.js
@@ -0,0 +1,304 @@
+import buildAdapter from '../src/AnalyticsAdapter.js';
+import CONSTANTS from '../src/constants.json';
+import adapterManager from '../src/adapterManager.js';
+import { ajax } from '../src/ajax.js';
+import { logInfo, logError } from '../src/utils.js';
+import events from '../src/events.js';
+
+const {
+  EVENTS: {
+    AUCTION_END,
+    TCF2_ENFORCEMENT,
+    BID_WON,
+    BID_VIEWABLE,
+    AD_RENDER_FAILED
+  }
+} = CONSTANTS
+
+const GVLID = 131;
+
+const STANDARD_EVENTS_TO_TRACK = [
+  AUCTION_END,
+  TCF2_ENFORCEMENT,
+  BID_WON,
+];
+
+// These events cause the buffered events to be sent over
+const FLUSH_EVENTS = [
+  TCF2_ENFORCEMENT,
+  AUCTION_END,
+  BID_WON,
+  BID_VIEWABLE,
+  AD_RENDER_FAILED
+];
+
+const CONFIG_URL_PREFIX = 'https://api.id5-sync.com/analytics'
+const TZ = new Date().getTimezoneOffset();
+const PBJS_VERSION = $$PREBID_GLOBAL$$.version;
+const ID5_REDACTED = '__ID5_REDACTED__';
+const isArray = Array.isArray;
+
+let id5Analytics = Object.assign(buildAdapter({analyticsType: 'endpoint'}), {
+  // Keeps an array of events for each auction
+  eventBuffer: {},
+
+  eventsToTrack: STANDARD_EVENTS_TO_TRACK,
+
+  track: (event) => {
+    const _this = id5Analytics;
+
+    if (!event || !event.args) {
+      return;
+    }
+
+    try {
+      const auctionId = event.args.auctionId;
+      _this.eventBuffer[auctionId] = _this.eventBuffer[auctionId] || [];
+
+      // Collect events and send them in a batch when the auction ends
+      const que = _this.eventBuffer[auctionId];
+      que.push(_this.makeEvent(event.eventType, event.args));
+
+      if (FLUSH_EVENTS.indexOf(event.eventType) >= 0) {
+        // Auction ended. Send the batch of collected events
+        _this.sendEvents(que);
+
+        // From now on just send events to server side as they come
+        que.push = (pushedEvent) => _this.sendEvents([pushedEvent]);
+      }
+    } catch (error) {
+      logError('id5Analytics: ERROR', error);
+      _this.sendErrorEvent(error);
+    }
+  },
+
+  sendEvents: (eventsToSend) => {
+    const _this = id5Analytics;
+    // By giving some content this will be automatically a POST
+    eventsToSend.forEach((event) =>
+      ajax(_this.options.ingestUrl, null, JSON.stringify(event)));
+  },
+
+  makeEvent: (event, payload) => {
+    const _this = id5Analytics;
+    const filteredPayload = deepTransformingClone(payload,
+      transformFnFromCleanupRules(event));
+    return {
+      source: 'pbjs',
+      event,
+      payload: filteredPayload,
+      partnerId: _this.options.partnerId,
+      meta: {
+        sampling: _this.options.id5Sampling,
+        pbjs: PBJS_VERSION,
+        tz: TZ,
+      }
+    };
+  },
+
+  sendErrorEvent: (error) => {
+    const _this = id5Analytics;
+    _this.sendEvents([
+      _this.makeEvent('analyticsError', {
+        message: error.message,
+        stack: error.stack,
+      })
+    ]);
+  },
+
+  random: () => Math.random(),
+});
+
+const ENABLE_FUNCTION = (config) => {
+  const _this = id5Analytics;
+  _this.options = (config && config.options) || {};
+
+  const partnerId = _this.options.partnerId;
+  if (typeof partnerId !== 'number') {
+    logError('id5Analytics: partnerId in config.options must be a number representing the id5 partner ID');
+    return;
+  }
+
+  ajax(`${CONFIG_URL_PREFIX}/${partnerId}/pbjs`, (result) => {
+    logInfo('id5Analytics: Received from configuration endpoint', result);
+
+    const configFromServer = JSON.parse(result);
+
+    const sampling = _this.options.id5Sampling =
+      typeof configFromServer.sampling === 'number' ? configFromServer.sampling : 0;
+
+    if (typeof configFromServer.ingestUrl !== 'string') {
+      logError('id5Analytics: cannot find ingestUrl in config endpoint response; no analytics will be available');
+      return;
+    }
+    _this.options.ingestUrl = configFromServer.ingestUrl;
+
+    // 3-way fallback for which events to track: server > config > standard
+    _this.eventsToTrack = configFromServer.eventsToTrack || _this.options.eventsToTrack || STANDARD_EVENTS_TO_TRACK;
+    _this.eventsToTrack = isArray(_this.eventsToTrack) ? _this.eventsToTrack : STANDARD_EVENTS_TO_TRACK;
+
+    logInfo('id5Analytics: Configuration is', _this.options);
+    logInfo('id5Analytics: Tracking events', _this.eventsToTrack);
+    if (sampling > 0 && _this.random() < (1 / sampling)) {
+      // Init the module only if we got lucky
+      logInfo('id5Analytics: Selected by sampling. Starting up!')
+
+      // Clean start
+      _this.eventBuffer = {};
+
+      // Replay all events until now
+      if (!config.disablePastEventsProcessing) {
+        events.getEvents().forEach((event) => {
+          if (event && _this.eventsToTrack.indexOf(event.eventType) >= 0) {
+            _this.track(event);
+          }
+        });
+      }
+
+      // Merge in additional cleanup rules
+      if (configFromServer.additionalCleanupRules) {
+        const newRules = configFromServer.additionalCleanupRules;
+        _this.eventsToTrack.forEach((key) => {
+          // Some protective checks in case we mess up server side
+          if (
+            isArray(newRules[key]) &&
+            newRules[key].every((eventRules) =>
+              isArray(eventRules.match) &&
+              (eventRules.apply in TRANSFORM_FUNCTIONS))
+          ) {
+            logInfo('id5Analytics: merging additional cleanup rules for event ' + key);
+            CLEANUP_RULES[key].push(...newRules[key]);
+          }
+        });
+      }
+
+      // Register to the events of interest
+      _this.handlers = {};
+      _this.eventsToTrack.forEach((eventType) => {
+        const handler = _this.handlers[eventType] = (args) =>
+          _this.track({ eventType, args });
+        events.on(eventType, handler);
+      });
+    }
+  });
+
+  // Make only one init possible within a lifecycle
+  _this.enableAnalytics = () => {};
+};
+
+id5Analytics.enableAnalytics = ENABLE_FUNCTION;
+id5Analytics.disableAnalytics = () => {
+  const _this = id5Analytics;
+  // Un-register to the events of interest
+  _this.eventsToTrack.forEach((eventType) => {
+    if (_this.handlers && _this.handlers[eventType]) {
+      events.off(eventType, _this.handlers[eventType]);
+    }
+  });
+
+  // Make re-init possible. Work around the fact that past events cannot be forgotten
+  _this.enableAnalytics = (config) => {
+    config.disablePastEventsProcessing = true;
+    ENABLE_FUNCTION(config);
+  };
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: id5Analytics,
+  code: 'id5Analytics',
+  gvlid: GVLID
+});
+
+export default id5Analytics;
+
+function redact(obj, key) {
+  obj[key] = ID5_REDACTED;
+}
+
+function erase(obj, key) {
+  delete obj[key];
+}
+
+// The transform function matches against a path and applies
+// required transformation if match is found.
+function deepTransformingClone(obj, transform, currentPath = []) {
+  const result = isArray(obj) ? [] : {};
+  const recursable = typeof obj === 'object' && obj !== null;
+  if (recursable) {
+    const keys = Object.keys(obj);
+    if (keys.length > 0) {
+      keys.forEach((key) => {
+        const newPath = currentPath.concat(key);
+        result[key] = deepTransformingClone(obj[key], transform, newPath);
+        transform(newPath, result, key);
+      });
+      return result;
+    }
+  }
+  return obj;
+}
+
+// Every set of rules is an object where "match" is an array and
+// "apply" is the function to apply in case of match. The function to apply
+// takes (obj, prop) and transforms property "prop" in object "obj".
+// The "match" is an array of path parts. Each part is either a string or an array.
+// In case of array, it represents alternatives which all would match.
+// Special path part '*' matches any subproperty
+const CLEANUP_RULES = {};
+CLEANUP_RULES[AUCTION_END] = [{
+  match: [['adUnits', 'bidderRequests'], '*', 'bids', '*', ['userId', 'crumbs'], '*'],
+  apply: 'redact'
+}, {
+  match: [['adUnits', 'bidderRequests'], '*', 'bids', '*', 'userIdAsEids', '*', 'uids', '*', ['id', 'ext']],
+  apply: 'redact'
+}, {
+  match: ['bidderRequests', '*', 'gdprConsent', 'vendorData'],
+  apply: 'erase'
+}, {
+  match: ['bidsReceived', '*', ['ad', 'native']],
+  apply: 'erase'
+}, {
+  match: ['noBids', '*', ['userId', 'crumbs'], '*'],
+  apply: 'redact'
+}, {
+  match: ['noBids', '*', 'userIdAsEids', '*', 'uids', '*', ['id', 'ext']],
+  apply: 'redact'
+}];
+
+CLEANUP_RULES[BID_WON] = [{
+  match: [['ad', 'native']],
+  apply: 'erase'
+}];
+
+const TRANSFORM_FUNCTIONS = {
+  'redact': redact,
+  'erase': erase,
+};
+
+// Builds a rule function depending on the event type
+function transformFnFromCleanupRules(eventType) {
+  const rules = CLEANUP_RULES[eventType] || [];
+  return (path, obj, key) => {
+    for (let i = 0; i < rules.length; i++) {
+      let match = true;
+      const ruleMatcher = rules[i].match;
+      const transformation = rules[i].apply;
+      if (ruleMatcher.length !== path.length) {
+        continue;
+      }
+      for (let fragment = 0; fragment < ruleMatcher.length && match; fragment++) {
+        const choices = makeSureArray(ruleMatcher[fragment]);
+        match = !choices.every((choice) => choice !== '*' && path[fragment] !== choice);
+      }
+      if (match) {
+        const transformfn = TRANSFORM_FUNCTIONS[transformation];
+        transformfn(obj, key);
+        break;
+      }
+    }
+  };
+}
+
+function makeSureArray(object) {
+  return isArray(object) ? object : [object];
+}
diff --git a/modules/id5AnalyticsAdapter.md b/modules/id5AnalyticsAdapter.md
new file mode 100644
index 00000000000..e12784b70f6
--- /dev/null
+++ b/modules/id5AnalyticsAdapter.md
@@ -0,0 +1,42 @@
+# Overview
+Module Name: ID5 Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [id5.io](https://id5.io)
+
+# ID5 Universal ID
+
+The ID5 Universal ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 Universal ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 Universal ID and detailed integration docs, please visit [our documentation](https://support.id5.io/portal/en/kb/articles/prebid-js-user-id-module).
+
+# ID5 Analytics Registration
+
+The ID5 Analytics Adapter is free to use during our Beta period, but requires a simple registration with ID5. Please visit [id5.io/universal-id](https://id5.io/universal-id) to sign up and request your ID5 Partner Number to get started. If you're already using the ID5 Universal ID, you may use your existing Partner Number with the analytics adapter.
+
+The ID5 privacy policy is at [https://www.id5.io/platform-privacy-policy](https://www.id5.io/platform-privacy-policy).
+
+## ID5 Analytics Configuration
+
+First, make sure to add the ID5 Analytics submodule to your Prebid.js package with:
+
+```
+gulp build --modules=...,id5AnalyticsAdapter
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.enableAnalytics({
+    provider: 'id5Analytics',
+    options: {
+        partnerId: 1234, // change to the Partner Number you received from ID5
+        eventsToTrack: ['auctionEnd','bidWon']
+    }
+});
+```
+
+| Parameter | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| provider | Required | String | The name of this module: `id5Analytics` | `id5Analytics` |
+| options.partnerId | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `1234` |
+| options.eventsToTrack | Optional | Array of strings | Overrides the set of tracked events | `['auctionEnd','bidWon']` |
diff --git a/modules/id5IdSystem.js b/modules/id5IdSystem.js
index 19950e591a8..8a8cd25479f 100644
--- a/modules/id5IdSystem.js
+++ b/modules/id5IdSystem.js
@@ -10,11 +10,20 @@ import { ajax } 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';
 
 const MODULE_NAME = 'id5Id';
 const GVLID = 131;
-const BASE_NB_COOKIE_NAME = 'pbjs-id5id';
-const NB_COOKIE_EXP_DAYS = (30 * 24 * 60 * 60 * 1000); // 30 days
+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 ABTEST_RESOLUTION = 10000;
+const LOG_PREFIX = 'User ID - ID5 submodule: ';
+
+// 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 storage = getStorageManager(GVLID, MODULE_NAME);
 
@@ -36,54 +45,105 @@ export const id5IdSubmodule = {
    * 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) {
-    if (value && typeof value.ID5ID === 'string') {
-      // don't lose our legacy value from cache
-      return { 'id5id': value.ID5ID };
-    } else if (value && typeof value.universal_uid === 'string') {
-      return { 'id5id': value.universal_uid };
+  decode(value, config) {
+    let universalUid;
+    let linkType = 0;
+
+    if (value && typeof value.universal_uid === 'string') {
+      universalUid = value.universal_uid;
+      linkType = value.link_type || linkType;
     } else {
       return undefined;
     }
+
+    // check for A/B testing configuration and hide ID if in Control Group
+    const abConfig = getAbTestingConfig(config);
+    const controlGroup = isInControlGroup(universalUid, abConfig.controlGroupPct);
+    if (abConfig.enabled === true && typeof controlGroup === 'undefined') {
+      // A/B Testing is enabled, but configured improperly, so skip A/B testing
+      utils.logError(LOG_PREFIX + 'A/B Testing controlGroupPct must be a number >= 0 and <= 1! Skipping A/B Testing');
+    } else if (abConfig.enabled === true && controlGroup === true) {
+      // A/B Testing is enabled and user is in the Control Group, so do not share the ID5 ID
+      utils.logInfo(LOG_PREFIX + 'A/B Testing Enabled - user is in the Control Group, so the ID5 ID is NOT exposed');
+      universalUid = '';
+      linkType = 0;
+    } else if (abConfig.enabled === true) {
+      // A/B Testing is enabled but user is not in the Control Group, so ID5 ID is shared
+      utils.logInfo(LOG_PREFIX + 'A/B Testing Enabled - user is NOT in the Control Group, so the ID5 ID is exposed');
+    }
+
+    let responseObj = {
+      id5id: {
+        uid: universalUid,
+        ext: {
+          linkType: linkType
+        }
+      }
+    };
+
+    if (abConfig.enabled === true) {
+      utils.deepSetValue(responseObj, 'id5id.ext.abTestingControlGroup', (typeof controlGroup === 'undefined' ? false : controlGroup));
+    }
+
+    utils.logInfo(LOG_PREFIX + 'Decoded ID', responseObj);
+
+    return responseObj;
   },
 
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function getId
-   * @param {SubmoduleParams} [configParams]
-   * @param {ConsentData} [consentData]
+   * @param {SubmoduleConfig} config
+   * @param {ConsentData} consentData
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData, cacheIdObj) {
-    if (!hasRequiredParams(configParams)) {
+  getId(config, consentData, cacheIdObj) {
+    if (!hasRequiredConfig(config)) {
       return undefined;
     }
-    if (!configParams || typeof parseInt(configParams.partner) !== 'number') {
-      utils.logError(`User ID - ID5 submodule requires partner to be defined as a number`);
-    }
-    configParams.partner = parseInt(configParams.partner)
+
+    const url = `https://id5-sync.com/g/v2/${config.params.partner}.json`;
     const hasGdpr = (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) ? 1 : 0;
-    const gdprConsentString = hasGdpr ? consentData.consentString : '';
-    const url = `https://id5-sync.com/g/v2/${configParams.partner}.json?gdpr_consent=${gdprConsentString}&gdpr=${hasGdpr}`;
+    const usp = uspDataHandler.getConsentData();
     const referer = getRefererInfo();
-    const signature = (cacheIdObj && cacheIdObj.signature) ? cacheIdObj.signature : '';
-    const pubId = (cacheIdObj && cacheIdObj.ID5ID) ? cacheIdObj.ID5ID : ''; // TODO: remove when 1puid isn't needed
+    const signature = (cacheIdObj && cacheIdObj.signature) ? cacheIdObj.signature : getLegacyCookieSignature();
     const data = {
-      'partner': configParams.partner,
-      '1puid': pubId, // TODO: remove when 1puid isn't needed
-      'nbPage': incrementNb(configParams),
+      'partner': config.params.partner,
+      'gdpr': hasGdpr,
+      'nbPage': incrementNb(config.params.partner),
       'o': 'pbjs',
-      'pd': configParams.pd || '',
       'rf': referer.referer,
-      's': signature,
       'top': referer.reachedTop ? 1 : 0,
       'u': referer.stack[0] || window.location.href,
       'v': '$prebid.version$'
     };
 
+    // pass in optional data, but only if populated
+    if (hasGdpr && typeof consentData.consentString !== 'undefined' && !utils.isEmpty(consentData.consentString) && !utils.isEmptyStr(consentData.consentString)) {
+      data.gdpr_consent = consentData.consentString;
+    }
+    if (typeof usp !== 'undefined' && !utils.isEmpty(usp) && !utils.isEmptyStr(usp)) {
+      data.us_privacy = usp;
+    }
+    if (typeof signature !== 'undefined' && !utils.isEmptyStr(signature)) {
+      data.s = signature;
+    }
+    if (typeof config.params.pd !== 'undefined' && !utils.isEmptyStr(config.params.pd)) {
+      data.pd = config.params.pd;
+    }
+    if (typeof config.params.provider !== 'undefined' && !utils.isEmptyStr(config.params.provider)) {
+      data.provider = config.params.provider;
+    }
+
+    // pass in feature flags, if applicable
+    if (getAbTestingConfig(config).enabled === true) {
+      utils.deepSetValue(data, 'features.ab', 1);
+    }
+
     const resp = function (callback) {
       const callbacks = {
         success: response => {
@@ -91,18 +151,31 @@ export const id5IdSubmodule = {
           if (response) {
             try {
               responseObj = JSON.parse(response);
-              resetNb(configParams);
+              utils.logInfo(LOG_PREFIX + 'response received from the server', responseObj);
+
+              resetNb(config.params.partner);
+
+              if (responseObj.privacy) {
+                storeInLocalStorage(ID5_PRIVACY_STORAGE_NAME, JSON.stringify(responseObj.privacy), NB_EXP_DAYS);
+              }
+
+              // TODO: remove after requiring publishers to use localstorage and
+              // all publishers have upgraded
+              if (config.storage.type === LOCAL_STORAGE) {
+                removeLegacyCookies(config.params.partner);
+              }
             } catch (error) {
-              utils.logError(error);
+              utils.logError(LOG_PREFIX + error);
             }
           }
           callback(responseObj);
         },
         error: error => {
-          utils.logError(`id5Id: ID fetch encountered an error`, error);
+          utils.logError(LOG_PREFIX + 'getId fetch encountered an error', error);
           callback();
         }
       };
+      utils.logInfo(LOG_PREFIX + 'requesting an ID from the server', data);
       ajax(url, callbacks, JSON.stringify(data), { method: 'POST', withCredentials: true });
     };
     return {callback: resp};
@@ -114,43 +187,160 @@ export const id5IdSubmodule = {
    *  If IdResponse#callback is defined, then it'll called at the end of auction.
    *  It's permissible to return neither, one, or both fields.
    * @function extendId
-   * @param {SubmoduleParams} configParams
+   * @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.
    */
-  extendId(configParams, cacheIdObj) {
-    incrementNb(configParams);
+  extendId(config, consentData, cacheIdObj) {
+    hasRequiredConfig(config);
+
+    const partnerId = (config && config.params && config.params.partner) || 0;
+    incrementNb(partnerId);
+
+    utils.logInfo(LOG_PREFIX + 'using cached ID', cacheIdObj);
     return cacheIdObj;
   }
 };
 
-function hasRequiredParams(configParams) {
-  if (!configParams || typeof configParams.partner !== 'number') {
-    utils.logError(`User ID - ID5 submodule requires partner to be defined as a number`);
+function hasRequiredConfig(config) {
+  if (!config || !config.params || !config.params.partner || typeof config.params.partner !== 'number') {
+    utils.logError(LOG_PREFIX + 'partner required to be defined as a number');
+    return false;
+  }
+
+  if (!config.storage || !config.storage.type || !config.storage.name) {
+    utils.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) {
+    utils.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) {
+    utils.logWarn(LOG_PREFIX + `storage name recommended to be '${ID5_STORAGE_NAME}'. In a future release this may become a strict requirement`);
+  }
+
   return true;
 }
-function nbCookieName(configParams) {
-  return hasRequiredParams(configParams) ? `${BASE_NB_COOKIE_NAME}-${configParams.partner}-nb` : undefined;
+
+export function expDaysStr(expDays) {
+  return (new Date(Date.now() + (1000 * 60 * 60 * 24 * expDays))).toUTCString();
 }
-function nbCookieExpStr(expDays) {
-  return (new Date(Date.now() + expDays)).toUTCString();
+
+export function nbCacheName(partnerId) {
+  return `${ID5_STORAGE_NAME}_${partnerId}_nb`;
 }
-function storeNbInCookie(configParams, nb) {
-  storage.setCookie(nbCookieName(configParams), nb, nbCookieExpStr(NB_COOKIE_EXP_DAYS), 'Lax');
+export function storeNbInCache(partnerId, nb) {
+  storeInLocalStorage(nbCacheName(partnerId), nb, NB_EXP_DAYS);
 }
-function getNbFromCookie(configParams) {
-  const cacheNb = storage.getCookie(nbCookieName(configParams));
+export function getNbFromCache(partnerId) {
+  let cacheNb = getFromLocalStorage(nbCacheName(partnerId));
   return (cacheNb) ? parseInt(cacheNb) : 0;
 }
-function incrementNb(configParams) {
-  const nb = (getNbFromCookie(configParams) + 1);
-  storeNbInCookie(configParams, nb);
+function incrementNb(partnerId) {
+  const nb = (getNbFromCache(partnerId) + 1);
+  storeNbInCache(partnerId, nb);
   return nb;
 }
-function resetNb(configParams) {
-  storeNbInCookie(configParams, 0);
+function resetNb(partnerId) {
+  storeNbInCache(partnerId, 0);
+}
+
+function getLegacyCookieSignature() {
+  let legacyStoredValue;
+  LEGACY_COOKIE_NAMES.forEach(function(cookie) {
+    if (storage.getCookie(cookie)) {
+      legacyStoredValue = JSON.parse(storage.getCookie(cookie)) || legacyStoredValue;
+    }
+  });
+  return (legacyStoredValue && legacyStoredValue.signature) || '';
+}
+
+/**
+ * Remove our legacy cookie values. Needed until we move all publishers
+ * to html5 storage in a future release
+ * @param {integer} partnerId
+ */
+function removeLegacyCookies(partnerId) {
+  utils.logInfo(LOG_PREFIX + 'removing legacy cookies');
+  LEGACY_COOKIE_NAMES.forEach(function(cookie) {
+    storage.setCookie(`${cookie}`, ' ', expDaysStr(-1));
+    storage.setCookie(`${cookie}_nb`, ' ', expDaysStr(-1));
+    storage.setCookie(`${cookie}_${partnerId}_nb`, ' ', expDaysStr(-1));
+    storage.setCookie(`${cookie}_last`, ' ', expDaysStr(-1));
+  });
+}
+
+/**
+ * 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);
+    }
+  }
+  // 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);
+}
+
+/**
+ * gets the existing abTesting config or generates a default config with abTesting off
+ *
+ * @param {SubmoduleConfig|undefined} config
+ * @returns {(Object|undefined)}
+ */
+function getAbTestingConfig(config) {
+  return (config && config.params && config.params.abTesting) || { enabled: false };
+}
+
+/**
+ * Return a consistant random number between 0 and ABTEST_RESOLUTION-1 for this user
+ * Falls back to plain random if no user provided
+ * @param {string} userId
+ * @returns {number}
+ */
+function abTestBucket(userId) {
+  if (userId) {
+    return ((utils.cyrb53Hash(userId) % ABTEST_RESOLUTION) + ABTEST_RESOLUTION) % ABTEST_RESOLUTION;
+  } else {
+    return Math.floor(Math.random() * ABTEST_RESOLUTION);
+  }
+}
+
+/**
+ * Return a consistant boolean if this user is within the control group ratio provided
+ * @param {string} userId
+ * @param {number} controlGroupPct - Ratio [0,1] of users expected to be in the control group
+ * @returns {boolean}
+ */
+export function isInControlGroup(userId, controlGroupPct) {
+  if (!utils.isNumber(controlGroupPct) || controlGroupPct < 0 || controlGroupPct > 1) {
+    return undefined;
+  }
+  return abTestBucket(userId) < controlGroupPct * ABTEST_RESOLUTION;
 }
 
 submodule('userId', id5IdSubmodule);
diff --git a/modules/id5IdSystem.md b/modules/id5IdSystem.md
new file mode 100644
index 00000000000..8ffe29e091f
--- /dev/null
+++ b/modules/id5IdSystem.md
@@ -0,0 +1,68 @@
+# ID5 Universal ID
+
+The ID5 Universal ID is a shared, neutral identifier that publishers and ad tech platforms can use to recognise users even in environments where 3rd party cookies are not available. The ID5 Universal ID is designed to respect users' privacy choices and publishers’ preferences throughout the advertising value chain. For more information about the ID5 Universal ID and detailed integration docs, please visit [our documentation](https://support.id5.io/portal/en/kb/articles/prebid-js-user-id-module). We also recommend that you sign up for our [release notes](https://id5.io/universal-id/release-notes) to stay up-to-date with any changes to the implementation of the ID5 Universal ID in Prebid.
+
+## ID5 Universal ID Registration
+
+The ID5 Universal ID is free to use, but requires a simple registration with ID5. Please visit [id5.io/universal-id](https://id5.io/universal-id) to sign up and request your ID5 Partner Number to get started.
+
+The ID5 privacy policy is at [https://www.id5.io/platform-privacy-policy](https://www.id5.io/platform-privacy-policy).
+
+## ID5 Universal ID Configuration
+
+First, make sure to add the ID5 submodule to your Prebid.js package with:
+
+```
+gulp build --modules=id5IdSystem,userId
+```
+
+The following configuration parameters are available:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'id5Id',
+      params: {
+        partner: 173,            // change to the Partner Number you received from ID5
+        pd: 'MT1iNTBjY...',      // optional, see table below for a link to how to generate this
+        abTesting: {             // optional
+          enabled: true,         // false by default
+          controlGroupPct: 0.1   // valid values are 0.0 - 1.0 (inclusive)
+        }
+      },
+      storage: {
+        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
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module: `"id5Id"` | `"id5Id"` |
+| params | Required | Object | Details for the ID5 Universal ID. | |
+| params.partner | Required | Number | This is the ID5 Partner Number obtained from registering with ID5. | `173` |
+| params.pd | Optional | String | Partner-supplied data used for linking ID5 IDs across domains. See [our documentation](https://support.id5.io/portal/en/kb/articles/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 |
+| params.abTesting.enabled | Optional | Boolean | Set this to `true` to turn on this feature | `true` or `false` |
+| params.abTesting.controlGroupPct | Optional | Number | Must be a number between `0.0` and `1.0` (inclusive) and is used to determine the percentage of requests that fall into the control group (and thus not exposing the ID5 ID). For example, a value of `0.20` will result in 20% of requests without an ID5 ID and 80% with an ID. | `0.1` |
+| storage | Required | Object | Storage settings for how the User ID module will cache the ID5 ID locally | |
+| 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` |
+
+**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).
+
+### A Note on A/B Testing
+
+Publishers may want to test the value of the ID5 ID with their downstream partners. While there are various ways to do this, A/B testing is a standard approach. Instead of publishers manually enabling or disabling the ID5 User ID Module based on their control group settings (which leads to fewer calls to ID5, reducing our ability to recognize the user), we have baked this in to our module directly.
+
+To turn on A/B Testing, simply edit the configuration (see above table) to enable it and set what percentage of users you would like to set for the control group. The control group is the set of user where an ID5 ID will not be exposed in to bid adapters or in the various user id functions available on the `pbjs` global. An additional value of `ext.abTestingControlGroup` will be set to `true` or `false` that can be used to inform reporting systems that the user was in the control group or not. It's important to note that the control group is user based, and not request based. In other words, from one page view to another, a user will always be in or out of the control group.
diff --git a/modules/idImportLibrary.js b/modules/idImportLibrary.js
new file mode 100644
index 00000000000..2a3a86cf270
--- /dev/null
+++ b/modules/idImportLibrary.js
@@ -0,0 +1,243 @@
+import {getGlobal} from '../src/prebidGlobal.js';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
+import MD5 from 'crypto-js/md5.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 OBSERVER_CONFIG = {
+  subtree: true,
+  attributes: true,
+  attributeOldValue: false,
+  childList: true,
+  attirbuteFilter: ['value'],
+  characterData: true,
+  characterDataOldValue: false
+};
+const logInfo = createLogInfo(LOG_PRE_FIX);
+const logError = createLogError(LOG_PRE_FIX);
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    utils.logInfo(prefix + ' ', ...strings);
+  }
+}
+
+function createLogError(prefix) {
+  return function (...strings) {
+    utils.logError(prefix + ' ', ...strings);
+  }
+}
+
+function getEmail(value) {
+  const matched = value.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)/gi);
+  if (!matched) {
+    return null;
+  }
+  logInfo('Email found: ' + matched[0]);
+  return matched[0];
+}
+
+function bodyAction(mutations, observer) {
+  logInfo('BODY observer on debounce called');
+  // If the email is found in the input element, disconnect the observer
+  if (email) {
+    observer.disconnect();
+    logInfo('Email is found, body observer disconnected');
+    return;
+  }
+
+  const body = document.body.innerHTML;
+  email = getEmail(body);
+  if (email !== null) {
+    logInfo(`Email obtained from the body ${email}`);
+    observer.disconnect();
+    logInfo('Post data on email found in body');
+    postData();
+  }
+}
+
+function targetAction(mutations, observer) {
+  logInfo('Target observer called');
+  for (const mutation of mutations) {
+    for (const node of mutation.addedNodes) {
+      email = node.textContent;
+
+      if (email) {
+        logInfo('Email obtained from the target ' + email);
+        observer.disconnect();
+        logInfo('Post data on email found in target');
+        postData();
+        return;
+      }
+    }
+  }
+}
+
+function addInputElementsElementListner(conf) {
+  logInfo('Adding input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    logInfo(`Original Value in Input = ${inputs[i].value}`);
+    inputs[i].addEventListener('change', event => processInputChange(event));
+    inputs[i].addEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function removeInputElementsElementListner() {
+  logInfo('Removing input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    inputs[i].removeEventListener('change', event => processInputChange(event));
+    inputs[i].removeEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function processInputChange(event) {
+  const value = event.target.value;
+  logInfo(`Modified Value of input ${event.target.value}`);
+  email = getEmail(value);
+  if (email !== null) {
+    logInfo('Email found in input ' + email);
+    postData();
+    removeInputElementsElementListner();
+  }
+}
+
+function debounce(func, wait, immediate) {
+  var timeout;
+  return function () {
+    const context = this;
+    const args = arguments;
+    const later = function () {
+      timeout = null;
+      if (!immediate) func.apply(context, args);
+    };
+    var callNow = immediate && !timeout;
+    clearTimeout(timeout);
+    if (callNow) {
+      func.apply(context, args);
+    } else {
+      logInfo('Debounce wait time ' + wait);
+      timeout = setTimeout(later, wait);
+    }
+  };
+};
+
+function handleTargetElement() {
+  const targetObserver = new MutationObserver(debounce(targetAction, conf.debounce, false));
+
+  const targetElement = document.getElementById(conf.target);
+  if (targetElement) {
+    email = targetElement.innerText;
+
+    if (!email) {
+      logInfo('Finding the email with observer');
+      targetObserver.observe(targetElement, OBSERVER_CONFIG);
+    } else {
+      logInfo('Target found with target ' + email);
+      logInfo('Post data on email found in target with target');
+      postData();
+    }
+  }
+}
+
+function handleBodyElements() {
+  if (doesInputElementsHaveEmail()) {
+    logInfo('Email found in input elements ' + email);
+    logInfo('Post data on email found in target without');
+    postData();
+    return;
+  }
+  email = getEmail(document.body.innerHTML);
+  if (email !== null) {
+    logInfo('Email found in body ' + email);
+    logInfo('Post data on email found in the body without observer');
+    postData();
+    return;
+  }
+  addInputElementsElementListner();
+  if (conf.fullscan === true) {
+    const bodyObserver = new MutationObserver(debounce(bodyAction, conf.debounce, false));
+    bodyObserver.observe(document.body, OBSERVER_CONFIG);
+  }
+}
+
+function doesInputElementsHaveEmail() {
+  const inputs = document.getElementsByTagName('input');
+
+  for (let index = 0; index < inputs.length; ++index) {
+    const curInput = inputs[index];
+    email = getEmail(curInput.value);
+    if (email !== null) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function syncCallback() {
+  return {
+    success: function () {
+      logInfo('Data synced successfully.');
+    },
+    error: function () {
+      logInfo('Data sync failed.');
+    }
+  }
+}
+
+function postData() {
+  (getGlobal()).refreshUserIds();
+  const userIds = (getGlobal()).getUserIds();
+  if (Object.keys(userIds).length === 0) {
+    logInfo('No user ids');
+    return;
+  }
+  logInfo('Users' + userIds);
+  const syncPayload = {};
+  syncPayload.hid = MD5(email).toString();
+  syncPayload.uids = userIds;
+  const payloadString = JSON.stringify(syncPayload);
+  logInfo(payloadString);
+  ajax(conf.url, syncCallback(), payloadString, {method: 'POST', withCredentials: true});
+}
+
+function associateIds() {
+  if (window.MutationObserver || window.WebKitMutationObserver) {
+    if (conf.target) {
+      handleTargetElement();
+    } else {
+      handleBodyElements();
+    }
+  }
+}
+
+export function setConfig(config) {
+  if (!config) {
+    logError('Required confirguration not provided');
+    return;
+  }
+  if (!config.url) {
+    logError('The required url is not configured');
+    return;
+  }
+  if (typeof config.debounce !== 'number') {
+    config.debounce = CONF_DEFAULT_OBSERVER_DEBOUNCE_MS;
+    logInfo('Set default observer debounce to ' + CONF_DEFAULT_OBSERVER_DEBOUNCE_MS);
+  }
+  if (typeof config.fullscan !== 'boolean') {
+    config.fullscan = CONF_DEFAULT_FULL_BODY_SCAN;
+    logInfo('Set default fullscan ' + CONF_DEFAULT_FULL_BODY_SCAN);
+  }
+  conf = config;
+  associateIds();
+}
+
+config.getConfig('idImportLibrary', config => setConfig(config.idImportLibrary));
diff --git a/modules/idImportLibrary.md b/modules/idImportLibrary.md
new file mode 100644
index 00000000000..3dd78ee25d8
--- /dev/null
+++ b/modules/idImportLibrary.md
@@ -0,0 +1,22 @@
+# ID Import Library
+
+## Configuration Options
+
+| Parameter  | Required | Type    | Default | Description |
+| :--------- | :------- | :------ | :------ | :---------- |
+| `target`   | Yes      | String  | N/A     | ID attribute of the element from which the email can be read. |
+| `url`      | Yes      | String  | N/A     | URL endpoint used to post the hashed email and user IDs. |
+| `debounce` | No       | Number  | 250     | Time in milliseconds before the email and IDs are fetched. |
+| `fullscan` | No       | Boolean | false   | Enable/disable a full page body scan to get email. |
+
+## Example
+
+```javascript
+pbjs.setConfig({
+    idImportLibrary: {
+        target: 'username',
+        url: 'https://example.com',
+        debounce: 250,
+        fullscan: false,
+    },
+});
diff --git a/modules/idLibrary.js b/modules/idLibrary.js
new file mode 100644
index 00000000000..0d8616c3f88
--- /dev/null
+++ b/modules/idLibrary.js
@@ -0,0 +1,243 @@
+import {getGlobal} from '../src/prebidGlobal.js';
+import {ajax} from '../src/ajax.js';
+import {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
+import MD5 from 'crypto-js/md5.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 OBSERVER_CONFIG = {
+  subtree: true,
+  attributes: true,
+  attributeOldValue: false,
+  childList: true,
+  attirbuteFilter: ['value'],
+  characterData: true,
+  characterDataOldValue: false
+};
+const logInfo = createLogInfo(LOG_PRE_FIX);
+const logError = createLogError(LOG_PRE_FIX);
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    utils.logInfo(prefix + ' ', ...strings);
+  }
+}
+
+function createLogError(prefix) {
+  return function (...strings) {
+    utils.logError(prefix + ' ', ...strings);
+  }
+}
+
+function getEmail(value) {
+  const matched = value.match(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)/gi);
+  if (!matched) {
+    return null;
+  }
+  logInfo('Email found: ' + matched[0]);
+  return matched[0];
+}
+
+function bodyAction(mutations, observer) {
+  logInfo('BODY observer on debounce called');
+  // If the email is found in the input element, disconnect the observer
+  if (email) {
+    observer.disconnect();
+    logInfo('Email is found, body observer disconnected');
+    return;
+  }
+
+  const body = document.body.innerHTML;
+  email = getEmail(body);
+  if (email !== null) {
+    logInfo(`Email obtained from the body ${email}`);
+    observer.disconnect();
+    logInfo('Post data on email found in body');
+    postData();
+  }
+}
+
+function targetAction(mutations, observer) {
+  logInfo('Target observer called');
+  for (const mutation of mutations) {
+    for (const node of mutation.addedNodes) {
+      email = node.textContent;
+
+      if (email) {
+        logInfo('Email obtained from the target ' + email);
+        observer.disconnect();
+        logInfo('Post data on email found in target');
+        postData();
+        return;
+      }
+    }
+  }
+}
+
+function addInputElementsElementListner(conf) {
+  logInfo('Adding input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    logInfo(`Original Value in Input = ${inputs[i].value}`);
+    inputs[i].addEventListener('change', event => processInputChange(event));
+    inputs[i].addEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function removeInputElementsElementListner() {
+  logInfo('Removing input element listeners');
+  const inputs = document.querySelectorAll('input[type=text], input[type=email]');
+
+  for (var i = 0; i < inputs.length; i++) {
+    inputs[i].removeEventListener('change', event => processInputChange(event));
+    inputs[i].removeEventListener('blur', event => processInputChange(event));
+  }
+}
+
+function processInputChange(event) {
+  const value = event.target.value;
+  logInfo(`Modified Value of input ${event.target.value}`);
+  email = getEmail(value);
+  if (email !== null) {
+    logInfo('Email found in input ' + email);
+    postData();
+    removeInputElementsElementListner();
+  }
+}
+
+function debounce(func, wait, immediate) {
+  var timeout;
+  return function () {
+    const context = this;
+    const args = arguments;
+    const later = function () {
+      timeout = null;
+      if (!immediate) func.apply(context, args);
+    };
+    var callNow = immediate && !timeout;
+    clearTimeout(timeout);
+    if (callNow) {
+      func.apply(context, args);
+    } else {
+      logInfo('Debounce wait time ' + wait);
+      timeout = setTimeout(later, wait);
+    }
+  };
+};
+
+function handleTargetElement() {
+  const targetObserver = new MutationObserver(debounce(targetAction, conf.debounce, false));
+
+  const targetElement = document.getElementById(conf.target);
+  if (targetElement) {
+    email = targetElement.innerText;
+
+    if (!email) {
+      logInfo('Finding the email with observer');
+      targetObserver.observe(targetElement, OBSERVER_CONFIG);
+    } else {
+      logInfo('Target found with target ' + email);
+      logInfo('Post data on email found in target with target');
+      postData();
+    }
+  }
+}
+
+function handleBodyElements() {
+  if (doesInputElementsHaveEmail()) {
+    logInfo('Email found in input elements ' + email);
+    logInfo('Post data on email found in target without');
+    postData();
+    return;
+  }
+  email = getEmail(document.body.innerHTML);
+  if (email !== null) {
+    logInfo('Email found in body ' + email);
+    logInfo('Post data on email found in the body without observer');
+    postData();
+    return;
+  }
+  addInputElementsElementListner();
+  if (conf.fullscan === true) {
+    const bodyObserver = new MutationObserver(debounce(bodyAction, conf.debounce, false));
+    bodyObserver.observe(document.body, OBSERVER_CONFIG);
+  }
+}
+
+function doesInputElementsHaveEmail() {
+  const inputs = document.getElementsByTagName('input');
+
+  for (let index = 0; index < inputs.length; ++index) {
+    const curInput = inputs[index];
+    email = getEmail(curInput.value);
+    if (email !== null) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function syncCallback() {
+  return {
+    success: function () {
+      logInfo('Data synced successfully.');
+    },
+    error: function () {
+      logInfo('Data sync failed.');
+    }
+  }
+}
+
+function postData() {
+  (getGlobal()).refreshUserIds();
+  const userIds = (getGlobal()).getUserIds();
+  if (Object.keys(userIds).length === 0) {
+    logInfo('No user ids');
+    return;
+  }
+  logInfo('Users' + userIds);
+  const syncPayload = {};
+  syncPayload.hid = MD5(email).toString();
+  syncPayload.uids = userIds;
+  const payloadString = JSON.stringify(syncPayload);
+  logInfo(payloadString);
+  ajax(conf.url, syncCallback(), payloadString, {method: 'POST', withCredentials: true});
+}
+
+function associateIds() {
+  if (window.MutationObserver || window.WebKitMutationObserver) {
+    if (conf.target) {
+      handleTargetElement();
+    } else {
+      handleBodyElements();
+    }
+  }
+}
+
+export function setConfig(config) {
+  if (!config) {
+    logError('Required confirguration not provided');
+    return;
+  }
+  if (!config.url) {
+    logError('The required url is not configured');
+    return;
+  }
+  if (typeof config.debounce !== 'number') {
+    config.debounce = CONF_DEFAULT_OBSERVER_DEBOUNCE_MS;
+    logInfo('Set default observer debounce to ' + CONF_DEFAULT_OBSERVER_DEBOUNCE_MS);
+  }
+  if (typeof config.fullscan !== 'boolean') {
+    config.fullscan = CONF_DEFAULT_FULL_BODY_SCAN;
+    logInfo('Set default fullscan ' + CONF_DEFAULT_FULL_BODY_SCAN);
+  }
+  conf = config;
+  associateIds();
+}
+
+config.getConfig('idLibrary', config => setConfig(config.idLibrary));
diff --git a/modules/idLibrary.md b/modules/idLibrary.md
new file mode 100644
index 00000000000..28d40c389f3
--- /dev/null
+++ b/modules/idLibrary.md
@@ -0,0 +1,22 @@
+# ID Library
+
+## Configuration Options
+
+| Parameter  | Required | Type    | Default | Description |
+| :--------- | :------- | :------ | :------ | :---------- |
+| `target`   | Yes      | String  | N/A     | ID attribute of the element from which the email can be read. |
+| `url`      | Yes      | String  | N/A     | URL endpoint used to post the hashed email and user IDs. |
+| `debounce` | No       | Number  | 250     | Time in milliseconds before the email and IDs are fetched. |
+| `fullscan` | No       | Boolean | false   | Enable/disable a full page body scan to get email. |
+
+## Example
+
+```javascript
+pbjs.setConfig({
+    idLibrary: {
+        target: 'username',
+        url: 'https://example.com',
+        debounce: 250,
+        fullscan: false,
+    },
+});
diff --git a/modules/identityLinkIdSystem.js b/modules/identityLinkIdSystem.js
index c516c06d11a..df7b03b4e6e 100644
--- a/modules/identityLinkIdSystem.js
+++ b/modules/identityLinkIdSystem.js
@@ -6,8 +6,11 @@
  */
 
 import * as utils from '../src/utils.js'
-import {ajax} from '../src/ajax.js';
-import {submodule} from '../src/hook.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+
+export const storage = getStorageManager();
 
 /** @type {Submodule} */
 export const identityLinkSubmodule = {
@@ -16,6 +19,11 @@ export const identityLinkSubmodule = {
    * @type {string}
    */
   name: 'identityLink',
+  /**
+   * used to specify vendor id
+   * @type {number}
+   */
+  gvlid: 97,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -29,43 +37,49 @@ export const identityLinkSubmodule = {
    * performs action to obtain id and return a value in the callback's response argument
    * @function
    * @param {ConsentData} [consentData]
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData) {
+  getId(config, consentData) {
+    const configParams = (config && config.params) || {};
     if (!configParams || typeof configParams.pid !== 'string') {
-      utils.logError('identityLink submodule requires partner id to be defined');
+      utils.logError('identityLink: requires partner id to be defined');
       return;
     }
     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
-    const url = `https://api.rlcdn.com/api/identity/envelope?pid=${configParams.pid}${hasGdpr ? '&ct=1&cv=' + gdprConsentString : ''}`;
+    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 : ''}`;
     let resp;
-    resp = function(callback) {
+    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) {
-        utils.logInfo('ATS exists!');
+        utils.logInfo('identityLink: ATS exists!');
         window.ats.retrieveEnvelope(function (envelope) {
           if (envelope) {
-            utils.logInfo('An envelope can be retrieved from ATS!');
+            utils.logInfo('identityLink: An envelope can be retrieved from ATS!');
+            setEnvelopeSource(true);
             callback(JSON.parse(envelope).envelope);
           } else {
-            getEnvelope(url, callback);
+            getEnvelope(url, callback, configParams);
           }
         });
       } else {
-        getEnvelope(url, callback);
+        getEnvelope(url, callback, configParams);
       }
     };
 
-    return {callback: resp};
+    return { callback: resp };
   }
 };
 // return envelope from third party endpoint
-function getEnvelope(url, callback) {
-  utils.logInfo('A 3P retrieval is attempted!');
+function getEnvelope(url, callback, configParams) {
   const callbacks = {
     success: response => {
       let responseObj;
@@ -79,11 +93,29 @@ function getEnvelope(url, callback) {
       callback((responseObj && responseObj.envelope) ? responseObj.envelope : '');
     },
     error: error => {
-      utils.logInfo(`identityLink: ID fetch encountered an error`, error);
+      utils.logInfo(`identityLink: identityLink: ID fetch encountered an error`, error);
       callback();
     }
   };
-  ajax(url, callbacks, undefined, {method: 'GET', withCredentials: true});
+
+  if (!configParams.notUse3P && !storage.getCookie('_lr_retry_request')) {
+    setRetryCookie();
+    utils.logInfo('identityLink: A 3P retrieval is attempted!');
+    setEnvelopeSource(false);
+    ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
+  }
+}
+
+function setRetryCookie() {
+  let now = new Date();
+  now.setTime(now.getTime() + 3600000);
+  storage.setCookie('_lr_retry_request', 'true', now.toUTCString());
+}
+
+function setEnvelopeSource(src) {
+  let now = new Date();
+  now.setTime(now.getTime() + 2592000000);
+  storage.setCookie('_lr_env_src_ats', src, now.toUTCString());
 }
 
 submodule('userId', identityLinkSubmodule);
diff --git a/modules/idxIdSystem.js b/modules/idxIdSystem.js
new file mode 100644
index 00000000000..00e8a8bc5e5
--- /dev/null
+++ b/modules/idxIdSystem.js
@@ -0,0 +1,61 @@
+/**
+ * This module adds IDx to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/idxIdSystem
+ * @requires module:modules/userId
+ */
+import * as utils from '../src/utils.js'
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const IDX_MODULE_NAME = 'idx';
+const IDX_COOKIE_NAME = '_idx';
+export const storage = getStorageManager();
+
+function readIDxFromCookie() {
+  return storage.cookiesAreEnabled ? storage.getCookie(IDX_COOKIE_NAME) : null;
+}
+
+function readIDxFromLocalStorage() {
+  return storage.localStorageIsEnabled ? storage.getDataFromLocalStorage(IDX_COOKIE_NAME) : null;
+}
+
+/** @type {Submodule} */
+export const idxIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: IDX_MODULE_NAME,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { Object | string | undefined } value
+   * @return { Object | string | undefined }
+   */
+  decode(value) {
+    const idxVal = value ? utils.isStr(value) ? value : utils.isPlainObject(value) ? value.id : undefined : undefined;
+    return idxVal ? {
+      'idx': idxVal
+    } : 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 idxString = readIDxFromLocalStorage() || readIDxFromCookie();
+    if (typeof idxString == 'string' && idxString) {
+      try {
+        const idxObj = JSON.parse(idxString);
+        return idxObj && idxObj.idx ? { id: idxObj.idx } : undefined;
+      } catch (error) {
+        utils.logError(error);
+      }
+    }
+    return undefined;
+  }
+};
+submodule('userId', idxIdSubmodule);
diff --git a/modules/idxIdSystem.md b/modules/idxIdSystem.md
new file mode 100644
index 00000000000..363120899cb
--- /dev/null
+++ b/modules/idxIdSystem.md
@@ -0,0 +1,22 @@
+## IDx User ID Submodule
+
+For assistance setting up your module please contact us at [prebid@idx.lat](prebid@idx.lat).
+
+### Prebid Params
+
+Individual params may be set for the IDx Submodule.
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'idx',
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `userSync` Configuration Section
+The below parameters apply only to the IDx integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID of the module - `"idx"` | `"idx"` |
diff --git a/modules/impactifyBidAdapter.js b/modules/impactifyBidAdapter.js
new file mode 100644
index 00000000000..b649b5a8a73
--- /dev/null
+++ b/modules/impactifyBidAdapter.js
@@ -0,0 +1,260 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import {ajax} from '../src/ajax.js';
+
+const BIDDER_CODE = 'impactify';
+const BIDDER_ALIAS = ['imp'];
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_VIDEO_WIDTH = 640;
+const DEFAULT_VIDEO_HEIGHT = 480;
+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 createOpenRtbRequest = (validBidRequests, bidderRequest) => {
+  // Create request and set imp bids inside
+  let request = {
+    id: bidderRequest.auctionId,
+    validBidRequests,
+    cur: [DEFAULT_CURRENCY],
+    imp: []
+  };
+
+  // Force impactify debugging parameter
+  if (window.localStorage.getItem('_im_db_bidder') == 3) {
+    request.test = 3;
+  }
+
+  // Set device/user/site
+  if (!request.device) request.device = {};
+  if (!request.site) request.site = {};
+  request.device = {
+    w: window.innerWidth,
+    h: window.innerHeight,
+    devicetype: 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.referer};
+
+  // 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;
+    utils.deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
+    utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    this.syncStore.uspConsent = bidderRequest.uspConsent;
+  }
+
+  if (GETCONFIG('coppa') == true) utils.deepSetValue(request, 'regs.coppa', 1);
+
+  if (bidderRequest.uspConsent) {
+    utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  // Set buyer uid
+  utils.deepSetValue(request, 'user.buyeruid', utils.generateUUID());
+
+  // Create imps with bids
+  validBidRequests.forEach((bid) => {
+    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'],
+      },
+    };
+    if (bid.params.container) {
+      imp.ext.impactify.container = bid.params.container;
+    }
+    request.imp.push(imp);
+  });
+
+  return request;
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: ['video'],
+  aliases: BIDDER_ALIAS,
+  /**
+   * 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.params.appId || typeof bid.params.appId != 'string' || !bid.params.format || typeof bid.params.format != 'string' || !bid.params.style || typeof bid.params.style != 'string') {
+      return false;
+    }
+    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;
+    }
+
+    return true;
+  },
+  /**
+   * Make a server request from the list of BidRequests.
+   *
+   * @param {validBidRequests[]} - an array of bids
+   * @param {bidderRequest} - the bidding request
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    // Create a clean openRTB request
+    let request = createOpenRtbRequest(validBidRequests, bidderRequest);
+
+    return {
+      method: 'POST',
+      url: ORIGIN + AUCTIONURI,
+      data: JSON.stringify(request),
+    };
+  },
+  /**
+   * 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;
+    }
+
+    if (!serverBody.seatbid || !serverBody.seatbid.length) {
+      return [];
+    }
+
+    serverBody.seatbid.forEach((seatbid) => {
+      if (seatbid.bid.length) {
+        bidResponses = [
+          ...bidResponses,
+          ...seatbid.bid
+            .filter((bid) => bid.price > 0)
+            .map((bid) => ({
+              id: bid.id,
+              requestId: bid.impid,
+              cpm: bid.price,
+              currency: serverBody.cur,
+              netRevenue: true,
+              ad: bid.adm,
+              width: bid.w || 0,
+              height: bid.h || 0,
+              ttl: 300,
+              creativeId: bid.crid || 0,
+              hash: bid.hash,
+              expiry: bid.expiry
+            })),
+        ];
+      }
+    });
+
+    return bidResponses;
+  },
+
+  /**
+   * 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 (!serverResponses || serverResponses.length === 0) {
+      return [];
+    }
+
+    if (!syncOptions.iframeEnabled) {
+      return [];
+    }
+
+    let params = '';
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        params += `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        params += `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (uspConsent) {
+      params += `${params ? '&' : '?'}us_privacy=${encodeURIComponent(uspConsent)}`;
+    }
+
+    if (document.location.search.match(/pbs_debug=true/)) params += `&pbs_debug=true`;
+
+    return [{
+      type: 'iframe',
+      url: ORIGIN + COOKIESYNCURI + 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), {
+      method: 'POST',
+      contentType: 'application/json'
+    });
+
+    return true;
+  },
+
+  /**
+   * 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]), {
+      method: 'POST',
+      contentType: 'application/json'
+    });
+
+    return true;
+  }
+};
+registerBidder(spec);
diff --git a/modules/impactifyBidAdapter.md b/modules/impactifyBidAdapter.md
new file mode 100644
index 00000000000..3de9a8cfb84
--- /dev/null
+++ b/modules/impactifyBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Impactify Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: thomas.destefano@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
+
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'your-slot-div-id', // This is your slot div id
+      mediaTypes: {
+          video: {
+              context: 'outstream'
+          }
+      },
+      bids: [{
+          bidder: 'impactify',
+          params: {
+              appId: 'example.com',
+              format: 'screen',
+              style: 'inline'
+          }
+      }]
+    }];
+```
diff --git a/modules/improvedigitalBidAdapter.js b/modules/improvedigitalBidAdapter.js
index 3c000258ede..53d9e1a1b7d 100644
--- a/modules/improvedigitalBidAdapter.js
+++ b/modules/improvedigitalBidAdapter.js
@@ -3,15 +3,18 @@ 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 { createEidsArray } from './userId/eids.js';
+import includes from 'core-js-pure/features/array/includes.js';
 
 const BIDDER_CODE = 'improvedigital';
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
+const VIDEO_TARGETING = ['skip', 'skipmin', 'skipafter'];
 
 export const spec = {
-  version: '7.1.0',
+  version: '7.4.0',
   code: BIDDER_CODE,
   gvlid: 253,
-  aliases: ['id'],
+  aliases: ['id', 'weborama'],
   supportedMediaTypes: [BANNER, NATIVE, VIDEO],
 
   /**
@@ -56,6 +59,13 @@ export const spec = {
 
     requestParameters.schain = bidRequests[0].schain;
 
+    if (bidRequests[0].userId) {
+      const eids = createEidsArray(bidRequests[0].userId);
+      if (eids.length) {
+        utils.deepSetValue(requestParameters, 'user.ext.eids', eids);
+      }
+    }
+
     let requestObj = idClient.createRequest(
       normalizedBids, // requestObject
       requestParameters
@@ -116,7 +126,6 @@ export const spec = {
       }
 
       // Common properties
-      bid.adId = bidObject.id;
       bid.cpm = parseFloat(bidObject.price);
       bid.creativeId = bidObject.crid;
       bid.currency = bidObject.currency ? bidObject.currency.toUpperCase() : 'USD';
@@ -149,6 +158,12 @@ export const spec = {
         bid.height = 1;
       }
 
+      if (bidObject.adomain) {
+        bid.meta = {
+          advertiserDomains: bidObject.adomain
+        };
+      }
+
       bids.push(bid);
     });
     return bids;
@@ -194,6 +209,36 @@ function isOutstreamVideo(bid) {
   return videoMediaType && context === 'outstream';
 }
 
+function getVideoTargetingParams(bid) {
+  const result = {};
+  Object.keys(Object(bid.mediaTypes.video))
+    .filter(key => includes(VIDEO_TARGETING, 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 getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return null;
+  }
+  const floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 function outstreamRender(bid) {
   bid.renderer.push(() => {
     window.ANOutstreamVideo.renderAd({
@@ -240,13 +285,14 @@ function getNormalizedBidRequest(bid) {
   const bidId = utils.getBidIdParameter('bidId', bid);
   const transactionId = utils.getBidIdParameter('transactionId', bid);
   const currency = config.getConfig('currency.adServerCurrency');
-  const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
-  const bidFloorCur = utils.getBidIdParameter('bidFloorCur', bid.params);
 
   let normalizedBidRequest = {};
   if (isInstreamVideo(bid)) {
     normalizedBidRequest.adTypes = [ VIDEO ];
   }
+  if (isInstreamVideo(bid) || isOutstreamVideo(bid)) {
+    normalizedBidRequest.video = getVideoTargetingParams(bid);
+  }
   if (placementId) {
     normalizedBidRequest.placementId = placementId;
   } else {
@@ -282,6 +328,13 @@ function getNormalizedBidRequest(bid) {
   if (currency) {
     normalizedBidRequest.currency = currency;
   }
+  // Floor
+  let bidFloor = getBidFloor(bid);
+  let bidFloorCur = null;
+  if (!bidFloor) {
+    bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
+    bidFloorCur = utils.getBidIdParameter('bidFloorCur', bid.params);
+  }
   if (bidFloor) {
     normalizedBidRequest.bidFloor = bidFloor;
     normalizedBidRequest.bidFloorCur = bidFloorCur ? bidFloorCur.toUpperCase() : 'USD';
@@ -392,7 +445,7 @@ export function ImproveDigitalAdServerJSClient(endPoint) {
     AD_SERVER_BASE_URL: 'ice.360yield.com',
     END_POINT: endPoint || 'hb',
     AD_SERVER_URL_PARAM: 'jsonp=',
-    CLIENT_VERSION: 'JS-6.3.0',
+    CLIENT_VERSION: 'JS-6.4.0',
     MAX_URL_LENGTH: 2083,
     ERROR_CODES: {
       MISSING_PLACEMENT_PARAMS: 2,
@@ -552,6 +605,9 @@ export function ImproveDigitalAdServerJSClient(endPoint) {
     if (requestParameters.schain) {
       impressionBidRequestObject.schain = requestParameters.schain;
     }
+    if (requestParameters.user) {
+      impressionBidRequestObject.user = requestParameters.user;
+    }
     if (extraRequestParameters) {
       for (let prop in extraRequestParameters) {
         impressionBidRequestObject[prop] = extraRequestParameters[prop];
@@ -598,6 +654,21 @@ export function ImproveDigitalAdServerJSClient(endPoint) {
     if (placementObject.transactionId) {
       impressionObject.tid = placementObject.transactionId;
     }
+    if (!utils.isEmpty(placementObject.video)) {
+      const video = Object.assign({}, placementObject.video);
+      // skip must be 0 or 1
+      if (video.skip !== 1) {
+        delete video.skipmin;
+        delete video.skipafter;
+        if (video.skip !== 0) {
+          utils.logWarn(`video.skip: invalid value '${video.skip}'. Expected 0 or 1`);
+          delete video.skip;
+        }
+      }
+      if (!utils.isEmpty(video)) {
+        impressionObject.video = video;
+      }
+    }
     if (placementObject.keyValues) {
       for (let key in placementObject.keyValues) {
         for (let valueCounter = 0; valueCounter < placementObject.keyValues[key].length; valueCounter++) {
diff --git a/modules/inmarBidAdapter.js b/modules/inmarBidAdapter.js
new file mode 100755
index 00000000000..e1edd935587
--- /dev/null
+++ b/modules/inmarBidAdapter.js
@@ -0,0 +1,110 @@
+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';
+
+const BIDDER_CODE = 'inmar';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['inm'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
+  /**
+   * Determines whether or not the given bid request is valid
+   *
+   * @param {bidRequest} bid The bid params to validate.
+   * @returns {boolean} True if this is a valid bid, and false otherwise
+   */
+  isBidRequestValid: function(bid) {
+    return !!(bid.params && bid.params.partnerId);
+  },
+
+  /**
+   * Build a server request from the list of valid BidRequests
+   * @param {validBidRequests} is an array of the valid bids
+   * @param {bidderRequest} bidder request object
+   * @returns {ServerRequest} Info describing the request to the server
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    var payload = {
+      bidderCode: bidderRequest.bidderCode,
+      auctionId: bidderRequest.auctionId,
+      bidderRequestId: bidderRequest.bidderRequestId,
+      bidRequests: validBidRequests,
+      auctionStart: bidderRequest.auctionStart,
+      timeout: bidderRequest.timeout,
+      refererInfo: bidderRequest.refererInfo,
+      start: bidderRequest.start,
+      gdprConsent: bidderRequest.gdprConsent,
+      uspConsent: bidderRequest.uspConsent,
+      currencyCode: config.getConfig('currency.adServerCurrency'),
+      coppa: config.getConfig('coppa'),
+      firstPartyData: config.getLegacyFpd(config.getConfig('ortb2')),
+      prebidVersion: '$prebid.version$'
+    };
+
+    var payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: 'https://prebid.owneriq.net:8443/bidder/pb/bid',
+      data: payloadString,
+    };
+  },
+
+  /**
+   * Read the response from the server and build a list of bids
+   * @param {serverResponse} Response from the server.
+   * @param {bidRequest} Bid request object
+   * @returns {bidResponses} Array of bids which were nested inside the server
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    var response = serverResponse.body;
+
+    try {
+      if (response) {
+        var bidResponse = {
+          requestId: response.requestId,
+          cpm: response.cpm,
+          currency: response.currency,
+          width: response.width,
+          height: response.height,
+          ad: response.ad,
+          ttl: response.ttl,
+          creativeId: response.creativeId,
+          netRevenue: response.netRevenue,
+          vastUrl: response.vastUrl,
+          dealId: response.dealId,
+          meta: response.meta
+        };
+
+        bidResponses.push(bidResponse);
+      }
+    } catch (error) {
+      utils.logError('Error while parsing inmar response', error);
+    }
+    return bidResponses;
+  },
+
+  /**
+   * User Syncs
+   *
+   * @param {syncOptions} Publisher prebid configuration
+   * @param {serverResponses} Response from the server
+   * @returns {Array}
+   */
+  getUserSyncs: function(syncOptions, serverResponses) {
+    const syncs = [];
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: 'https://px.owneriq.net/eucm/p/pb'
+      });
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/inmarBidAdapter.md b/modules/inmarBidAdapter.md
new file mode 100644
index 00000000000..8ed6b998602
--- /dev/null
+++ b/modules/inmarBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+```
+Module Name: Inmar Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: oiq_rtb@inmar.com
+```
+
+# Description
+
+Connects to Inmar for bids. This adapter supports Display and Video.
+
+The Inmar adapter requires setup and approval from the Inmar team.
+Please reach out to your account manager for more information.
+
+# Test Parameters
+
+## Web
+```
+    var adUnits = [
+                {
+                    code: 'test-div1',
+                    sizes: [[300, 250],[300, 600]],
+                    bids: [{
+                        bidder: 'inmar',
+                        params: {
+                            partnerId: 12345,
+                            position: 1
+                        }
+                    }]
+                },
+                {
+                    code: 'test-div2',
+                    sizes: [[728, 90],[970, 250]],
+                    bids: [{
+                        bidder: 'inmar',
+                        params: {
+                            partnerId: 12345,
+                            position: 0
+                        }
+                    }]
+                }
+            ];
+```
diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
index 2a55b5280db..5173f1dca63 100644
--- a/modules/inskinBidAdapter.js
+++ b/modules/inskinBidAdapter.js
@@ -4,9 +4,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 const BIDDER_CODE = 'inskin';
 
 const CONFIG = {
-  'inskin': {
-    'BASE_URI': 'https://mfad.inskinad.com/api/v2'
-  }
+  BASE_URI: 'https://mfad.inskinad.com/api/v2'
 };
 
 export const spec = {
@@ -97,8 +95,7 @@ export const spec = {
     }
 
     validBidRequests.map(bid => {
-      let config = CONFIG[bid.bidder];
-      ENDPOINT_URL = config.BASE_URI;
+      ENDPOINT_URL = CONFIG.BASE_URI;
 
       const placement = Object.assign({
         divName: bid.bidId,
@@ -108,8 +105,12 @@ export const spec = {
 
       placement.adTypes.push(5, 9, 163, 2163, 3006);
 
+      placement.properties = placement.properties || {};
+
+      placement.properties.screenWidth = screen.width;
+      placement.properties.screenHeight = screen.height;
+
       if (restrictions.length) {
-        placement.properties = placement.properties || {};
         placement.properties.restrictions = restrictions;
       }
 
@@ -168,6 +169,7 @@ export const spec = {
           bid.currency = 'USD';
           bid.creativeId = decision.adId;
           bid.ttl = 360;
+          bid.meta = { advertiserDomains: decision.adomain ? decision.adomain : [] }
           bid.netRevenue = true;
 
           bidResponses.push(bid);
@@ -188,7 +190,7 @@ export const spec = {
 
         const id = 'ism_tag_' + Math.floor((Math.random() * 10e16));
         window[id] = {
-          plr_AdSlot: e.source.frameElement,
+          plr_AdSlot: e.source && e.source.frameElement,
           bidId: e.data.bidId,
           bidPrice: bidsMap[e.data.bidId].price,
           serverResponse
diff --git a/modules/instreamTracking.js b/modules/instreamTracking.js
new file mode 100644
index 00000000000..68bb4be79de
--- /dev/null
+++ b/modules/instreamTracking.js
@@ -0,0 +1,114 @@
+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 * as utils from '../src/utils.js';
+import { BID_STATUS, EVENTS, TARGETING_KEYS } from '../src/constants.json';
+
+const {CACHE_ID, UUID} = TARGETING_KEYS;
+const {BID_WON, AUCTION_END} = EVENTS;
+const {RENDERED} = BID_STATUS;
+
+const INSTREAM_TRACKING_DEFAULT_CONFIG = {
+  enabled: false,
+  maxWindow: 1000 * 60, // the time in ms after which polling for instream delivery stops
+  pollingFreq: 500 // the frequency of polling
+};
+
+// Set instreamTracking default values
+config.setDefaults({
+  'instreamTracking': utils.deepClone(INSTREAM_TRACKING_DEFAULT_CONFIG)
+});
+
+const whitelistedResources = /video|fetch|xmlhttprequest|other/;
+
+/**
+ * Here the idea is
+ * find all network entries via performance.getEntriesByType()
+ * filter it by video cache key in the url
+ * and exclude the ad server urls so that we dont match twice
+ * eg:
+ * dfp ads call: https://securepubads.g.doubleclick.net/gampad/ads?...hb_cache_id%3D55e85cd3-6ea4-4469-b890-84241816b131%26...
+ * prebid cache url: https://prebid.adnxs.com/pbc/v1/cache?uuid=55e85cd3-6ea4-4469-b890-84241816b131
+ *
+ * if the entry exists, emit the BID_WON
+ *
+ * Note: this is a workaround till a better approach is engineered.
+ *
+ * @param {Array} adUnits
+ * @param {Array} bidsReceived
+ * @param {Array} bidderRequests
+ *
+ * @return {boolean} returns TRUE if tracking started
+ */
+export function trackInstreamDeliveredImpressions({adUnits, bidsReceived, bidderRequests}) {
+  const instreamTrackingConfig = config.getConfig('instreamTracking') || {};
+  // check if instreamTracking is enabled and performance api is available
+  if (!instreamTrackingConfig.enabled || !window.performance || !window.performance.getEntriesByType) {
+    return false;
+  }
+
+  // filter for video bids
+  const instreamBids = bidsReceived.filter(bid => {
+    const bidderRequest = utils.getBidRequest(bid.requestId, bidderRequests);
+    return bidderRequest && utils.deepAccess(bidderRequest, 'mediaTypes.video.context') === INSTREAM && bid.videoCacheKey;
+  });
+  if (!instreamBids.length) {
+    return false;
+  }
+
+  // find unique instream ad units
+  const instreamAdUnitMap = {};
+  adUnits.forEach(adUnit => {
+    if (!instreamAdUnitMap[adUnit.code] && utils.deepAccess(adUnit, 'mediaTypes.video.context') === INSTREAM) {
+      instreamAdUnitMap[adUnit.code] = true;
+    }
+  });
+  const instreamAdUnitsCount = Object.keys(instreamAdUnitMap).length;
+
+  const start = Date.now();
+  const {maxWindow, pollingFreq, urlPattern} = instreamTrackingConfig;
+
+  let instreamWinningBidsCount = 0;
+  let lastRead = 0; // offset for performance.getEntriesByType
+
+  function poll() {
+    // get network entries using the last read offset
+    const entries = window.performance.getEntriesByType('resource').splice(lastRead);
+    for (const resource of entries) {
+      const url = resource.name;
+      // check if the resource is of whitelisted resource to avoid checking img or css or script urls
+      if (!whitelistedResources.test(resource.initiatorType)) {
+        continue;
+      }
+
+      instreamBids.forEach((bid) => {
+        // match the video cache key excluding ad server call
+        const matches = !(url.indexOf(CACHE_ID) !== -1 || url.indexOf(UUID) !== -1) && url.indexOf(bid.videoCacheKey) !== -1;
+        if (urlPattern && urlPattern instanceof RegExp && !urlPattern.test(url)) {
+          return;
+        }
+        if (matches && bid.status !== RENDERED) {
+          // video found
+          instreamWinningBidsCount++;
+          auctionManager.addWinningBid(bid);
+          events.emit(BID_WON, bid);
+        }
+      });
+    }
+    // update offset
+    lastRead += entries.length;
+
+    const timeElapsed = Date.now() - start;
+    if (timeElapsed < maxWindow && instreamWinningBidsCount < instreamAdUnitsCount) {
+      setTimeout(poll, pollingFreq);
+    }
+  }
+
+  // start polling for network entries
+  setTimeout(poll, pollingFreq);
+
+  return true;
+}
+
+events.on(AUCTION_END, trackInstreamDeliveredImpressions)
diff --git a/modules/intentIqIdSystem.js b/modules/intentIqIdSystem.js
new file mode 100644
index 00000000000..e12a765c086
--- /dev/null
+++ b/modules/intentIqIdSystem.js
@@ -0,0 +1,168 @@
+/**
+ * This module adds IntentIqId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/intentIqIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js'
+import {getStorageManager} from '../src/storageManager.js';
+
+const PCID_EXPIRY = 365;
+
+const MODULE_NAME = 'intentIqId';
+export const FIRST_PARTY_KEY = '_iiq_fdata';
+
+export const storage = getStorageManager(undefined, MODULE_NAME);
+
+const INVALID_ID = 'INVALID_ID';
+
+/**
+ * Generate standard UUID string
+ * @return {string}
+ */
+function generateGUID() {
+  let d = new Date().getTime();
+  const guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+  });
+  return guid;
+}
+
+/**
+ * Read Intent IQ data from cookie or local storage
+ * @param key
+ * @return {string}
+ */
+export function readData(key) {
+  try {
+    if (storage.hasLocalStorage()) {
+      return storage.getDataFromLocalStorage(key);
+    }
+    if (storage.cookiesAreEnabled()) {
+      return storage.getCookie(key);
+    }
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * Store Intent IQ data in either cookie or local storage
+ * expiration date: 365 days
+ * @param key
+ * @param {string} value IntentIQ ID value to sintentIqIdSystem_spec.jstore
+ */
+function storeData(key, value) {
+  try {
+    utils.logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
+
+    if (value) {
+      if (storage.hasLocalStorage()) {
+        storage.setDataInLocalStorage(key, value);
+      }
+      const expiresStr = (new Date(Date.now() + (PCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
+      if (storage.cookiesAreEnabled()) {
+        storage.setCookie(key, value, expiresStr, 'LAX');
+      }
+    }
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * Parse json if possible, else return null
+ * @param data
+ * @param {object|null}
+ */
+function tryParse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (err) {
+    utils.logError(err);
+    return null;
+  }
+}
+
+/** @type {Submodule} */
+export const intentIqIdSubmodule = {
+  /**
+   * 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 {{intentIqId: {string}}|undefined}
+   */
+  decode(value) {
+    return value && value != '' && INVALID_ID != value ? { 'intentIqId': 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) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.partner !== 'number') {
+      utils.logError('User ID - intentIqId submodule requires a valid partner to be defined');
+      return;
+    }
+
+    // Read Intent IQ 1st party id or generate it if none exists
+    let firstPartyData = tryParse(readData(FIRST_PARTY_KEY));
+    if (!firstPartyData || !firstPartyData.pcid) {
+      const firstPartyId = generateGUID();
+      firstPartyData = { 'pcid': firstPartyId };
+      storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData));
+    }
+
+    // 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`;
+    url += configParams.pcid ? '&pcid=' + encodeURIComponent(configParams.pcid) : '';
+    url += configParams.pai ? '&pai=' + encodeURIComponent(configParams.pai) : '';
+    url += firstPartyData.pcid ? '&iiqidtype=2&iiqpcid=' + encodeURIComponent(firstPartyData.pcid) : '';
+    url += firstPartyData.pid ? '&pid=' + encodeURIComponent(firstPartyData.pid) : '';
+
+    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
+            if ('pid' in respJson) {
+              firstPartyData.pid = respJson.pid;
+              storeData(FIRST_PARTY_KEY, JSON.stringify(firstPartyData));
+            }
+
+            // If should save and data is empty, means we should save as INVALID_ID
+            if (respJson.data == '') {
+              respJson.data = INVALID_ID;
+            }
+            callback(respJson.data);
+          } else {
+            callback();
+          }
+        },
+        error: error => {
+          utils.logError(MODULE_NAME + ': ID fetch encountered an error', error);
+          callback();
+        }
+      };
+      ajax(url, callbacks, undefined, {method: 'GET', withCredentials: true});
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', intentIqIdSubmodule);
diff --git a/modules/interactiveOffersBidAdapter.js b/modules/interactiveOffersBidAdapter.js
new file mode 100644
index 00000000000..44a975db837
--- /dev/null
+++ b/modules/interactiveOffersBidAdapter.js
@@ -0,0 +1,162 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'interactiveOffers';
+const ENDPOINT = 'https://rtb.ioadx.com/bidRequest/?partnerId=4a3bab187a74ac4862920cca864d6eff195ff5e4';
+
+const DEFAULT = {
+  'OpenRTBBidRequest': {},
+  'OpenRTBBidRequestSite': {},
+  'OpenRTBBidRequestSitePublisher': {},
+  'OpenRTBBidRequestSiteContent': {
+    language: navigator.language,
+  },
+  'OpenRTBBidRequestSource': {},
+  'OpenRTBBidRequestDevice': {
+    ua: navigator.userAgent,
+    language: navigator.language
+  },
+  'OpenRTBBidRequestUser': {},
+  'OpenRTBBidRequestImp': {},
+  'OpenRTBBidRequestImpBanner': {},
+  'PrebidBid': {
+    currency: 'USD',
+    ttl: 60,
+    netRevenue: false
+  }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: function(bid) {
+    let ret = true;
+    if (bid && bid.params) {
+      if (!utils.isNumber(bid.params.pubid)) {
+        utils.logWarn('pubid must be a valid numeric ID');
+        ret = false;
+      }
+      if (bid.params.tmax && !utils.isNumber(bid.params.tmax)) {
+        utils.logWarn('tmax must be a valid numeric ID');
+        ret = false;
+      }
+    } else {
+      utils.logWarn('invalid request');
+      ret = false;
+    }
+    return ret;
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let payload = parseRequestPrebidjsToOpenRTB(bidderRequest);
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: JSON.stringify(payload),
+      bidderRequest: bidderRequest
+    };
+  },
+
+  interpretResponse: function(response, request) {
+    let bidResponses = [];
+    if (response.body && response.body.length) {
+      bidResponses = parseResponseOpenRTBToPrebidjs(response.body);
+    }
+    return bidResponses;
+  }
+};
+
+function parseRequestPrebidjsToOpenRTB(prebidRequest) {
+  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']));
+  openRTBRequest.id = prebidRequest.auctionId;
+  openRTBRequest.ext = {
+    auctionstart: Date.now()
+  };
+
+  openRTBRequest.site = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSite']));
+  openRTBRequest.site.id = domain;
+  openRTBRequest.site.name = domain;
+  openRTBRequest.site.domain = domain;
+  openRTBRequest.site.page = pageURL;
+  openRTBRequest.site.ref = prebidRequest.refererInfo.referer;
+
+  openRTBRequest.site.publisher = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSitePublisher']));
+  openRTBRequest.site.publisher.id = 0;
+  openRTBRequest.site.publisher.name = config.getConfig('publisherDomain');
+  openRTBRequest.site.publisher.domain = domain;
+  openRTBRequest.site.publisher.domain = domain;
+
+  openRTBRequest.site.content = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSiteContent']));
+
+  openRTBRequest.source = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestSource']));
+  openRTBRequest.source.fd = 0;
+  openRTBRequest.source.tid = prebidRequest.auctionId;
+  openRTBRequest.source.pchain = '';
+
+  openRTBRequest.device = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestDevice']));
+
+  openRTBRequest.user = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestUser']));
+
+  openRTBRequest.imp = [];
+  prebidRequest.bids.forEach(function(bid, impId) {
+    impId++;
+    let imp = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImp']));
+    imp.id = impId;
+    imp.secure = secure;
+    imp.tagid = bid.bidId;
+
+    openRTBRequest.site.publisher.id = openRTBRequest.site.publisher.id || bid.params.pubid;
+    openRTBRequest.tmax = openRTBRequest.tmax || bid.params.tmax || 0;
+
+    Object.keys(bid.mediaTypes).forEach(function(mediaType) {
+      if (mediaType == 'banner') {
+        imp.banner = JSON.parse(JSON.stringify(DEFAULT['OpenRTBBidRequestImpBanner']));
+        imp.banner.w = 0;
+        imp.banner.h = 0;
+        imp.banner.format = [];
+        bid.mediaTypes[mediaType].sizes.forEach(function(adSize) {
+          if (!imp.banner.w) {
+            imp.banner.w = adSize[0];
+            imp.banner.h = adSize[1];
+          }
+          imp.banner.format.push({w: adSize[0], h: adSize[1]});
+        });
+      }
+    });
+    openRTBRequest.imp.push(imp);
+  });
+  return openRTBRequest;
+}
+function parseResponseOpenRTBToPrebidjs(openRTBResponse) {
+  let prebidResponse = [];
+  openRTBResponse.forEach(function(response) {
+    response.seatbid.forEach(function(seatbid) {
+      seatbid.bid.forEach(function(bid) {
+        let prebid = JSON.parse(JSON.stringify(DEFAULT['PrebidBid']));
+        prebid.requestId = bid.ext.tagid;
+        prebid.ad = bid.adm;
+        prebid.creativeId = bid.crid;
+        prebid.cpm = bid.price;
+        prebid.width = bid.w;
+        prebid.height = bid.h;
+        prebid.mediaType = 'banner';
+        prebid.meta = {
+          advertiserDomains: bid.adomain,
+          advertiserId: bid.adid,
+          mediaType: 'banner',
+          primaryCatId: bid.cat[0] || '',
+          secondaryCatIds: bid.cat
+        }
+        prebidResponse.push(prebid);
+      });
+    });
+  });
+  return prebidResponse;
+}
+
+registerBidder(spec);
diff --git a/modules/interactiveOffersBidAdapter.md b/modules/interactiveOffersBidAdapter.md
index 7eb440c8216..581b2e49a68 100644
--- a/modules/interactiveOffersBidAdapter.md
+++ b/modules/interactiveOffersBidAdapter.md
@@ -1,14 +1,14 @@
 # Overview
-
+ 
 ```
 Module Name: interactiveOffers Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: devteam@interactiveoffers.com
+Maintainer: dev@interactiveoffers.com
 ```
 
 # Description
 
-Module that connects to interactiveOffers demand sources. Param pubId is required.
+Module that connects to interactiveOffers demand sources. Param pubid is required.
 
 # Test Parameters
 ```
@@ -24,11 +24,11 @@ Module that connects to interactiveOffers demand sources. Param pubId is require
                    {
                        bidder: "interactiveOffers",
                        params: {
-                           pubId: '10',
-                           tmax: 5000
+                           pubid: 10,
+                           tmax: 250
                        }
                    }
                ]
            }
        ];
-```
\ No newline at end of file
+```
diff --git a/modules/invamiaBidAdapter.js b/modules/invamiaBidAdapter.js
new file mode 100644
index 00000000000..0cc63d34550
--- /dev/null
+++ b/modules/invamiaBidAdapter.js
@@ -0,0 +1,88 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'invamia';
+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) {
+    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;
+  },
+  /**
+   * 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,
+        width,
+        height,
+      };
+
+      bidResponses.push(bidResponse);
+    }
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/invamiaBidAdapter.md b/modules/invamiaBidAdapter.md
new file mode 100644
index 00000000000..c8e12808123
--- /dev/null
+++ b/modules/invamiaBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: Invamia Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@invamia.com
+```
+
+# Description
+
+Module that connects to Invamia demand sources.
+
+# Test Parameters
+
+```
+    const adUnits = [{
+      code: 'test-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]],
+        },
+      },
+      bids: [{
+        bidder: 'invamia',
+        params: {
+          zoneId: 379783,
+        },
+      }],
+    }];
+```
diff --git a/modules/invibesBidAdapter.js b/modules/invibesBidAdapter.js
index 220aed47e15..18011359a6d 100644
--- a/modules/invibesBidAdapter.js
+++ b/modules/invibesBidAdapter.js
@@ -1,6 +1,6 @@
 import * as utils from '../src/utils.js';
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getStorageManager} from '../src/storageManager.js';
 
 const CONSTANTS = {
   BIDDER_CODE: 'invibes',
@@ -8,9 +8,11 @@ const CONSTANTS = {
   SYNC_ENDPOINT: 'https://k.r66net.com/GetUserSync',
   TIME_TO_LIVE: 300,
   DEFAULT_CURRENCY: 'EUR',
-  PREBID_VERSION: 2,
+  PREBID_VERSION: 6,
   METHOD: 'GET',
-  INVIBES_VENDOR_ID: 436
+  INVIBES_VENDOR_ID: 436,
+  USERID_PROVIDERS: ['pubcid', 'pubProvidedId', 'uid2', 'zeotapIdPlus', 'id5id'],
+  META_TAXONOMY: ['networkId', 'networkName', 'agencyId', 'agencyName', 'advertiserId', 'advertiserName', 'advertiserDomains', 'brandId', 'brandName', 'primaryCatId', 'secondaryCatIds', 'mediaType']
 };
 
 const storage = getStorageManager(CONSTANTS.INVIBES_VENDOR_ID);
@@ -39,9 +41,7 @@ export const spec = {
   },
   getUserSyncs: function (syncOptions) {
     if (syncOptions.iframeEnabled) {
-      handlePostMessage();
       const syncUrl = buildSyncUrl();
-
       return {
         type: 'iframe',
         url: syncUrl
@@ -55,6 +55,8 @@ 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];
 let _customUserSync;
 
 function isBidRequestValid(bid) {
@@ -78,7 +80,7 @@ function isBidRequestValid(bid) {
 function buildRequest(bidRequests, bidderRequest) {
   bidderRequest = bidderRequest || {};
   const _placementIds = [];
-  let _loginId, _customEndpoint;
+  let _loginId, _customEndpoint, _userId;
   let _ivAuctionStart = bidderRequest.auctionStart || Date.now();
 
   bidRequests.forEach(function (bidRequest) {
@@ -87,44 +89,50 @@ function buildRequest(bidRequests, bidderRequest) {
     _loginId = _loginId || bidRequest.params.loginId;
     _customEndpoint = _customEndpoint || bidRequest.params.customEndpoint;
     _customUserSync = _customUserSync || bidRequest.params.customUserSync;
+    _userId = _userId || bidRequest.userId;
   });
 
-  invibes.visitId = invibes.visitId || generateRandomId();
+  invibes.optIn = invibes.optIn || readGdprConsent(bidderRequest.gdprConsent);
 
-  cookieDomain = detectTopmostCookieDomain();
+  invibes.visitId = invibes.visitId || generateRandomId();
   invibes.noCookies = invibes.noCookies || invibes.getCookie('ivNoCookie');
-  invibes.optIn = invibes.optIn || invibes.getCookie('ivOptIn') || readGdprConsent(bidderRequest.gdprConsent);
-
-  initDomainId(invibes.domainOptions);
+  let lid = initDomainId(invibes.domainOptions);
 
   const currentQueryStringParams = parseQueryStringParams();
-
+  let userIdModel = getUserIds(_userId);
+  let bidParamsJson = {
+    placementIds: _placementIds,
+    loginId: _loginId,
+    auctionStartTime: _ivAuctionStart,
+    bidVersion: CONSTANTS.PREBID_VERSION
+  };
+  if (userIdModel) {
+    bidParamsJson.userId = userIdModel;
+  }
   let data = {
     location: getDocumentLocation(topWin),
     videoAdHtmlId: generateRandomId(),
     showFallback: currentQueryStringParams['advs'] === '0',
     ivbsCampIdsLocal: invibes.getCookie('IvbsCampIdsLocal'),
 
-    bidParamsJson: JSON.stringify({
-      placementIds: _placementIds,
-      loginId: _loginId,
-      auctionStartTime: _ivAuctionStart,
-      bidVersion: CONSTANTS.PREBID_VERSION
-    }),
+    bidParamsJson: JSON.stringify(bidParamsJson),
     capCounts: getCappedCampaignsAsString(),
 
     vId: invibes.visitId,
     width: topWin.innerWidth,
     height: topWin.innerHeight,
 
-    noc: !cookieDomain,
     oi: invibes.optIn,
 
-    kw: keywords
+    kw: keywords,
+    purposes: invibes.purposes.toString(),
+    li: invibes.legitimateInterests.toString(),
+
+    tc: invibes.gdpr_consent
   };
 
-  if (invibes.dom.id) {
-    data.lId = invibes.dom.id;
+  if (lid) {
+    data.lId = lid;
   }
 
   const parametersToPassForward = 'videoaddebug,advs,bvci,bvid,istop,trybvid,trybvci'.split(',');
@@ -141,7 +149,7 @@ function buildRequest(bidRequests, bidderRequest) {
     method: CONSTANTS.METHOD,
     url: _customEndpoint || CONSTANTS.BID_ENDPOINT,
     data: data,
-    options: { withCredentials: true },
+    options: {withCredentials: true},
     // for POST: { contentType: 'application/json', withCredentials: true }
     bidRequests: bidRequests
   };
@@ -161,12 +169,6 @@ function handleResponse(responseObj, bidRequests) {
   responseObj = responseObj.body || responseObj;
   responseObj = responseObj.videoAdContentResult || responseObj;
 
-  let bidModel = responseObj.BidModel;
-  if (typeof bidModel !== 'object') {
-    utils.logInfo('Invibes Adapter - Bidding is not configured');
-    return [];
-  }
-
   if (typeof invibes.bidResponse === 'object') {
     utils.logInfo('Invibes Adapter - Bid response already received. Invibes only responds to one bid request per user visit');
     return [];
@@ -174,51 +176,83 @@ function handleResponse(responseObj, bidRequests) {
 
   invibes.bidResponse = responseObj;
 
-  let ads = responseObj.Ads;
+  const bidResponses = [];
+  for (let i = 0; i < bidRequests.length; i++) {
+    let bidRequest = bidRequests[i];
+
+    let requestPlacement = null;
+    if (responseObj.AdPlacements != null) {
+      for (let j = 0; j < responseObj.AdPlacements.length; j++) {
+        let bidModel = responseObj.AdPlacements[j].BidModel;
+        if (bidModel != null && bidModel.PlacementId == bidRequest.params.placementId) {
+          requestPlacement = responseObj.AdPlacements[j];
+          break;
+        }
+      }
+    } else {
+      let bidModel = responseObj.BidModel;
+      if (bidModel != null && bidModel.PlacementId == bidRequest.params.placementId) {
+        requestPlacement = responseObj;
+      }
+    }
+
+    let bid = createBid(bidRequest, requestPlacement);
+    if (bid !== null) {
+      bidResponses.push(bid);
+    }
+  }
+
+  return bidResponses;
+}
+
+function createBid(bidRequest, requestPlacement) {
+  if (requestPlacement === null || requestPlacement.BidModel === null) {
+    utils.logInfo('Invibes Adapter - Placement not configured for bidding ' + bidRequest.params.placementId);
+    return null;
+  }
 
+  let bidModel = requestPlacement.BidModel;
+  let ads = requestPlacement.Ads;
   if (!Array.isArray(ads) || ads.length < 1) {
-    if (responseObj.AdReason != null) {
-      utils.logInfo('Invibes Adapter - ' + responseObj.AdReason);
+    if (requestPlacement.AdReason != null) {
+      utils.logInfo('Invibes Adapter - No ads ' + requestPlacement.AdReason);
     }
 
     utils.logInfo('Invibes Adapter - No ads available');
-    return [];
+    return null;
   }
 
   let ad = ads[0];
+  let size = getBiggerSize(bidRequest.sizes);
 
-  if (bidModel.PlacementId == null) {
-    utils.logInfo('Invibes Adapter - No Placement Id in response');
-    return [];
-  }
-
-  const bidResponses = [];
-  for (let i = 0; i < bidRequests.length; i++) {
-    let bidRequest = bidRequests[i];
+  const now = Date.now();
+  utils.logInfo('Bid auction started at ' + bidModel.AuctionStartTime + ' . Invibes registered the bid at ' + now + ' ; bid request took a total of ' + (now - bidModel.AuctionStartTime) + ' ms.');
 
-    if (bidModel.PlacementId == bidRequest.params.placementId) {
-      let size = getBiggerSize(bidRequest.sizes);
-
-      bidResponses.push({
-        requestId: bidRequest.bidId,
-        cpm: ad.BidPrice,
-        width: bidModel.Width || size[0],
-        height: bidModel.Height || size[1],
-        creativeId: ad.VideoExposedId,
-        currency: bidModel.Currency || CONSTANTS.DEFAULT_CURRENCY,
-        netRevenue: true,
-        ttl: CONSTANTS.TIME_TO_LIVE,
-        ad: renderCreative(bidModel)
-      });
+  return {
+    requestId: bidRequest.bidId,
+    cpm: ad.BidPrice,
+    width: bidModel.Width || size[0],
+    height: bidModel.Height || size[1],
+    creativeId: ad.VideoExposedId,
+    currency: bidModel.Currency || CONSTANTS.DEFAULT_CURRENCY,
+    netRevenue: true,
+    ttl: CONSTANTS.TIME_TO_LIVE,
+    ad: renderCreative(bidModel),
+    meta: addMeta(bidModel.Meta)
+  };
+}
 
-      const now = Date.now();
-      ivLogger.info('Bid auction started at ' + bidModel.AuctionStartTime + ' . Invibes registered the bid at ' + now + ' ; bid request took a total of ' + (now - bidModel.AuctionStartTime) + ' ms.');
-    } else {
-      utils.logInfo('Invibes Adapter - Incorrect Placement Id: ' + bidRequest.params.placementId);
+function addMeta(bidModelMeta) {
+  var meta = {};
+  if (bidModelMeta != null) {
+    for (let i = 0; i < CONSTANTS.META_TAXONOMY.length; i++) {
+      if (bidModelMeta.hasOwnProperty(CONSTANTS.META_TAXONOMY[i])) {
+        meta[CONSTANTS.META_TAXONOMY[i]] = bidModelMeta[CONSTANTS.META_TAXONOMY[i]];
+      }
     }
   }
 
-  return bidResponses;
+  return meta;
 }
 
 function generateRandomId() {
@@ -229,9 +263,26 @@ function getDocumentLocation(topWin) {
   return topWin.location.href.substring(0, 300).split(/[?#]/)[0];
 }
 
+function getUserIds(bidUserId) {
+  let userId;
+  if (bidUserId) {
+    CONSTANTS.USERID_PROVIDERS.forEach(provider => {
+      if (bidUserId[provider]) {
+        userId = userId || {};
+        userId[provider] = bidUserId[provider];
+      }
+    });
+  }
+
+  return userId;
+}
+
 function parseQueryStringParams() {
   let params = {};
-  try { params = JSON.parse(localStorage.ivbs); } catch (e) { }
+  try {
+    params = JSON.parse(localStorage.ivbs);
+  } catch (e) {
+  }
   let re = /[\\?&]([^=]+)=([^\\?&#]+)/g;
   let m;
   while ((m = re.exec(window.location.href)) != null) {
@@ -258,9 +309,12 @@ function getTopMostWindow() {
 
   try {
     while (top !== res) {
-      if (res.parent.location.href.length) { res = res.parent; }
+      if (res.parent.location.href.length) {
+        res = res.parent;
+      }
     }
-  } catch (e) { }
+  } catch (e) {
+  }
 
   return res;
 }
@@ -278,6 +332,10 @@ function renderCreative(bidModel) {
 function getCappedCampaignsAsString() {
   const key = 'ivvcap';
 
+  if (!invibes.optIn || !invibes.purposes[0]) {
+    return '';
+  }
+
   let loadData = function () {
     try {
       return JSON.parse(storage.getDataFromLocalStorage(key)) || {};
@@ -310,26 +368,22 @@ function getCappedCampaignsAsString() {
     clearExpired();
     let data = loadData();
     return Object.keys(data)
-      .filter(function (k) { return data.hasOwnProperty(k); })
+      .filter(function (k) {
+        return data.hasOwnProperty(k);
+      })
       .sort()
-      .map(function (k) { return [k, data[k][0]]; });
+      .map(function (k) {
+        return [k, data[k][0]];
+      });
   };
 
   return getCappedCampaigns()
-    .map(function (record) { return record.join('='); })
+    .map(function (record) {
+      return record.join('=');
+    })
     .join(',');
 }
 
-const noop = function () { };
-
-function initLogger() {
-  if (storage.hasLocalStorage() && localStorage.InvibesDEBUG) {
-    return window.console;
-  }
-
-  return { info: noop, error: noop, log: noop, warn: noop, debug: noop };
-}
-
 function buildSyncUrl() {
   let syncUrl = _customUserSync || CONSTANTS.SYNC_ENDPOINT;
   syncUrl += '?visitId=' + invibes.visitId;
@@ -348,49 +402,46 @@ function buildSyncUrl() {
   return syncUrl;
 }
 
-function handlePostMessage() {
-  try {
-    if (window.addEventListener) {
-      window.addEventListener('message', acceptPostMessage);
-    }
-  } catch (e) { }
-}
-
-function acceptPostMessage(e) {
-  let msg = e.data || {};
-  if (msg.ivbscd === 1) {
-    invibes.setCookie(msg.name, msg.value, msg.exdays, msg.domain);
-  } else if (msg.ivbscd === 2) {
-    invibes.dom.graduate();
-  }
-}
-
 function readGdprConsent(gdprConsent) {
   if (gdprConsent && gdprConsent.vendorData) {
+    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;
+      }
       return 2;
     }
 
     let purposeConsents = getPurposeConsents(gdprConsent.vendorData);
 
-    if (purposeConsents == null) { return 0; }
-    let properties = Object.keys(purposeConsents);
-    let purposeConsentsCounter = getPurposeConsentsCounter(gdprConsent.vendorData);
-
-    if (properties.length < purposeConsentsCounter) {
+    if (purposeConsents == null) {
       return 0;
     }
+    let purposesLength = getPurposeConsentsCounter(gdprConsent.vendorData);
 
-    for (let i = 0; i < purposeConsentsCounter; i++) {
-      if (!purposeConsents[properties[i]] || purposeConsents[properties[i]] === 'false') { return 0; }
+    if (!tryCopyValueToArray(purposeConsents, invibes.purposes, purposesLength)) {
+      return 0;
     }
 
+    let legitimateInterests = getLegitimateInterests(gdprConsent.vendorData);
+    tryCopyValueToArray(legitimateInterests, invibes.legitimateInterests, 10);
+
+    let invibesVendorId = CONSTANTS.INVIBES_VENDOR_ID.toString(10);
     let vendorConsents = getVendorConsents(gdprConsent.vendorData);
-    if (vendorConsents == null || vendorConsents[CONSTANTS.INVIBES_VENDOR_ID.toString(10)] == null) {
+    let vendorHasLegitimateInterest = getVendorLegitimateInterest(gdprConsent.vendorData)[invibesVendorId] === true;
+    if (vendorConsents == null || vendorConsents[invibesVendorId] == null) {
       return 4;
     }
 
-    if (vendorConsents[CONSTANTS.INVIBES_VENDOR_ID.toString(10)] === false) { return 0; }
+    if (vendorConsents[invibesVendorId] === false && vendorHasLegitimateInterest === false) {
+      return 0;
+    }
 
     return 2;
   }
@@ -398,6 +449,37 @@ function readGdprConsent(gdprConsent) {
   return 0;
 }
 
+function tryCopyValueToArray(value, target, length) {
+  if (value instanceof Array) {
+    for (let i = 0; i < length && i < value.length; i++) {
+      target[i] = !((value[i] === false || value[i] === 'false' || value[i] == null));
+    }
+    return true;
+  }
+  if (typeof value === 'object' && value !== null) {
+    let i = 0;
+    for (let prop in value) {
+      if (i === length) {
+        break;
+      }
+
+      if (value.hasOwnProperty(prop)) {
+        let parsedProp = parseInt(prop);
+        if (isNaN(parsedProp)) {
+          target[i] = !((value[prop] === false || value[prop] === 'false' || value[prop] == null));
+        } else {
+          target[parsedProp - 1] = !((value[prop] === false || value[prop] === 'false' || value[prop] == null));
+        }
+
+        i++;
+      }
+    }
+    return true;
+  }
+
+  return false;
+}
+
 function getPurposeConsentsCounter(vendorData) {
   if (vendorData.purpose && vendorData.purpose.consents) {
     return 10;
@@ -418,6 +500,23 @@ function getPurposeConsents(vendorData) {
   return null;
 }
 
+function getLegitimateInterests(vendorData) {
+  if (vendorData.purpose && vendorData.purpose.legitimateInterests) {
+    return vendorData.purpose.legitimateInterests;
+  }
+
+  return null;
+}
+
+function getVendorConsentData(vendorData) {
+  if (vendorData.purpose && vendorData.purpose.consents) {
+    if (vendorData.tcString != null) {
+      return vendorData.tcString;
+    }
+  }
+  return vendorData.consentData;
+};
+
 function getVendorConsents(vendorData) {
   if (vendorData.vendor && vendorData.vendor.consents) {
     return vendorData.vendor.consents;
@@ -430,144 +529,58 @@ function getVendorConsents(vendorData) {
   return null;
 }
 
-const ivLogger = initLogger();
+function getVendorLegitimateInterest(vendorData) {
+  if (vendorData.vendor && vendorData.vendor.legitimateInterests) {
+    return vendorData.vendor.legitimateInterests;
+  }
+
+  return {};
+}
 
 /// Local domain cookie management =====================
 invibes.Uid = {
   generate: function () {
     let maxRand = parseInt('zzzzzz', 36)
-    let mkRand = function () { return Math.floor(Math.random() * maxRand).toString(36); };
+    let mkRand = function () {
+      return Math.floor(Math.random() * maxRand).toString(36);
+    };
     let rand1 = mkRand();
     let rand2 = mkRand();
     return rand1 + rand2;
   }
 };
 
-let cookieDomain;
 invibes.getCookie = function (name) {
-  if (!storage.cookiesAreEnabled()) { return; }
-  let i, x, y;
-  let cookies = document.cookie.split(';');
-  for (i = 0; i < cookies.length; i++) {
-    x = cookies[i].substr(0, cookies[i].indexOf('='));
-    y = cookies[i].substr(cookies[i].indexOf('=') + 1);
-    x = x.replace(/^\s+|\s+$/g, '');
-    if (x === name) {
-      return unescape(y);
-    }
+  if (!storage.cookiesAreEnabled()) {
+    return;
   }
-};
-
-invibes.setCookie = function (name, value, exdays, domain) {
-  if (!storage.cookiesAreEnabled()) { return; }
-  let whiteListed = name == 'ivNoCookie' || name == 'IvbsCampIdsLocal';
-  if (invibes.noCookies && !whiteListed && (exdays || 0) >= 0) { return; }
-  if (exdays > 365) { exdays = 365; }
-  domain = domain || cookieDomain;
-  let exdate = new Date();
-  let exms = exdays * 24 * 60 * 60 * 1000;
-  exdate.setTime(exdate.getTime() + exms);
-  storage.setCookie(name, value, exdate.toUTCString(), undefined, domain);
-};
 
-let detectTopmostCookieDomain = function () {
-  let testCookie = invibes.Uid.generate();
-  let hostParts = location.hostname.split('.');
-  if (hostParts.length === 1) {
-    return location.hostname;
-  }
-  for (let i = hostParts.length - 1; i >= 0; i--) {
-    let domain = '.' + hostParts.slice(i).join('.');
-    invibes.setCookie(testCookie, testCookie, 1, domain);
-    let val = invibes.getCookie(testCookie);
-    if (val === testCookie) {
-      invibes.setCookie(testCookie, testCookie, -1, domain);
-      return domain;
-    }
+  if (!invibes.optIn || !invibes.purposes[0]) {
+    return;
   }
+
+  return storage.getCookie(name);
 };
 
 let initDomainId = function (options) {
-  if (invibes.dom) { return; }
-
-  options = options || {};
-
   let cookiePersistence = {
     cname: 'ivbsdid',
     load: function () {
       let str = invibes.getCookie(this.cname) || '';
       try {
         return JSON.parse(str);
-      } catch (e) { }
-    },
-    save: function (obj) {
-      invibes.setCookie(this.cname, JSON.stringify(obj), 365);
-    }
-  };
-
-  let persistence = options.persistence || cookiePersistence;
-  let state;
-  let minHC = 2;
-
-  let validGradTime = function (state) {
-    if (!state.cr) { return false; }
-    let min = 151 * 10e9;
-    if (state.cr < min) {
-      return false;
+      } catch (e) {
+      }
     }
-    let now = new Date().getTime();
-    let age = now - state.cr;
-    let minAge = 24 * 60 * 60 * 1000;
-    return age > minAge;
-  };
-
-  state = persistence.load() || {
-    id: invibes.Uid.generate(),
-    cr: new Date().getTime(),
-    hc: 1,
   };
 
-  if (state.id.match(/\./)) {
-    state.id = invibes.Uid.generate();
-  }
-
-  let graduate = function () {
-    if (!state.cr) { return; }
-    delete state.cr;
-    delete state.hc;
-    persistence.save(state);
-    setId();
-  };
+  options = options || {};
 
-  let regenerateId = function () {
-    state.id = invibes.Uid.generate();
-    persistence.save(state);
-  };
+  var persistence = options.persistence || cookiePersistence;
 
-  let setId = function () {
-    invibes.dom = {
-      get id() {
-        return (!state.cr && invibes.optIn > 0) ? state.id : undefined;
-      },
-      get tempId() {
-        return (invibes.optIn > 0) ? state.id : undefined;
-      },
-      graduate: graduate,
-      regen: regenerateId
-    };
-  };
+  let state = persistence.load();
 
-  if (state.cr && !options.noVisit) {
-    if (state.hc < minHC) {
-      state.hc++;
-    }
-    if ((state.hc >= minHC && validGradTime(state)) || options.skipGraduation) {
-      graduate();
-    }
-  }
-  persistence.save(state);
-  setId();
-  ivLogger.info('Did=' + invibes.dom.id);
+  return state ? (state.id || state.tempId) : undefined;
 };
 
 let keywords = (function () {
@@ -638,6 +651,7 @@ let keywords = (function () {
   }
   return kw;
 }());
+
 // =====================
 
 export function resetInvibes() {
diff --git a/modules/ipromBidAdapter.js b/modules/ipromBidAdapter.js
new file mode 100644
index 00000000000..fed8ca2ebb0
--- /dev/null
+++ b/modules/ipromBidAdapter.js
@@ -0,0 +1,79 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'iprom';
+const ENDPOINT_URL = 'https://core.iprom.net/programmatic';
+const VERSION = 'v1.0.1';
+const DEFAULT_CURRENCY = 'EUR';
+const DEFAULT_NETREVENUE = true;
+const DEFAULT_TTL = 360;
+
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function ({ bidder, params = {} } = {}) {
+    // id parameter checks
+    if (!params.id) {
+      utils.logError(`${bidder}: Parameter 'id' missing`);
+      return false;
+    } else if (typeof params.id !== 'string') {
+      utils.logError(`${bidder}: Parameter 'id' needs to be a string`);
+      return false;
+    }
+    // dimension parameter checks
+    if (!params.dimension) {
+      utils.logError(`${bidder}: Required parameter 'dimension' missing`);
+      return false;
+    } else if (typeof params.dimension !== 'string') {
+      utils.logError(`${bidder}: Parameter 'dimension' needs to be a string`);
+      return false;
+    }
+
+    return true;
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const payload = {
+      bids: validBidRequests,
+      referer: bidderRequest.refererInfo,
+      version: VERSION
+    };
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payloadString
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    let bids = serverResponse.body;
+
+    const bidResponses = [];
+
+    bids.forEach(bid => {
+      const b = {
+        ad: bid.ad,
+        requestId: bid.requestId,
+        cpm: bid.cpm,
+        width: bid.width,
+        height: bid.height,
+        creativeId: bid.creativeId,
+        currency: bid.currency || DEFAULT_CURRENCY,
+        netRevenue: bid.netRevenue || DEFAULT_NETREVENUE,
+        ttl: bid.ttl || DEFAULT_TTL,
+        meta: {},
+      };
+
+      if (bid.aDomains && bid.aDomains.length) {
+        b.meta.advertiserDomains = bid.aDomains;
+      }
+
+      bidResponses.push(b);
+    });
+
+    return bidResponses;
+  },
+}
+
+registerBidder(spec);
diff --git a/modules/ipromBidAdapter.md b/modules/ipromBidAdapter.md
new file mode 100644
index 00000000000..f7124e7c89c
--- /dev/null
+++ b/modules/ipromBidAdapter.md
@@ -0,0 +1,34 @@
+# Overview
+
+```
+Module Name: Iprom PreBid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@iprom.si
+```
+
+# Description
+
+Module that connects to Iprom's demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "iprom",
+                    params: {
+                        id: '1234',
+                        dimension: '300x250'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/ironsourceBidAdapter.js b/modules/ironsourceBidAdapter.js
new file mode 100644
index 00000000000..5b8531d7a85
--- /dev/null
+++ b/modules/ironsourceBidAdapter.js
@@ -0,0 +1,251 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import {VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [VIDEO];
+const BIDDER_CODE = 'ironsource';
+const BIDDER_VERSION = '4.0.0';
+const TTL = 360;
+const SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const MODES = {
+  PRODUCTION: 'hb',
+  TEST: 'hb-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function(bidRequest) {
+    return !!(bidRequest.params.isOrg);
+  },
+  buildRequests: function (bidRequests, bidderRequest) {
+    if (bidRequests.length === 0) {
+      return [];
+    }
+
+    const requests = [];
+
+    bidRequests.forEach(bid => {
+      requests.push(buildVideoRequest(bid, bidderRequest));
+    });
+
+    return requests;
+  },
+  interpretResponse: function({body}) {
+    const bidResponses = [];
+
+    const bidResponse = {
+      requestId: body.requestId,
+      cpm: body.cpm,
+      width: body.width,
+      height: body.height,
+      creativeId: body.requestId,
+      currency: body.currency,
+      netRevenue: body.netRevenue,
+      ttl: body.ttl || TTL,
+      vastXml: body.vastXml,
+      mediaType: VIDEO
+    };
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && utils.isArray(response.body.userSyncPixels)) {
+        const pixels = response.body.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Build the video request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function buildVideoRequest(bid, bidderRequest) {
+  const sellerParams = generateParameters(bid, bidderRequest);
+  const {params} = bid;
+  return {
+    method: 'GET',
+    url: getEndpoint(params.testMode),
+    data: sellerParams
+  };
+}
+
+/**
+ * Get the the ad size from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizes(bid) {
+  if (utils.deepAccess(bid, 'mediaTypes.video.sizes')) {
+    return bid.mediaTypes.video.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    return bid.sizes[0];
+  }
+  return [];
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (utils.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;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !utils.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 = utils.isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && utils.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;
+}
+
+/**
+ * Generate query parameters for the request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function generateParameters(bid, bidderRequest) {
+  const timeout = config.getConfig('bidderTimeout');
+  const { syncEnabled, filterSettings } = config.getConfig('userSync');
+  const [ width, height ] = getSizes(bid);
+  const { params } = bid;
+  const { bidderCode } = bidderRequest;
+  const domain = window.location.hostname;
+
+  const requestParams = {
+    auction_start: utils.timestamp(),
+    ad_unit_code: utils.getBidIdParameter('adUnitCode', bid),
+    tmax: timeout,
+    width: width,
+    height: height,
+    publisher_id: params.isOrg,
+    floor_price: params.floorPrice,
+    ua: navigator.userAgent,
+    bid_id: utils.getBidIdParameter('bidId', bid),
+    bidder_request_id: utils.getBidIdParameter('bidderRequestId', bid),
+    transaction_id: utils.getBidIdParameter('transactionId', bid),
+    session_id: params.sessionId || utils.getBidIdParameter('auctionId', bid),
+    is_wrapper: !!params.isWrapper,
+    publisher_name: domain,
+    site_domain: domain,
+    bidder_version: BIDDER_VERSION
+  };
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      requestParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    requestParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    requestParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    requestParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (params.ifa) {
+    requestParams.ifa = params.ifa;
+  }
+
+  if (bid.schain) {
+    requestParams.schain = getSupplyChain(bid.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    requestParams.referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+    requestParams.page_url = config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
+  }
+
+  return requestParams;
+}
diff --git a/modules/ironsourceBidAdapter.md b/modules/ironsourceBidAdapter.md
new file mode 100644
index 00000000000..86756b08809
--- /dev/null
+++ b/modules/ironsourceBidAdapter.md
@@ -0,0 +1,51 @@
+#Overview
+
+Module Name: IronSource Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: prebid-digital-brands@ironsrc.com
+
+
+# Description
+
+Module that connects to IronSource's demand sources.
+
+The IronSource adapter requires setup and approval from the IronSource. Please reach out to prebid-digital-brands@ironsrc.com to create an IronSource account.
+
+The adapter supports Video(instream). For the integration, IronSource returns content as vastXML and requires the publisher to define the cache url in config passed to Prebid for it to be valid in the auction.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `isOrg` | required | String |  IronSource publisher Id provided by your IronSource representative  | "56f91cd4d3e3660002000033"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `ifa` | optional | String |  The ID for advertisers (also referred to as "IDFA")  | "XXX-XXX"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+
+# Test Parameters
+```javascript
+var adUnits = [
+       {
+        code: 'dfp-video-div',
+        sizes: [[640, 480]],
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+          }
+        },
+        bids: [{
+          bidder: 'ironsource',
+          params: {
+            isOrg: '56f91cd4d3e3660002000033', // Required
+            floorPrice: 2.00, // Optional
+            ifa: 'XXX-XXX', // Optional
+            testMode: false // Optional
+          }
+        }]
+      }
+   ];
+```
diff --git a/modules/ixBidAdapter.js b/modules/ixBidAdapter.js
index 0d69d611a03..0e55b785468 100644
--- a/modules/ixBidAdapter.js
+++ b/modules/ixBidAdapter.js
@@ -2,11 +2,12 @@ import * as utils from '../src/utils.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 import find from 'core-js-pure/features/array/find.js';
-import isInteger from 'core-js-pure/features/number/is-integer.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 
 const BIDDER_CODE = 'ix';
-const SECURE_BID_URL = 'https://as-sec.casalemedia.com/cygnus';
+const ALIAS_BIDDER_CODE = 'roundel';
+const GLOBAL_VENDOR_ID = 10;
+const SECURE_BID_URL = 'https://htlb.casalemedia.com/cygnus';
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
 const BANNER_ENDPOINT_VERSION = 7.2;
 const VIDEO_ENDPOINT_VERSION = 8.1;
@@ -14,25 +15,75 @@ const CENT_TO_DOLLAR_FACTOR = 100;
 const BANNER_TIME_TO_LIVE = 300;
 const VIDEO_TIME_TO_LIVE = 3600; // 1hr
 const NET_REVENUE = true;
+
 const PRICE_TO_DOLLAR_FACTOR = {
   JPY: 1
 };
 const USER_SYNC_URL = 'https://js-sec.indexww.com/um/ixmatch.html';
 
+const FLOOR_SOURCE = { PBJS: 'p', IX: 'x' };
+// determines which eids we send and the rtiPartner field in ext
+const SOURCE_RTI_MAPPING = {
+  'liveramp.com': 'idl',
+  'netid.de': 'NETID',
+  'neustar.biz': 'fabrickId',
+  'zeotap.com': 'zeotapIdPlus',
+  'uidapi.com': 'UID2',
+  'adserver.org': 'TDID'
+};
+
+const PROVIDERS = [
+  'britepoolid',
+  'id5id',
+  'lipbid',
+  'haloId',
+  'criteoId',
+  'lotamePanoramaId',
+  'merkleId',
+  'parrableId',
+  'connectid',
+  'sharedid',
+  'tapadId',
+  'quantcastId',
+  'pubcid',
+  'TDID',
+  'flocId'
+]
+
+const REQUIRED_VIDEO_PARAMS = ['mimes', 'minduration', 'maxduration']; // note: protocol/protocols is also reqd
+
+const VIDEO_PARAMS_ALLOW_LIST = [
+  'mimes', 'minduration', 'maxduration', 'protocols', 'protocol',
+  'startdelay', 'placement', 'linearity', 'skip', 'skipmin',
+  'skipafter', 'sequence', 'battr', 'maxextended', 'minbitrate',
+  'maxbitrate', 'boxingallowed', 'playbackmethod', 'playbackend',
+  'delivery', 'pos', 'companionad', 'api', 'companiontype', 'ext',
+  'playerSize', 'w', 'h'
+];
+
 /**
  * Transform valid bid request config object to banner impression object that will be sent to ad server.
  *
- * @param  {object} bid A valid bid request config object.
+ * @param  {object} bid A valid bid request config object
  * @return {object}     A impression object that will be sent to ad server.
  */
 function bidToBannerImp(bid) {
   const imp = bidToImp(bid);
-
   imp.banner = {};
-  imp.banner.w = bid.params.size[0];
-  imp.banner.h = bid.params.size[1];
+  const impSize = utils.deepAccess(bid, 'params.size');
+  if (impSize) {
+    imp.banner.w = impSize[0];
+    imp.banner.h = impSize[1];
+    // populate sid with size if not id
+    if (!(utils.deepAccess(imp, 'ext.sid'))) {
+      imp.ext.sid = `${impSize[0]}x${impSize[1]}`;
+    }
+  }
+
   imp.banner.topframe = utils.inIframe() ? 0 : 1;
 
+  _applyFloor(bid, imp, BANNER);
+
   return imp;
 }
 
@@ -44,25 +95,64 @@ function bidToBannerImp(bid) {
  */
 function bidToVideoImp(bid) {
   const imp = bidToImp(bid);
+  const videoAdUnitRef = utils.deepAccess(bid, 'mediaTypes.video');
+  const videoParamRef = utils.deepAccess(bid, 'params.video');
 
-  imp.video = utils.deepClone(bid.params.video)
-  imp.video.w = bid.params.size[0];
-  imp.video.h = bid.params.size[1];
+  if (!checkVideoParams(bid, videoAdUnitRef, videoParamRef)) {
+    return {};
+  }
+
+  imp.video = videoParamRef ? utils.deepClone(bid.params.video) : {};
+
+  for (const adUnitProperty in videoAdUnitRef) {
+    if (VIDEO_PARAMS_ALLOW_LIST.indexOf(adUnitProperty) !== -1 && !imp.video.hasOwnProperty(adUnitProperty)) {
+      imp.video[adUnitProperty] = videoAdUnitRef[adUnitProperty];
+    }
+  }
+
+  if (imp.video.minduration > imp.video.maxduration) {
+    utils.logError('IX Bid Adapter: video minduration [' + imp.video.minduration +
+    '] cannot be greater than video maxduration [' + imp.video.maxduration + ']');
+    return {};
+  }
+
+  const context = (videoParamRef && videoParamRef.context) || (videoAdUnitRef && videoAdUnitRef.context);
 
-  const context = utils.deepAccess(bid, 'mediaTypes.video.context');
   if (context) {
     if (context === 'instream') {
       imp.video.placement = 1;
     } else if (context === 'outstream') {
       imp.video.placement = 4;
     } else {
-      utils.logWarn(`ix bidder params: video context '${context}' is not supported`);
+      utils.logWarn(`IX Bid Adapter: video context '${context}' is not supported`);
     }
   }
 
+  if (!(imp.video.w && imp.video.h)) {
+    // Getting impression Size
+    const impSize = getFirstSize(utils.deepAccess(imp, 'video.playerSize')) || getFirstSize(utils.deepAccess(bid, 'params.size'));
+    if (impSize) {
+      imp.video.w = impSize[0];
+      imp.video.h = impSize[1];
+      if (!(utils.deepAccess(imp, 'ext.sid'))) {
+        imp.ext.sid = `${impSize[0]}x${impSize[1]}`;
+      }
+    } else {
+      utils.logWarn('IX Bid Adapter: Video size is missing in [mediaTypes.video] missing');
+      return {};
+    }
+  }
+
+  _applyFloor(bid, imp, VIDEO);
+
   return imp;
 }
 
+/**
+ * Converts an incoming PBJS bid to an IX Impression
+ * @param {object} bid   PBJS bid object
+ * @returns {object}     IX impression object
+ */
 function bidToImp(bid) {
   const imp = {};
 
@@ -74,18 +164,81 @@ function bidToImp(bid) {
   if (bid.params.hasOwnProperty('id') &&
     (typeof bid.params.id === 'string' || typeof bid.params.id === 'number')) {
     imp.ext.sid = String(bid.params.id);
-  } else {
-    imp.ext.sid = `${bid.params.size[0]}x${bid.params.size[1]}`;
   }
 
-  if (bid.params.hasOwnProperty('bidFloor') && bid.params.hasOwnProperty('bidFloorCur')) {
-    imp.bidfloor = bid.params.bidFloor;
-    imp.bidfloorcur = bid.params.bidFloorCur;
+  const dfpAdUnitCode = utils.deepAccess(bid, 'ortb2Imp.ext.data.adserver.adslot');
+  if (dfpAdUnitCode) {
+    imp.ext.dfp_ad_unit_code = dfpAdUnitCode;
   }
-
   return imp;
 }
 
+/**
+ * Gets priceFloors floors and IX adapter floors,
+ * Validates and sets the higher one on the impression
+ * @param  {object}    bid bid object
+ * @param  {object}    imp impression object
+ * @param  {string}    mediaType the impression ad type, one of the SUPPORTED_AD_TYPES
+ */
+function _applyFloor(bid, imp, mediaType) {
+  let adapterFloor = null;
+  let moduleFloor = null;
+
+  if (bid.params.bidFloor && bid.params.bidFloorCur) {
+    adapterFloor = { floor: bid.params.bidFloor, currency: bid.params.bidFloorCur };
+  }
+
+  if (utils.isFn(bid.getFloor)) {
+    let _mediaType = '*';
+    let _size = '*';
+
+    if (mediaType && utils.contains(SUPPORTED_AD_TYPES, mediaType)) {
+      const { w: width, h: height } = imp[mediaType];
+      _mediaType = mediaType;
+      _size = [width, height];
+    }
+    try {
+      moduleFloor = bid.getFloor({
+        mediaType: _mediaType,
+        size: _size
+      });
+    } catch (err) {
+      // continue with no module floors
+      utils.logWarn('priceFloors module call getFloor failed, error : ', err);
+    }
+  }
+
+  if (adapterFloor && moduleFloor) {
+    if (adapterFloor.currency !== moduleFloor.currency) {
+      utils.logWarn('The bid floor currency mismatch between IX params and priceFloors module config');
+      return;
+    }
+
+    if (adapterFloor.floor > moduleFloor.floor) {
+      imp.bidfloor = adapterFloor.floor;
+      imp.bidfloorcur = adapterFloor.currency;
+      imp.ext.fl = FLOOR_SOURCE.IX;
+    } else {
+      imp.bidfloor = moduleFloor.floor;
+      imp.bidfloorcur = moduleFloor.currency;
+      imp.ext.fl = FLOOR_SOURCE.PBJS;
+    }
+    return;
+  }
+
+  if (moduleFloor) {
+    imp.bidfloor = moduleFloor.floor;
+    imp.bidfloorcur = moduleFloor.currency;
+    imp.ext.fl = FLOOR_SOURCE.PBJS;
+  } else if (adapterFloor) {
+    imp.bidfloor = adapterFloor.floor;
+    imp.bidfloorcur = adapterFloor.currency;
+    imp.ext.fl = FLOOR_SOURCE.IX;
+  } else {
+    utils.logInfo('IX Bid Adapter: No floors available, no floors applied');
+  }
+}
+
 /**
  * Parses a raw bid for the relevant information.
  *
@@ -95,6 +248,8 @@ function bidToImp(bid) {
  */
 function parseBid(rawBid, currency, bidRequest) {
   const bid = {};
+  const isValidExpiry = !!((utils.deepAccess(rawBid, 'exp') && utils.isInteger(rawBid.exp)));
+  const dealID = utils.deepAccess(rawBid, 'dealid') || utils.deepAccess(rawBid, 'ext.dealid');
 
   if (PRICE_TO_DOLLAR_FACTOR.hasOwnProperty(currency)) {
     bid.cpm = rawBid.price / PRICE_TO_DOLLAR_FACTOR[currency];
@@ -104,7 +259,10 @@ function parseBid(rawBid, currency, bidRequest) {
 
   bid.requestId = rawBid.impid;
 
-  bid.dealId = utils.deepAccess(rawBid, 'ext.dealid');
+  if (dealID) {
+    bid.dealId = dealID;
+  }
+
   bid.netRevenue = NET_REVENUE;
   bid.currency = currency;
   bid.creativeId = rawBid.hasOwnProperty('crid') ? rawBid.crid : '-';
@@ -115,19 +273,22 @@ function parseBid(rawBid, currency, bidRequest) {
     bid.width = bidRequest.video.w;
     bid.height = bidRequest.video.h;
     bid.mediaType = VIDEO;
-    bid.ttl = VIDEO_TIME_TO_LIVE;
+    bid.ttl = isValidExpiry ? rawBid.exp : VIDEO_TIME_TO_LIVE;
   } else {
     bid.ad = rawBid.adm;
     bid.width = rawBid.w;
     bid.height = rawBid.h;
     bid.mediaType = BANNER;
-    bid.ttl = BANNER_TIME_TO_LIVE;
+    bid.ttl = isValidExpiry ? rawBid.exp : BANNER_TIME_TO_LIVE;
   }
 
   bid.meta = {};
   bid.meta.networkId = utils.deepAccess(rawBid, 'ext.dspid');
   bid.meta.brandId = utils.deepAccess(rawBid, 'ext.advbrandid');
   bid.meta.brandName = utils.deepAccess(rawBid, 'ext.advbrand');
+  if (rawBid.adomain && rawBid.adomain.length > 0) {
+    bid.meta.advertiserDomains = rawBid.adomain;
+  }
 
   return bid;
 }
@@ -139,7 +300,7 @@ function parseBid(rawBid, currency, bidRequest) {
  * @return {boolean}      True if this is a valid size format, and false otherwise.
  */
 function isValidSize(size) {
-  return Array.isArray(size) && size.length === 2 && isInteger(size[0]) && isInteger(size[1]);
+  return Array.isArray(size) && size.length === 2 && utils.isInteger(size[0]) && utils.isInteger(size[1]);
 }
 
 /**
@@ -151,16 +312,68 @@ function isValidSize(size) {
  * @return {boolean}          True if the size object is an element of the size array, and false
  *                            otherwise.
  */
-function includesSize(sizeArray, size) {
+function includesSize(sizeArray = [], size) {
   if (isValidSize(sizeArray)) {
     return sizeArray[0] === size[0] && sizeArray[1] === size[1];
   }
-
   for (let i = 0; i < sizeArray.length; i++) {
     if (sizeArray[i][0] === size[0] && sizeArray[i][1] === size[1]) {
       return true;
     }
   }
+  return false;
+}
+
+/**
+ * Checks if all required video params are present
+ * @param {object} bid               Bid Object
+ * @param {object} mediaTypeVideoRef Ad unit level mediaTypes object
+ * @param {object} paramsVideoRef    IX bidder params level video object
+ * @returns bool                     Are the required video params available
+ */
+function checkVideoParams(bid, mediaTypeVideoRef, paramsVideoRef) {
+  let reqParamsPresent = true;
+
+  if (!mediaTypeVideoRef) {
+    utils.logWarn('IX Bid Adapter: mediaTypes.video is the preferred location for video params in ad unit');
+  }
+
+  for (let property of REQUIRED_VIDEO_PARAMS) {
+    const propInMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty(property);
+    const propInVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty(property);
+
+    if (!propInMediaType && !propInVideoRef) {
+      utils.logError('IX Bid Adapter: ' + property + ' is not included in either the adunit or params level');
+      reqParamsPresent = false;
+    }
+  }
+
+  // early return
+  if (!reqParamsPresent) {
+    return false;
+  }
+
+  // check protocols/protocol
+  const protocolMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty('protocol');
+  const protocolsMediaType = mediaTypeVideoRef && mediaTypeVideoRef.hasOwnProperty('protocols');
+  const protocolVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty('protocol');
+  const protocolsVideoRef = paramsVideoRef && paramsVideoRef.hasOwnProperty('protocols');
+
+  return protocolMediaType || protocolsMediaType || protocolVideoRef || protocolsVideoRef;
+}
+
+/**
+ * Get One size from Size Array
+ * [[250,350]] -> [250, 350]
+ * [250, 350]  -> [250, 350]
+ * @param {array} sizes array of sizes
+ */
+function getFirstSize(sizes = []) {
+  if (isValidSize(sizes)) {
+    return sizes;
+  } else if (isValidSize(sizes[0])) {
+    return sizes[0];
+  }
 
   return false;
 }
@@ -168,9 +381,9 @@ function includesSize(sizeArray, size) {
 /**
  * Determines whether or not the given bidFloor parameters are valid.
  *
- * @param  {*}       bidFloor    The bidFloor parameter inside bid request config.
- * @param  {*}       bidFloorCur The bidFloorCur parameter inside bid request config.
- * @return {boolean}             True if this is a valid biFfloor parameters format, and false
+ * @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
  *                               otherwise.
  */
 function isValidBidFloorParams(bidFloor, bidFloorCur) {
@@ -194,21 +407,57 @@ function getBidRequest(id, impressions) {
   return find(impressions, imp => imp.id === id);
 }
 
+/**
+ * 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 {object} flocId flocId passed in by prebid
+ * @return {object} contains toSend (eids to send to the adserver) and seenSources (used to filter
+ *                  identity info from IX Library)
+ */
+function getEidInfo(allEids, flocData) {
+  let toSend = [];
+  let seenSources = {};
+  if (utils.isArray(allEids)) {
+    for (const eid of allEids) {
+      if (SOURCE_RTI_MAPPING[eid.source] && utils.deepAccess(eid, 'uids.0')) {
+        seenSources[eid.source] = true;
+        eid.uids[0].ext = {
+          rtiPartner: SOURCE_RTI_MAPPING[eid.source]
+        };
+        delete eid.uids[0].atype;
+        toSend.push(eid);
+      }
+    }
+  }
+  const isValidFlocId = flocData && flocData.id && flocData.version;
+  if (isValidFlocId) {
+    const flocEid = {
+      'source': 'chrome.com',
+      'uids': [{ 'id': flocData.id, 'ext': { 'rtiPartner': 'flocId', 'ver': flocData.version } }]
+    };
+    toSend.push(flocEid);
+    seenSources['chrome.com'] = true;
+  }
+
+  return { toSend, seenSources };
+}
 /**
  * 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  {object} bidderRequest    An object containing other info like gdprConsent.
- * @param  {array}  impressions      List of impression objects describing the bids.
+ * @param  {object} impressions      An object containing a list of impression objects describing the bids for each transactionId
  * @param  {array}  version          Endpoint version denoting banner or video.
- * @return {object}                  Info describing the request to the server.
+ * @return {array}                   List of objects describing the request to the server.
  *
  */
 function buildRequest(validBidRequests, bidderRequest, impressions, version) {
-  const userEids = [];
-
   // Always use secure HTTPS protocol.
   let baseUrl = SECURE_BID_URL;
+  // Get ids from Prebid User ID Modules
+  let eidInfo = getEidInfo(utils.deepAccess(validBidRequests, '0.userIdAsEids'), utils.deepAccess(validBidRequests, '0.userId.flocId'));
+  let userEids = eidInfo.toSend;
 
   // RTI ids will be included in the bid request if the function getIdentityInfo() is loaded
   // and if the data for the partner exist
@@ -218,23 +467,35 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
       for (const partnerName in identityInfo) {
         if (identityInfo.hasOwnProperty(partnerName)) {
           let response = identityInfo[partnerName];
-          if (!response.responsePending && response.data && typeof response.data === 'object' && Object.keys(response.data).length) {
+          if (!response.responsePending && response.data && typeof response.data === 'object' &&
+            Object.keys(response.data).length && !eidInfo.seenSources[response.data.source]) {
             userEids.push(response.data);
           }
         }
       }
     }
   }
+
+  // If `roundel` alias bidder, only send requests if liveramp ids exist.
+  if (bidderRequest && bidderRequest.bidderCode === ALIAS_BIDDER_CODE && !eidInfo.seenSources['liveramp.com']) {
+    return [];
+  }
+
   const r = {};
 
   // Since bidderRequestId are the same for different bid request, just use the first one.
-  r.id = validBidRequests[0].bidderRequestId;
-
-  r.imp = impressions;
+  r.id = validBidRequests[0].bidderRequestId.toString();
 
   r.site = {};
   r.ext = {};
   r.ext.source = 'prebid';
+  r.ext.ixdiag = {};
+
+  // getting ixdiags for adunits of the video, outstream & multi format (MF) style
+  let ixdiag = buildIXDiag(validBidRequests);
+  for (var key in ixdiag) {
+    r.ext.ixdiag[key] = ixdiag[key];
+  }
 
   // if an schain is provided, send it along
   if (validBidRequests[0].schain) {
@@ -272,6 +533,12 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
         r.user.ext = {
           consent: gdprConsent.consentString || ''
         };
+
+        if (gdprConsent.hasOwnProperty('addtlConsent') && gdprConsent.addtlConsent) {
+          r.user.ext.consented_providers_settings = {
+            consented_providers: gdprConsent.addtlConsent
+          }
+        }
       }
     }
 
@@ -284,6 +551,10 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     }
   }
 
+  if (config.getConfig('coppa')) {
+    utils.deepSetValue(r, 'regs.coppa', 1);
+  }
+
   const payload = {};
 
   // Parse additional runtime configs.
@@ -308,30 +579,287 @@ function buildRequest(validBidRequests, bidderRequest, impressions, version) {
     if (typeof otherIxConfig.timeout === 'number') {
       payload.t = otherIxConfig.timeout;
     }
+
+    if (typeof otherIxConfig.detectMissingSizes === 'boolean') {
+      r.ext.ixdiag.dms = otherIxConfig.detectMissingSizes;
+    } else {
+      r.ext.ixdiag.dms = true;
+    }
   }
 
   // Use the siteId in the first bid request as the main siteId.
   payload.s = validBidRequests[0].params.siteId;
   payload.v = version;
-  payload.r = JSON.stringify(r);
   payload.ac = 'j';
   payload.sd = 1;
   if (version === VIDEO_ENDPOINT_VERSION) {
     payload.nf = 1;
   }
 
-  return {
+  const requests = [];
+
+  const request = {
     method: 'GET',
     url: baseUrl,
     data: payload
   };
+
+  const BASE_REQ_SIZE = new Blob([`${request.url}${utils.parseQueryStringParameters({ ...request.data, r: JSON.stringify(r) })}`]).size;
+  let currReqSize = BASE_REQ_SIZE;
+
+  const MAX_REQ_SIZE = 8000;
+  const MAX_REQ_LIMIT = 4;
+  let sn = 0;
+  let msi = 0;
+  let msd = 0;
+  r.ext.ixdiag.msd = 0;
+  r.ext.ixdiag.msi = 0;
+  r.imp = [];
+  let i = 0;
+  const transactionIds = Object.keys(impressions);
+  let currMissingImps = [];
+
+  while (i < transactionIds.length && requests.length < MAX_REQ_LIMIT) {
+    const impObj = impressions[transactionIds[i]];
+    msd = utils.deepAccess(impObj, 'missingCount') && utils.deepAccess(impObj, 'ixImps') ? impObj.missingCount : 0;
+
+    if (BASE_REQ_SIZE < MAX_REQ_SIZE) {
+      trimImpressions(impObj, MAX_REQ_SIZE - BASE_REQ_SIZE);
+    } else {
+      utils.logError('ix bidder: Base request size has exceeded maximum request size.');
+    }
+
+    msi = utils.deepAccess(impObj, 'missingImps') && utils.deepAccess(impObj, 'ixImps') ? impObj.missingImps.length : 0;
+
+    let currImpsSize = new Blob([encodeURIComponent(JSON.stringify(impObj))]).size;
+    currReqSize += currImpsSize;
+    if (currReqSize < MAX_REQ_SIZE) {
+      // since not reading params.size, ixImps can be undefined/empty
+      if (impObj.ixImps && impObj.ixImps.length > 0) {
+        // pushing ix configured sizes first
+        r.imp.push(...impObj.ixImps);
+      }
+      // update msd msi
+      r.ext.ixdiag.msd += msd;
+      r.ext.ixdiag.msi += msi;
+
+      if (impObj.hasOwnProperty('missingImps') && impObj.missingImps.length > 0) {
+        currMissingImps.push(...impObj.missingImps);
+      }
+
+      i++;
+    } else {
+      // pushing missing sizes after configured ones
+      const clonedPayload = utils.deepClone(payload);
+
+      r.imp.push(...currMissingImps);
+      r.ext.ixdiag.sn = sn;
+      clonedPayload.sn = sn;
+      sn++;
+      clonedPayload.r = JSON.stringify(r);
+
+      requests.push({
+        method: 'GET',
+        url: baseUrl,
+        data: clonedPayload
+      });
+      currMissingImps = [];
+      currReqSize = BASE_REQ_SIZE;
+      r.imp = [];
+      msd = 0;
+      msi = 0;
+      r.ext.ixdiag.msd = 0;
+      r.ext.ixdiag.msi = 0;
+    }
+  }
+
+  if (currReqSize > BASE_REQ_SIZE && currReqSize < MAX_REQ_SIZE && requests.length < MAX_REQ_LIMIT) {
+    const clonedPayload = utils.deepClone(payload);
+    r.imp.push(...currMissingImps);
+
+    if (requests.length > 0) {
+      r.ext.ixdiag.sn = sn;
+      clonedPayload.sn = sn;
+    }
+    clonedPayload.r = JSON.stringify(r);
+
+    requests.push({
+      method: 'GET',
+      url: baseUrl,
+      data: clonedPayload
+    });
+  }
+
+  return requests;
+}
+
+/**
+ * Return an object of user IDs stored by Prebid User ID module
+ *
+ * @returns {array} ID providers that are present in userIds
+ */
+function _getUserIds(bidRequest) {
+  const userIds = bidRequest.userId || {};
+
+  return PROVIDERS.filter(provider => userIds[provider]);
+}
+
+/**
+ * Calculates IX diagnostics values and packages them into an object
+ *
+ * @param {array} validBidRequests  The valid bid requests from prebid
+ * @return {Object} IX diag values for ad units
+ */
+function buildIXDiag(validBidRequests) {
+  var adUnitMap = validBidRequests
+    .map(bidRequest => bidRequest.transactionId)
+    .filter((value, index, arr) => arr.indexOf(value) === index)
+
+  var ixdiag = {
+    mfu: 0,
+    bu: 0,
+    iu: 0,
+    nu: 0,
+    ou: 0,
+    allu: 0,
+    ren: false,
+    version: '$prebid.version$',
+    userIds: _getUserIds(validBidRequests[0])
+  };
+
+  // create ad unit map and collect the required diag properties
+  for (let i = 0; i < adUnitMap.length; i++) {
+    var bid = validBidRequests.filter(bidRequest => bidRequest.transactionId === adUnitMap[i])[0];
+
+    if (utils.deepAccess(bid, 'mediaTypes')) {
+      if (Object.keys(bid.mediaTypes).length > 1) {
+        ixdiag.mfu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.native')) {
+        ixdiag.nu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.banner')) {
+        ixdiag.bu++;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.video.context') === 'outstream') {
+        ixdiag.ou++;
+        // renderer only needed for outstream
+
+        const hasRenderer = typeof (utils.deepAccess(bid, 'renderer') || utils.deepAccess(bid, 'mediaTypes.video.renderer')) === 'object';
+
+        // if any one ad unit is missing renderer, set ren status to false in diag
+        ixdiag.ren = ixdiag.ren && hasRenderer ? (utils.deepAccess(ixdiag, 'ren')) : hasRenderer;
+      }
+
+      if (utils.deepAccess(bid, 'mediaTypes.video.context') === 'instream') {
+        ixdiag.iu++;
+      }
+
+      ixdiag.allu++;
+    }
+  }
+
+  return ixdiag;
+}
+/**
+ *
+ * @param {Object} impressions containing ixImps and possibly missingImps
+ *
+ */
+function trimImpressions(impressions, maxSize) {
+  let currSize = new Blob([encodeURIComponent(JSON.stringify(impressions))]).size;
+  if (currSize < maxSize) {
+    return;
+  }
+
+  while (currSize > maxSize) {
+    if (impressions.hasOwnProperty('missingImps') && impressions.missingImps.length > 0) {
+      impressions.missingImps.pop();
+    } else if (impressions.hasOwnProperty('ixImps') && impressions.ixImps.length > 0) {
+      impressions.ixImps.pop();
+    }
+    currSize = new Blob([encodeURIComponent(JSON.stringify(impressions))]).size;
+  }
+}
+
+/**
+ *
+ * @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
+ */
+
+function removeFromSizes(bannerSizeList, bannerSize) {
+  if (!bannerSize) return;
+
+  for (let i = 0; i < bannerSizeList.length; i++) {
+    const size = bannerSizeList[i];
+    if (bannerSize[0] === size[0] && bannerSize[1] === size[1]) {
+      bannerSizeList.splice(i, 1);
+      break;
+    }
+  }
+}
+
+/**
+ * Updates the Object to track missing banner sizes.
+ *
+ * @param {object} validBidRequest    The bid request for an ad unit's with a configured size.
+ * @param {object} missingBannerSizes The object containing missing banner sizes
+ * @param {object} imp                The impression for the bidrequest
+ */
+function updateMissingSizes(validBidRequest, missingBannerSizes, imp) {
+  const transactionID = validBidRequest.transactionId;
+  if (missingBannerSizes.hasOwnProperty(transactionID)) {
+    let currentSizeList = [];
+    if (missingBannerSizes[transactionID].hasOwnProperty('missingSizes')) {
+      currentSizeList = missingBannerSizes[transactionID].missingSizes;
+    }
+    removeFromSizes(currentSizeList, validBidRequest.params.size);
+    missingBannerSizes[transactionID].missingSizes = currentSizeList;
+  } else {
+    // New Ad Unit
+    if (utils.deepAccess(validBidRequest, 'mediaTypes.banner.sizes')) {
+      let sizeList = utils.deepClone(validBidRequest.mediaTypes.banner.sizes);
+      removeFromSizes(sizeList, validBidRequest.params.size);
+      let newAdUnitEntry = {
+        'missingSizes': sizeList,
+        'impression': imp
+      };
+      missingBannerSizes[transactionID] = newAdUnitEntry;
+    }
+  }
+}
+
+/**
+ * @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
+ * @return {object} newImp   Updated impression object
+ */
+function createMissingBannerImp(bid, imp, newSize) {
+  const newImp = utils.deepClone(imp);
+  newImp.ext.sid = `${newSize[0]}x${newSize[1]}`;
+  newImp.banner.w = newSize[0];
+  newImp.banner.h = newSize[1];
+
+  _applyFloor(bid, newImp, BANNER);
+
+  return newImp;
 }
 
 export const spec = {
 
   code: BIDDER_CODE,
-  gvlid: 10,
-  aliases: ['indexExchange'],
+  gvlid: GLOBAL_VENDOR_ID,
+  aliases: [{
+    code: ALIAS_BIDDER_CODE,
+    gvlid: GLOBAL_VENDOR_ID,
+    skipPbsAliasing: false
+  }],
   supportedMediaTypes: SUPPORTED_AD_TYPES,
 
   /**
@@ -341,22 +869,36 @@ export const spec = {
    * @return {boolean}     True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function (bid) {
-    if (!isValidSize(bid.params.size)) {
-      utils.logError('ix bidder params: bid size has invalid format.');
-      return false;
-    }
+    const paramsVideoRef = utils.deepAccess(bid, 'params.video');
+    const paramsSize = utils.deepAccess(bid, 'params.size');
+    const mediaTypeBannerSizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
+    const mediaTypeVideoRef = utils.deepAccess(bid, 'mediaTypes.video');
+    const mediaTypeVideoPlayerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
+    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
+    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
 
-    if (!includesSize(bid.sizes, bid.params.size)) {
-      utils.logError('ix bidder params: bid size is not included in ad unit sizes.');
+    if (bid.hasOwnProperty('mediaType') && !(utils.contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaType') && !(utils.contains(SUPPORTED_AD_TYPES, bid.mediaType))) {
+    if (utils.deepAccess(bid, 'mediaTypes.banner') && !mediaTypeBannerSizes) {
       return false;
     }
 
-    if (bid.hasOwnProperty('mediaTypes') && !(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || utils.deepAccess(bid, 'mediaTypes.video.playerSize'))) {
-      return false;
+    if (paramsSize) {
+      // since there is an ix bidder level size, make sure its valid
+      const ixSize = getFirstSize(paramsSize);
+      if (!ixSize) {
+        utils.logError('ix bidder params: 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))) {
+        utils.logError('ix bidder params: 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') {
@@ -364,16 +906,16 @@ export const spec = {
       return false;
     }
 
-    const hasBidFloor = bid.params.hasOwnProperty('bidFloor');
-    const hasBidFloorCur = bid.params.hasOwnProperty('bidFloorCur');
-
     if (hasBidFloor || hasBidFloorCur) {
       if (!(hasBidFloor && hasBidFloorCur && isValidBidFloorParams(bid.params.bidFloor, bid.params.bidFloorCur))) {
         utils.logError('ix bidder params: bidFloor / bidFloorCur parameter has invalid format.');
         return false;
       }
     }
-
+    // For multi format unit
+    if (!mediaTypeBannerSizes && (mediaTypeVideoRef || paramsVideoRef)) {
+      return checkVideoParams(bid, mediaTypeVideoRef, paramsVideoRef);
+    }
     return true;
   },
 
@@ -386,32 +928,83 @@ export const spec = {
    */
   buildRequests: function (validBidRequests, bidderRequest) {
     let reqs = [];
-    let bannerImps = [];
-    let videoImps = [];
+    let bannerImps = {};
+    let videoImps = {};
     let validBidRequest = null;
 
+    // To capture the missing sizes i.e not configured for ix
+    let missingBannerSizes = {};
+
+    const DEFAULT_IX_CONFIG = {
+      detectMissingSizes: true,
+    };
+
+    const ixConfig = { ...DEFAULT_IX_CONFIG, ...config.getConfig('ix') };
+
     for (let i = 0; i < validBidRequests.length; i++) {
       validBidRequest = validBidRequests[i];
+      const videoAdUnitRef = utils.deepAccess(validBidRequest, 'mediaTypes.video');
+      const videoParamRef = utils.deepAccess(validBidRequest, 'params.video');
+
+      // identify video ad unit
+      if (validBidRequest.mediaType === VIDEO || videoAdUnitRef || videoParamRef) {
+        if (!videoImps.hasOwnProperty(validBidRequest.transactionId)) {
+          const imp = bidToVideoImp(validBidRequest);
+          if (Object.keys(imp).length != 0) {
+            videoImps[validBidRequest.transactionId] = {};
+            videoImps[validBidRequest.transactionId].ixImps = [];
+            videoImps[validBidRequest.transactionId].ixImps.push(imp);
+          }
+        }
+      }
 
-      if (validBidRequest.mediaType === VIDEO || utils.deepAccess(validBidRequest, 'mediaTypes.video')) {
-        if (validBidRequest.mediaType === VIDEO || includesSize(validBidRequest.mediaTypes.video.playerSize, validBidRequest.params.size)) {
-          videoImps.push(bidToVideoImp(validBidRequest));
-        } else {
-          utils.logError('Bid size is not included in video playerSize')
+      if (validBidRequest.mediaType === BANNER ||
+        (utils.deepAccess(validBidRequest, 'mediaTypes.banner.sizes')) ||
+        (!validBidRequest.mediaType && !validBidRequest.mediaTypes)) {
+        let imp = bidToBannerImp(validBidRequest);
+        // Create IX imps from params.size
+        if (utils.deepAccess(validBidRequest, 'params.size')) {
+          if (!bannerImps.hasOwnProperty(validBidRequest.transactionId)) {
+            bannerImps[validBidRequest.transactionId] = {};
+          }
+          if (!bannerImps[validBidRequest.transactionId].hasOwnProperty('ixImps')) {
+            bannerImps[validBidRequest.transactionId].ixImps = []
+          }
+          bannerImps[validBidRequest.transactionId].ixImps.push(imp);
+        }
+        if (ixConfig.hasOwnProperty('detectMissingSizes') && ixConfig.detectMissingSizes) {
+          updateMissingSizes(validBidRequest, missingBannerSizes, imp);
         }
       }
+    }
+
+    // Finding the missing banner sizes, and making impressions for them
+    for (var transactionId in missingBannerSizes) {
+      if (missingBannerSizes.hasOwnProperty(transactionId)) {
+        let missingSizes = missingBannerSizes[transactionId].missingSizes;
+
+        if (!bannerImps.hasOwnProperty(transactionId)) {
+          bannerImps[transactionId] = {};
+        }
+        if (!bannerImps[transactionId].hasOwnProperty('missingImps')) {
+          bannerImps[transactionId].missingImps = [];
+          bannerImps[transactionId].missingCount = 0;
+        }
 
-      if (validBidRequest.mediaType === BANNER || utils.deepAccess(validBidRequest, 'mediaTypes.banner') ||
-          (!validBidRequest.mediaType && !validBidRequest.mediaTypes)) {
-        bannerImps.push(bidToBannerImp(validBidRequest));
+        let origImp = missingBannerSizes[transactionId].impression;
+        for (let i = 0; i < missingSizes.length; i++) {
+          let newImp = createMissingBannerImp(validBidRequest, origImp, missingSizes[i]);
+          bannerImps[transactionId].missingImps.push(newImp);
+          bannerImps[transactionId].missingCount++;
+        }
       }
     }
 
-    if (bannerImps.length > 0) {
-      reqs.push(buildRequest(validBidRequests, bidderRequest, bannerImps, BANNER_ENDPOINT_VERSION));
+    if (Object.keys(bannerImps).length > 0) {
+      reqs.push(...buildRequest(validBidRequests, bidderRequest, bannerImps, BANNER_ENDPOINT_VERSION));
     }
-    if (videoImps.length > 0) {
-      reqs.push(buildRequest(validBidRequests, bidderRequest, videoImps, VIDEO_ENDPOINT_VERSION));
+    if (Object.keys(videoImps).length > 0) {
+      reqs.push(...buildRequest(validBidRequests, bidderRequest, videoImps, VIDEO_ENDPOINT_VERSION));
     }
 
     return reqs;
@@ -459,7 +1052,7 @@ export const spec = {
    * @param {Boolean} isOpenRtb boolean to check openrtb2 protocol
    * @return {Object} params bid params
    */
-  transformBidParams: function(params, isOpenRtb) {
+  transformBidParams: function (params, isOpenRtb) {
     return utils.convertTypes({
       'siteID': 'number'
     }, params);
diff --git a/modules/ixBidAdapter.md b/modules/ixBidAdapter.md
index fcbc4ea89e3..59b699bad2d 100644
--- a/modules/ixBidAdapter.md
+++ b/modules/ixBidAdapter.md
@@ -13,30 +13,10 @@ Description
 This module connects publishers to Index Exchange's (IX) network of demand
 sources through Prebid.js. This module is GDPR and CCPA compliant.
 
-It is compatible with both the older ad unit format where the `sizes` and
-`mediaType` properties are placed at the top-level of the ad unit, and the newer
-format where this information is encapsulated within the `mediaTypes` object. We
-recommend that you use the newer format when possible as it will be better able
+It is compatible with the newer PrebidJS 5.0 ad unit format where the `banner` and/or `video` properties are encapsulated within the `adUnits[].mediaTypes` object. We
+recommend that you use this newer format when possible as it will be better able
 to accommodate new feature additions.
 
-If a mix of properties from both formats are present within an ad unit, the
-newer format's properties will take precedence.
-
-Here are examples of both formats.
-
-##### Older Format
-```javascript
-var adUnits = [{
-    // ...
-
-    sizes: [
-        [300, 250],
-        [300, 600]
-    ]
-
-    // ...
-}];
-```
 
 ##### Newer Format
 ```javascript
@@ -51,10 +31,7 @@ var adUnits = [{
         },
         video: {
             context: 'instream',
-            playerSize: [
-                [300, 250],
-                [300, 600]
-            ]
+            playerSize: [300, 250]
         }
     },
     // ...
@@ -69,30 +46,59 @@ var adUnits = [{
 | Video  | Fully supported for all IX approved sizes.
 | Native | Not supported.
 
-# Bid Parameters
+
+
+# Ad unit or Bidder Parameters
+
+These params can be specified in the ad unit level `adUnits[].mediaTypes`, which will be the preferred way going forward with PBJS 5.0
 
 Each of the IX-specific parameters provided under the `adUnits[].bids[].params`
 object are detailed here.
 
+
 ### Banner
 
 | Key | Scope | Type | Description
 | --- | --- | --- | ---
-| siteId | Required | String | An IX-specific identifier that is associated with a specific size on this ad unit. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
-| size | Required | Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.banner.sizes`. Examples: `[300, 250]`, `[300, 600]`, `[728, 90]`
+| siteId | Required | String | An IX-specific identifier that is associated with this ad unit. It will be associated to the single size, if the size provided. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
+| sizes | Required | Number[Number[]] | The size / sizes associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].mediaTypes.banner.sizes`. Examples: `[300, 250]`, `[300, 600]`, `[728, 90]`
 
 ### Video
 
 | Key | Scope | Type | Description
 | --- | --- | --- | ---
-| siteId | Required | String | An IX-specific identifier that is associated with a specific size on this ad unit. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
-| size | Required | Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.video.playerSize`. Examples: `[300, 250]`, `[300, 600]`
-| video | Required | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required.
+| siteId | Required | String | An IX-specific identifier that is associated with this ad unit. It will be associated to the single size, if the size is provided. This is similar to a placement ID or an ad unit ID that some other modules have. Examples: `'3723'`, `'6482'`, `'3639'`
+| size | Optional (Deprecated)| Number[] | The single size associated with the site ID. It should be one of the sizes listed in the ad unit under `adUnits[].sizes` or `adUnits[].mediaTypes.video.playerSize`. Examples: `[300, 250]`, `[300, 600]`
+| video | Optional | Hash | The video object will serve as the properties of the video ad. You can create any field under the video object that is mentioned in the `OpenRTB Spec v2.5`. Some fields like `mimes, protocols, minduration, maxduration` are required. Properties not defined at this level, will be pulled from the Adunit level.
+|video.w| Required | Integer | The video player size width in pixels that will be passed to demand partners.
+|video.h| Required | Integer | The video player size height in pixels that will be passed to demand partners.
+|video.playerSize| Optional* | Integer | The video player size that will be passed to demand partners. * In the absence of `video.w` and `video.h`, this field is required.
 | video.mimes | Required | String[] | Array list of content MIME types supported. Popular MIME types include, but are not limited to, `"video/x-ms- wmv"` for Windows Media and `"video/x-flv"` for Flash Video.
 |video.minduration| Required | Integer | Minimum video ad duration in seconds.
 |video.maxduration| Required | Integer | Maximum video ad duration in seconds.
 |video.protocol / video.protocols| Required | Integer / Integer[] | Either a single protocol provided as an integer, or protocols provided as a list of integers. `2` - VAST 2.0, `3` - VAST 3.0, `5` - VAST 2.0 Wrapper, `6` - VAST 3.0 Wrapper
 
+## Deprecation warning
+
+We are deprecating the older format
+of having `mediaType` and `sizes` at the ad unit level.
+
+Here are examples of the format.
+
+##### Older Deprecated Format
+```javascript
+var adUnits = [{
+    // ...
+
+    sizes: [
+        [300, 250],
+        [300, 600]
+    ]
+
+    // ...
+}];
+```
+
 
 Setup Guide
 ===========
@@ -100,10 +106,15 @@ Setup Guide
 Follow these steps to configure and add the IX module to your Prebid.js
 integration.
 
+Both video and banner params will be read from the `adUnits[].mediaTypes.video` and `adUnits[].mediaTypes.banner` respectively.
+
 The examples in this guide assume the following starting configuration (you may remove banner or video, if either does not apply).
 
+
 In regards to video, `context` can either be `'instream'` or `'outstream'`. Note that `outstream` requires additional configuration on the adUnit.
 
+
+
 ```javascript
 var adUnits = [{
     code: 'banner-div-a',
@@ -134,21 +145,23 @@ var adUnits = [{
 
 ### 1. Add IX to the appropriate ad units
 
-For each size in an ad unit that IX will be bidding on, add one of the following
+For each ad unit that IX will be bidding on, add one of the following
 bid objects under `adUnits[].bids`:
+- size is optional and deprecated
 
 ```javascript
 {
     bidder: 'ix',
     params: {
         siteId: '',
-        size: []
+        size: [] // deprecated
     }
 }
 ```
 
-Set `params.siteId` and `params.size` in each bid object to the values provided
+Set `params.siteId` in the bid object to the values provided
 by your IX representative.
+- `params.size` is not required anymore
 
 **Examples**
 
@@ -167,14 +180,7 @@ var adUnits = [{
     bids: [{
         bidder: 'ix',
         params: {
-            siteId: '12345',
-            size: [300, 250]
-        }
-    }, {
-        bidder: 'ix',
-        params: {
-            siteId: '12345',
-            size: [300, 600]
+            siteId: '12345'
         }
     }]
 }];
@@ -185,35 +191,30 @@ var adUnits = [{
     code: 'video-div-a',
     mediaTypes: {
         video: {
+            // Preferred location for openrtb v2.5 compatible video obj
             context: 'instream',
-            playerSize: [
-                [300, 250],
-                [300, 600]
-            ]
+            playerSize: [300, 250],
+            mimes: [
+                    'video/mp4',
+                    'video/webm'
+                ],
+            minduration: 0,
+            maxduration: 60,
+            protocols: [6]
         }
     },
     bids: [{
         bidder: 'ix',
         params: {
-            siteId: '12345',
-            size: [300, 250],
-            video: {
-                mimes: [
-                    'video/mp4',
-                    'video/webm'
-                ],
-                minduration: 0,
-                maxduration: 60,
-                protocols: [6]
-            }
+            siteId: '12345'
         }
     }, {
         bidder: 'ix',
         params: {
             siteId: '12345',
-            size: [300, 600],
             video: {
                 // openrtb v2.5 compatible video obj
+                // If required, use this to override mediaTypes.video.XX properties
             }
         }
     }]
@@ -231,7 +232,14 @@ var adUnits = [{
     mediaTypes: {
         video: {
             context: 'outstream',
-            playerSize: [[300, 250]]
+            playerSize: [300, 250],
+            mimes: [
+                    'video/mp4',
+                    'video/webm'
+                ],
+            minduration: 0,
+            maxduration: 60,
+            protocols: [6]
         }
     },
     renderer: {
@@ -244,15 +252,8 @@ var adUnits = [{
         bidder: 'ix',
         params: {
             siteId: '12345',
-            size: [300, 250],
             video: {
-                mimes: [
-                    'video/mp4',
-                    'video/webm'
-                ],
-                minduration: 0,
-                maxduration: 60,
-                protocols: [6]
+                // If required, use this to override mediaTypes.video.XX properties   
             }
         }
     }]
@@ -288,6 +289,26 @@ pbjs.setConfig({
     }
 });
 ```
+#### The **detectMissingSizes** feature
+By default, the IX bidding adapter bids on all banner sizes available in the ad unit when configured to at least one banner size. If you want the IX bidding adapter to only bid on the banner size it’s configured to, switch off this feature using `detectMissingSizes`.
+```
+pbjs.setConfig({
+                ix: {
+                    detectMissingSizes: false
+                }
+            });
+```
+OR
+```
+pbjs.setBidderConfig({
+                bidders: ["ix"],
+                config: {
+                    ix: {
+                        detectMissingSizes: false
+                    }
+                }
+            });
+```
 
 ### 2. Include `ixBidAdapter` in your build process
 
@@ -393,14 +414,9 @@ FAQs
 
 ### Why do I have to input size in `adUnits[].bids[].params` for IX when the size is already in the ad unit?
 
-There are two important reasons why we require it:
-
-1. An IX site ID maps to a single size, whereas an ad unit can have multiple
-sizes. To ensure that the right site ID is mapped to the correct size in the ad
-unit we require the size to be explicitly stated.
+No, only `siteId` is required.
 
-2. An ad unit may have sizes that IX does not support. By explicitly stating the
-size, you can choose not to have IX bid on certain sizes that are invalid.
+The `size` parameter is no longer a required field, the `siteId` will now be associated with all the sizes in the ad unit.
 
 ### How do I view IX's bid request in the network?
 
diff --git a/modules/jixieBidAdapter.js b/modules/jixieBidAdapter.js
new file mode 100644
index 00000000000..db6c9032e65
--- /dev/null
+++ b/modules/jixieBidAdapter.js
@@ -0,0 +1,264 @@
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+import { ajax } from '../src/ajax.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { Renderer } from '../src/Renderer.js';
+export const storage = getStorageManager();
+
+const BIDDER_CODE = 'jixie';
+const EVENTS_URL = 'https://hbtra.jixie.io/sync/hb?';
+const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.io/jxhboutstream.js';
+const REQUESTS_URL = 'https://hb.jixie.io/v2/hbpost';
+const sidTTLMins_ = 30;
+
+/**
+ * Own miscellaneous support functions:
+ */
+
+function setIds_(clientId, sessionId) {
+  let dd = null;
+  try {
+    dd = window.location.hostname.match(/[^.]*\.[^.]{2,3}(?:\.[^.]{2,3})?$/mg);
+  } catch (err1) {}
+  try {
+    let expC = (new Date(new Date().setFullYear(new Date().getFullYear() + 1))).toUTCString();
+    let expS = (new Date(new Date().setMinutes(new Date().getMinutes() + sidTTLMins_))).toUTCString();
+
+    storage.setCookie('_jx', clientId, expC, 'None', null);
+    storage.setCookie('_jx', clientId, expC, 'None', dd);
+
+    storage.setCookie('_jxs', sessionId, expS, 'None', null);
+    storage.setCookie('_jxs', sessionId, expS, 'None', dd);
+
+    storage.setDataInLocalStorage('_jx', clientId);
+    storage.setDataInLocalStorage('_jxs', sessionId);
+  } catch (error) {}
+}
+
+function fetchIds_() {
+  let ret = {
+    client_id_c: '',
+    client_id_ls: '',
+    session_id_c: '',
+    session_id_ls: ''
+  };
+  try {
+    let tmp = storage.getCookie('_jx');
+    if (tmp) ret.client_id_c = tmp;
+    tmp = storage.getCookie('_jxs');
+    if (tmp) ret.session_id_c = tmp;
+
+    tmp = storage.getDataFromLocalStorage('_jx');
+    if (tmp) ret.client_id_ls = tmp;
+    tmp = storage.getDataFromLocalStorage('_jxs');
+    if (tmp) ret.session_id_ls = tmp;
+  } catch (error) {}
+  return ret;
+}
+
+function getDevice_() {
+  return ((/(ios|ipod|ipad|iphone|android|blackberry|iemobile|opera mini|webos)/i).test(navigator.userAgent)
+    ? 'mobile' : 'desktop');
+}
+
+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({
+      sizes: [bidAd.width, bidAd.height],
+      width: bidAd.width,
+      height: bidAd.height,
+      targetId: bidAd.adUnitCode,
+      adResponse: bidAd.adResponse
+    });
+  });
+}
+
+function createRenderer_(bidAd, scriptUrl, createFcn) {
+  const renderer = Renderer.install({
+    id: bidAd.adUnitCode,
+    url: scriptUrl,
+    loaded: false,
+    config: {'player_height': bidAd.height, 'player_width': bidAd.width},
+    adUnitCode: bidAd.adUnitCode
+  });
+  try {
+    renderer.setRender(createFcn);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+  return renderer;
+}
+
+function getMiscDims_() {
+  let ret = {
+    pageurl: '',
+    domain: '',
+    device: 'unknown'
+  }
+  try {
+    let refererInfo_ = getRefererInfo();
+    let url_ = ((refererInfo_ && refererInfo_.referer) ? refererInfo_.referer : window.location.href);
+    ret.pageurl = url_;
+    ret.domain = utils.parseUrl(url_).host;
+    ret.device = getDevice_();
+  } catch (error) {}
+  return ret;
+}
+
+// easier for replacement in the unit test
+export const internal = {
+  getDevice: getDevice_,
+  getRefererInfo: getRefererInfo,
+  ajax: ajax,
+  getMiscDims: getMiscDims_
+};
+
+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') {
+      return false;
+    }
+    if (typeof bid.params.unit === 'undefined') {
+      return false;
+    }
+    return true;
+  },
+  buildRequests: function(validBidRequests, bidderRequest) {
+    const currencyObj = config.getConfig('currency');
+    const currency = (currencyObj && currencyObj.adServerCurrency) || 'USD';
+
+    let bids = [];
+    validBidRequests.forEach(function(one) {
+      bids.push({
+        bidId: one.bidId,
+        adUnitCode: one.adUnitCode,
+        mediaTypes: (one.mediaTypes === 'undefined' ? {} : one.mediaTypes),
+        sizes: (one.sizes === 'undefined' ? [] : one.sizes),
+        params: one.params,
+      });
+    });
+
+    let jixieCfgBlob = config.getConfig('jixie');
+    if (!jixieCfgBlob) {
+      jixieCfgBlob = {};
+    }
+
+    let ids = fetchIds_();
+    let miscDims = internal.getMiscDims();
+    let transformedParams = Object.assign({}, {
+      auctionid: bidderRequest.auctionId,
+      timeout: bidderRequest.timeout,
+      currency: currency,
+      timestamp: (new Date()).getTime(),
+      device: miscDims.device,
+      domain: miscDims.domain,
+      pageurl: miscDims.pageurl,
+      bids: bids,
+      cfg: jixieCfgBlob
+    }, ids);
+    return Object.assign({}, {
+      method: 'POST',
+      url: REQUESTS_URL,
+      data: JSON.stringify(transformedParams),
+      currency: currency
+    });
+  },
+
+  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: utils.deepAccess(timeoutData, '0.auctionId'),
+        timeout: utils.deepAccess(timeoutData, '0.timeout'),
+        count: timeoutData.length
+      });
+  },
+
+  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
+      });
+    }
+  },
+
+  interpretResponse: function(response, bidRequest) {
+    if (response && response.body && utils.isArray(response.body.bids)) {
+      const bidResponses = [];
+      response.body.bids.forEach(function(oneBid) {
+        let bnd = {};
+
+        Object.assign(bnd, oneBid);
+        if (oneBid.osplayer) {
+          bnd.adResponse = {
+            content: oneBid.vastXml,
+            parameters: oneBid.osparams,
+            height: oneBid.height,
+            width: oneBid.width
+          };
+          let rendererScript = (oneBid.osparams.script ? oneBid.osparams.script : JX_OUTSTREAM_RENDERER_URL);
+          bnd.renderer = createRenderer_(oneBid, rendererScript, jxOutstreamRender_);
+        }
+        // a note on advertiserDomains: our adserver is not responding in
+        // openRTB-type json. so there is no need to copy from 'adomain' over
+        // to meta: advertiserDomains
+        // However, we will just make sure the property is there.
+        if (!bnd.meta) {
+          bnd.meta = {};
+        }
+        if (!bnd.meta.advertiserDomains) {
+          bnd.meta.advertiserDomains = [];
+        }
+        bidResponses.push(bnd);
+      });
+      if (response.body.setids) {
+        setIds_(response.body.setids.client_id,
+          response.body.setids.session_id);
+      }
+      return bidResponses;
+    } else { return []; }
+  }
+}
+
+registerBidder(spec);
diff --git a/modules/jixieBidAdapter.md b/modules/jixieBidAdapter.md
new file mode 100644
index 00000000000..d9c1f19541d
--- /dev/null
+++ b/modules/jixieBidAdapter.md
@@ -0,0 +1,73 @@
+# Overview
+
+Module Name: Jixie Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: contact@jixie.io
+
+# Description
+
+Module that connects to Jixie demand source to fetch bids.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'demoslot1-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [
+                        [300, 250]
+                    ]
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        },
+        {
+            code: 'demoslot2-div',
+            sizes: [640, 360],
+            mediaTypes: {
+                video: {
+                    playerSize: [
+                        [640, 360]
+                    ],
+                    context: "outstream"
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        },
+        {
+            code: 'demoslot3-div',
+            sizes: [640, 360],
+            mediaTypes: {
+                video: {
+                    playerSize: [
+                        [640, 360]
+                    ],
+                    context: "instream"
+                }
+            },
+            bids: [
+                {
+                    bidder: 'jixie',
+                    params: {
+                        unit: "prebidsampleunit"
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/justpremiumBidAdapter.js b/modules/justpremiumBidAdapter.js
index 1f84feee7d1..da30ee16427 100644
--- a/modules/justpremiumBidAdapter.js
+++ b/modules/justpremiumBidAdapter.js
@@ -2,12 +2,14 @@ import { registerBidder } from '../src/adapters/bidderFactory.js'
 import { deepAccess } from '../src/utils.js';
 
 const BIDDER_CODE = 'justpremium'
+const GVLID = 62
 const ENDPOINT_URL = 'https://pre.ads.justpremium.com/v/2.0/t/xhr'
 const JP_ADAPTER_VERSION = '1.7'
 const pixels = []
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   time: 60000,
 
   isBidRequestValid: (bid) => {
@@ -90,7 +92,10 @@ export const spec = {
           netRevenue: true,
           currency: bid.currency || 'USD',
           ttl: bid.ttl || spec.time,
-          format: bid.format
+          format: bid.format,
+          meta: {
+            advertiserDomains: bid.adomain && bid.adomain.length > 0 ? bid.adomain : []
+          }
         }
         bidResponses.push(bidResponse)
       }
diff --git a/modules/jwplayerRtdProvider.js b/modules/jwplayerRtdProvider.js
new file mode 100644
index 00000000000..8332e720ae7
--- /dev/null
+++ b/modules/jwplayerRtdProvider.js
@@ -0,0 +1,282 @@
+/**
+ * This module adds the jwplayer provider to the Real Time Data module (rtdModule)
+ * The {@link module:modules/realTimeData} module is required
+ * The module will allow Ad Bidders to obtain JW Player's Video Ad Targeting information
+ * The module will fetch segments for the media ids present in the prebid config when the module loads. If any bid
+ * requests are made while the segments are being fetched, they will be blocked until all requests complete, or the
+ * timeout expires.
+ * @module modules/jwplayerRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+import { submodule } from '../src/hook.js';
+import { config } from '../src/config.js';
+import { ajaxBuilder } from '../src/ajax.js';
+import { logError } from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+
+const SUBMODULE_NAME = 'jwplayer';
+const segCache = {};
+const pendingRequests = {};
+let activeRequestCount = 0;
+let resumeBidRequest;
+
+/** @type {RtdSubmodule} */
+export const jwplayerSubmodule = {
+  /**
+     * 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
+     */
+  getBidRequestData: enrichBidRequest,
+  init
+};
+
+config.getConfig('realTimeData', ({realTimeData}) => {
+  const providers = realTimeData.dataProviders;
+  const jwplayerProvider = providers && find(providers, pr => pr.name && pr.name.toLowerCase() === SUBMODULE_NAME);
+  const params = jwplayerProvider && jwplayerProvider.params;
+  if (!params) {
+    return;
+  }
+  fetchTargetingInformation(params);
+});
+
+submodule('realTimeData', jwplayerSubmodule);
+
+function init(provider, userConsent) {
+  return true;
+}
+
+export function fetchTargetingInformation(jwTargeting) {
+  const mediaIDs = jwTargeting.mediaIDs;
+  if (!mediaIDs) {
+    return;
+  }
+  mediaIDs.forEach(mediaID => {
+    fetchTargetingForMediaId(mediaID);
+  });
+}
+
+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.com/v2/media/${mediaId}`, {
+    success: function (response) {
+      const segment = parseSegment(response);
+      cacheSegments(segment, mediaId);
+      onRequestCompleted(mediaId, !!segment);
+    },
+    error: function () {
+      logError('failed to retrieve targeting information');
+      onRequestCompleted(mediaId, false);
+    }
+  });
+}
+
+function parseSegment(response) {
+  let segment;
+  try {
+    const data = JSON.parse(response);
+    if (!data) {
+      throw ('Empty response');
+    }
+
+    const playlist = data.playlist;
+    if (!playlist || !playlist.length) {
+      throw ('Empty playlist');
+    }
+
+    segment = playlist[0].jwpseg;
+  } catch (err) {
+    logError(err);
+  }
+  return segment;
+}
+
+function cacheSegments(jwpseg, mediaId) {
+  if (jwpseg && mediaId) {
+    segCache[mediaId] = jwpseg;
+  }
+}
+
+function onRequestCompleted(mediaID, success) {
+  const callback = pendingRequests[mediaID];
+  if (callback) {
+    callback(success ? getVatFromCache(mediaID) : { mediaID });
+    activeRequestCount--;
+  }
+  delete pendingRequests[mediaID];
+
+  if (activeRequestCount > 0) {
+    return;
+  }
+
+  if (resumeBidRequest) {
+    resumeBidRequest();
+    resumeBidRequest = null;
+  }
+}
+
+function enrichBidRequest(bidReqConfig, onDone) {
+  activeRequestCount = 0;
+  const adUnits = bidReqConfig.adUnits || getGlobal().adUnits;
+  enrichAdUnits(adUnits);
+  if (activeRequestCount <= 0) {
+    onDone();
+  } else {
+    resumeBidRequest = onDone;
+  }
+}
+
+/**
+ * get targeting data and write to bids
+ * @function
+ * @param {adUnit[]} adUnits
+ * @param {function} onDone
+ */
+export function enrichAdUnits(adUnits) {
+  const fpdFallback = config.getConfig('ortb2.site.ext.data.jwTargeting');
+  adUnits.forEach(adUnit => {
+    const jwTargeting = extractPublisherParams(adUnit, fpdFallback);
+    if (!jwTargeting || !Object.keys(jwTargeting).length) {
+      return;
+    }
+
+    const onVatResponse = function (vat) {
+      if (!vat) {
+        return;
+      }
+      const targeting = formatTargetingResponse(vat);
+      addTargetingToBids(adUnit.bids, targeting);
+    };
+    loadVat(jwTargeting, onVatResponse);
+  });
+}
+
+function supportsInstreamVideo(mediaTypes) {
+  const video = mediaTypes && mediaTypes.video;
+  return video && video.context === 'instream';
+}
+
+export function extractPublisherParams(adUnit, fallback) {
+  let adUnitTargeting;
+  try {
+    adUnitTargeting = adUnit.ortb2Imp.ext.data.jwTargeting;
+  } catch (e) {}
+
+  if (!adUnitTargeting && !supportsInstreamVideo(adUnit.mediaTypes)) {
+    return;
+  }
+
+  return Object.assign({}, fallback, adUnitTargeting);
+}
+
+function loadVat(params, onCompletion) {
+  const { playerID, mediaID } = params;
+  if (pendingRequests[mediaID] !== undefined) {
+    loadVatForPendingRequest(playerID, mediaID, onCompletion);
+    return;
+  }
+
+  const vat = getVatFromCache(mediaID) || getVatFromPlayer(playerID, mediaID) || { mediaID };
+  onCompletion(vat);
+}
+
+function loadVatForPendingRequest(playerID, mediaID, callback) {
+  const vat = getVatFromPlayer(playerID, mediaID);
+  if (vat) {
+    callback(vat);
+  } else {
+    activeRequestCount++;
+    pendingRequests[mediaID] = callback;
+  }
+}
+
+export function getVatFromCache(mediaID) {
+  const segments = segCache[mediaID];
+
+  if (!segments) {
+    return null;
+  }
+
+  return {
+    segments,
+    mediaID
+  };
+}
+
+export function getVatFromPlayer(playerID, mediaID) {
+  const player = getPlayer(playerID);
+  if (!player) {
+    return null;
+  }
+
+  const item = mediaID ? find(player.getPlaylist(), item => item.mediaid === mediaID) : player.getPlaylistItem();
+  if (!item) {
+    return null;
+  }
+
+  mediaID = mediaID || item.mediaid;
+  const segments = item.jwpseg;
+  cacheSegments(segments, mediaID)
+
+  return {
+    segments,
+    mediaID
+  };
+}
+
+export function formatTargetingResponse(vat) {
+  const { segments, mediaID } = vat;
+  const targeting = {};
+  if (segments && segments.length) {
+    targeting.segments = segments;
+  }
+
+  if (mediaID) {
+    const id = 'jw_' + mediaID;
+    targeting.content = {
+      id
+    }
+  }
+  return targeting;
+}
+
+function addTargetingToBids(bids, targeting) {
+  if (!bids || !targeting) {
+    return;
+  }
+
+  bids.forEach(bid => addTargetingToBid(bid, targeting));
+}
+
+export function addTargetingToBid(bid, targeting) {
+  const rtd = bid.rtd || {};
+  const jwRtd = {};
+  jwRtd[SUBMODULE_NAME] = Object.assign({}, rtd[SUBMODULE_NAME], { targeting });
+  bid.rtd = Object.assign({}, rtd, jwRtd);
+}
+
+function getPlayer(playerID) {
+  const jwplayer = window.jwplayer;
+  if (!jwplayer) {
+    logError('jwplayer.js was not found on page');
+    return;
+  }
+
+  const player = jwplayer(playerID);
+  if (!player || !player.getPlaylist) {
+    logError('player ID did not match any players');
+    return;
+  }
+  return player;
+}
diff --git a/modules/jwplayerRtdProvider.md b/modules/jwplayerRtdProvider.md
new file mode 100644
index 00000000000..7fb1bb13d74
--- /dev/null
+++ b/modules/jwplayerRtdProvider.md
@@ -0,0 +1,125 @@
+The purpose of this Real Time Data Provider is to allow publishers to target against their JW Player media without 
+having to integrate with the Player Bidding product. This prebid module makes JW Player's video ad targeting information accessible 
+to Bid Adapters.
+
+# Usage for Publishers:
+
+Compile the JW Player RTD Provider into your Prebid build:
+
+`gulp build --modules=jwplayerRtdProvider`
+
+Publishers must register JW Player as a real time data provider by setting up a Prebid Config conformant to the 
+following structure:
+
+```javascript
+const jwplayerDataProvider = {
+  name: "jwplayer"
+};
+
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      dataProviders: [
+          jwplayerDataProvider
+      ]
+    }
+});
+```
+Lastly, include the content's media ID and/or the player's ID in the matching AdUnit's `ortb2Imp.ext.data`:
+
+```javascript
+const adUnit = {
+  code: '/19968336/prebid_native_example_1',
+  ...,
+  ortb2Imp: {
+    ext: {
+      data: {
+        jwTargeting: {
+          // Note: the following Ids are placeholders and should be replaced with your Ids.
+          playerID: 'abcd',
+          mediaID: '1234'
+        }
+      }
+    }
+  }
+};
+
+pbjs.que.push(function() {
+    pbjs.addAdUnits([adUnit]);
+    pbjs.requestBids({
+        ...
+    });
+});
+``` 
+**Note**: The player 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.
+ 
+## Prefetching
+In order to prefetch targeting information for certain media, include the media IDs in the `jwplayerDataProvider` var and set `waitForIt` to `true`:
+
+```javascript
+const jwplayerDataProvider = {
+  name: "jwplayer",
+  waitForIt: true,
+  params: {
+    mediaIDs: ['abc', 'def', 'ghi', 'jkl']
+  }
+};
+```
+
+You must also set a value to `auctionDelay` in the config's `realTimeData` object 
+
+```javascript
+realTimeData = {
+  auctionDelay: 100,
+  ...
+};
+```
+
+# Usage for Bid Adapters:
+
+Implement the `buildRequests` function. When it is called, the `bidRequests` param will be an array of bids.
+Each bid for which targeting information was found will conform to the following object structure:
+
+```javascript
+{
+    adUnitCode: 'xyz',
+    bidId: 'abc',
+    ...,
+    rtd: {
+        jwplayer: {
+            targeting: {
+                segments: ['123', '456'],
+                content: {
+                    id: 'jw_abc123'
+                }
+            }
+        }   
+    }
+}
+```
+
+where:
+- `segments` is an array of jwpseg targeting segments, of type string.
+- `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.
+  
+**Example:**
+
+To view an example:
+ 
+- in your cli run:
+
+`gulp serve --modules=jwplayerRtdProvider`
+
+- in your browser, navigate to:
+
+`http://localhost:9999/integrationExamples/gpt/jwplayerRtdProvider_example.html`
+
+**Note:** the mediaIds in the example are placeholder values; replace them with your existing IDs.
+
+# Maintainer info
+
+Maintained by JW Player. For any questions, comments or feedback please contact Karim Mourra, karim@jwplayer.com
diff --git a/modules/kargoBidAdapter.js b/modules/kargoBidAdapter.js
index 31c35f4afe3..610f4558139 100644
--- a/modules/kargoBidAdapter.js
+++ b/modules/kargoBidAdapter.js
@@ -3,17 +3,19 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-const storage = getStorageManager();
 const BIDDER_CODE = 'kargo';
 const HOST = 'https://krk.kargo.com';
-const SYNC = 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}';
+const SYNC = 'https://crb.kargo.com/api/v1/initsyncrnd/{UUID}?seed={SEED}&idx={INDEX}&gdpr={GDPR}&gdpr_consent={GDPR_CONSENT}&us_privacy={US_PRIVACY}';
 const SYNC_COUNT = 5;
+const GVLID = 972;
+const storage = getStorageManager(GVLID, BIDDER_CODE);
 
 let sessionId,
   lastPageUrl,
   requestCounter;
 
 export const spec = {
+  gvlid: GVLID,
   code: BIDDER_CODE,
   isBidRequestValid: function(bid) {
     if (!bid || !bid.params) {
@@ -48,7 +50,7 @@ export const spec = {
       bidIDs: bidIds,
       bidSizes: bidSizes,
       prebidRawBidRequests: validBidRequests
-    }, spec._getAllMetadata(tdid, bidderRequest.uspConsent));
+    }, spec._getAllMetadata(tdid, bidderRequest.uspConsent, bidderRequest.gdprConsent));
     const encodedParams = encodeURIComponent(JSON.stringify(transformedParams));
     return Object.assign({}, bidderRequest, {
       method: 'GET',
@@ -65,7 +67,8 @@ export const spec = {
       let meta;
       if (adUnit.metadata && adUnit.metadata.landingPageDomain) {
         meta = {
-          clickUrl: adUnit.metadata.landingPageDomain
+          clickUrl: adUnit.metadata.landingPageDomain,
+          advertiserDomains: [adUnit.metadata.landingPageDomain]
         };
       }
       bidResponses.push({
@@ -84,15 +87,25 @@ export const spec = {
     }
     return bidResponses;
   },
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, usPrivacy) {
     const syncs = [];
     const seed = spec._generateRandomUuid();
     const clientId = spec._getClientId();
+    var gdpr = (gdprConsent && gdprConsent.gdprApplies) ? 1 : 0;
+    var gdprConsentString = (gdprConsent && gdprConsent.consentString) ? gdprConsent.consentString : '';
+    // don't sync if opted out via usPrivacy
+    if (typeof usPrivacy == 'string' && usPrivacy.length == 4 && usPrivacy[0] == 1 && usPrivacy[2] == 'Y') {
+      return syncs;
+    }
     if (syncOptions.iframeEnabled && seed && clientId) {
       for (let i = 0; i < SYNC_COUNT; i++) {
         syncs.push({
           type: 'iframe',
-          url: SYNC.replace('{UUID}', clientId).replace('{SEED}', seed).replace('{INDEX}', i)
+          url: SYNC.replace('{UUID}', clientId).replace('{SEED}', seed)
+            .replace('{INDEX}', i)
+            .replace('{GDPR}', gdpr)
+            .replace('{GDPR_CONSENT}', gdprConsentString)
+            .replace('{US_PRIVACY}', usPrivacy || '')
         });
       }
     }
@@ -182,7 +195,7 @@ export const spec = {
     }
   },
 
-  _getUserIds(tdid, usp) {
+  _getUserIds(tdid, usp, gdpr) {
     const crb = spec._getCrb();
     const userIds = {
       kargoID: crb.userId,
@@ -191,6 +204,16 @@ export const spec = {
       optOut: crb.optOut,
       usp: usp
     };
+
+    try {
+      if (gdpr) {
+        userIds['gdpr'] = {
+          consent: gdpr.consentString || '',
+          applies: !!gdpr.gdprApplies,
+        }
+      }
+    } catch (e) {
+    }
     if (tdid) {
       userIds.tdID = tdid;
     }
@@ -202,9 +225,9 @@ export const spec = {
     return crb.clientId;
   },
 
-  _getAllMetadata(tdid, usp) {
+  _getAllMetadata(tdid, usp, gdpr) {
     return {
-      userIDs: spec._getUserIds(tdid, usp),
+      userIDs: spec._getUserIds(tdid, usp, gdpr),
       krux: spec._getKrux(),
       pageURL: window.location.href,
       rawCRB: spec._readCookie('krg_crb'),
diff --git a/modules/koblerBidAdapter.js b/modules/koblerBidAdapter.js
new file mode 100644
index 00000000000..59d1639a329
--- /dev/null
+++ b/modules/koblerBidAdapter.js
@@ -0,0 +1,238 @@
+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';
+import {getRefererInfo} from '../src/refererDetection.js';
+
+const BIDDER_CODE = 'kobler';
+const BIDDER_ENDPOINT = 'https://bid.essrtb.com/bid/prebid_rtb_call';
+const TIMEOUT_NOTIFICATION_ENDPOINT = 'https://bid.essrtb.com/notify/prebid_timeout';
+const SUPPORTED_CURRENCY = 'USD';
+const DEFAULT_TIMEOUT = 1000;
+const TIME_TO_LIVE_IN_SECONDS = 10 * 60;
+
+export const isBidRequestValid = function (bid) {
+  return !!(bid && bid.bidId && bid.params && bid.params.placementId);
+};
+
+export const buildRequests = function (validBidRequests, bidderRequest) {
+  return {
+    method: 'POST',
+    url: BIDDER_ENDPOINT,
+    data: buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest),
+    options: {
+      contentType: 'application/json'
+    }
+  };
+};
+
+export const interpretResponse = function (serverResponse) {
+  const adServerPriceCurrency = config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  const res = serverResponse.body;
+  const bids = []
+  if (res) {
+    res.seatbid.forEach(sb => {
+      sb.bid.forEach(b => {
+        const adWithCorrectCurrency = b.adm
+          .replace(/\${AUCTION_PRICE_CURRENCY}/g, adServerPriceCurrency);
+        bids.push({
+          requestId: b.impid,
+          cpm: b.price,
+          currency: res.cur,
+          width: b.w,
+          height: b.h,
+          creativeId: b.crid,
+          dealId: b.dealid,
+          netRevenue: true,
+          ttl: TIME_TO_LIVE_IN_SECONDS,
+          ad: adWithCorrectCurrency,
+          nurl: b.nurl,
+          meta: {
+            advertiserDomains: b.adomain
+          }
+        })
+      })
+    });
+  }
+  return bids;
+};
+
+export const onBidWon = function (bid) {
+  const cpm = bid.cpm || 0;
+  const cpmCurrency = bid.currency || SUPPORTED_CURRENCY;
+  const adServerPrice = utils.deepAccess(bid, 'adserverTargeting.hb_pb', 0);
+  const adServerPriceCurrency = config.getConfig('currency.adServerCurrency') || SUPPORTED_CURRENCY;
+  if (utils.isStr(bid.nurl) && bid.nurl !== '') {
+    const winNotificationUrl = utils.replaceAuctionPrice(bid.nurl, cpm)
+      .replace(/\${AUCTION_PRICE_CURRENCY}/g, cpmCurrency)
+      .replace(/\${AD_SERVER_PRICE}/g, adServerPrice)
+      .replace(/\${AD_SERVER_PRICE_CURRENCY}/g, adServerPriceCurrency);
+    utils.triggerPixel(winNotificationUrl);
+  }
+};
+
+export const onTimeout = function (timeoutDataArray) {
+  if (utils.isArray(timeoutDataArray)) {
+    const refererInfo = getRefererInfo();
+    const pageUrl = (refererInfo && refererInfo.referer)
+      ? refererInfo.referer
+      : window.location.href;
+    timeoutDataArray.forEach(timeoutData => {
+      const query = utils.parseQueryStringParameters({
+        ad_unit_code: timeoutData.adUnitCode,
+        auction_id: timeoutData.auctionId,
+        bid_id: timeoutData.bidId,
+        timeout: timeoutData.timeout,
+        placement_id: utils.deepAccess(timeoutData, 'params.0.placementId'),
+        page_url: pageUrl,
+      });
+      const timeoutNotificationUrl = `${TIMEOUT_NOTIFICATION_ENDPOINT}?${query}`;
+      utils.triggerPixel(timeoutNotificationUrl);
+    });
+  }
+};
+
+function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
+  const imps = validBidRequests.map(buildOpenRtbImpObject);
+  const timeout = bidderRequest.timeout || config.getConfig('bidderTimeout') || DEFAULT_TIMEOUT;
+  const pageUrl = (bidderRequest.refererInfo && bidderRequest.refererInfo.referer)
+    ? bidderRequest.refererInfo.referer
+    : window.location.href;
+
+  const request = {
+    id: bidderRequest.auctionId,
+    at: 1,
+    tmax: timeout,
+    cur: [SUPPORTED_CURRENCY],
+    imp: imps,
+    device: {
+      devicetype: getDevice(),
+      geo: getGeo(validBidRequests[0])
+    },
+    site: {
+      page: pageUrl,
+    },
+    test: getTest(validBidRequests[0])
+  };
+
+  return JSON.stringify(request);
+}
+
+function buildOpenRtbImpObject(validBidRequest) {
+  const sizes = getSizes(validBidRequest);
+  const mainSize = sizes[0];
+  const floorInfo = getFloorInfo(validBidRequest, mainSize);
+
+  return {
+    id: validBidRequest.bidId,
+    banner: {
+      format: buildFormatArray(sizes),
+      w: mainSize[0],
+      h: mainSize[1],
+      ext: {
+        kobler: {
+          pos: getPosition(validBidRequest)
+        }
+      }
+    },
+    tagid: validBidRequest.params.placementId,
+    bidfloor: floorInfo.floor,
+    bidfloorcur: floorInfo.currency,
+    pmp: buildPmpObject(validBidRequest)
+  };
+}
+
+function getDevice() {
+  const ws = utils.getWindowSelf();
+  const ua = ws.navigator.userAgent;
+
+  if (/(tablet|ipad|playbook|silk|android 3.0|xoom|sch-i800|kindle)|(android(?!.*mobi))/i
+    .test(ua.toLowerCase())) {
+    return 5; // tablet
+  }
+  if (/(android|bb\d+|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([46])0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i
+    .test(ua.toLowerCase())) {
+    return 4; // phone
+  }
+  return 2; // personal computers
+}
+
+function getGeo(validBidRequest) {
+  if (validBidRequest.params.zip) {
+    return {
+      zip: validBidRequest.params.zip
+    };
+  }
+  return {};
+}
+
+function getTest(validBidRequest) {
+  return validBidRequest.params.test ? 1 : 0;
+}
+
+function getSizes(validBidRequest) {
+  const sizes = utils.deepAccess(validBidRequest, 'mediaTypes.banner.sizes', validBidRequest.sizes);
+  if (utils.isArray(sizes) && sizes.length > 0) {
+    return sizes;
+  }
+
+  return [[0, 0]];
+}
+
+function buildFormatArray(sizes) {
+  return sizes.map(size => {
+    return {
+      w: size[0],
+      h: size[1]
+    };
+  });
+}
+
+function getPosition(validBidRequest) {
+  return parseInt(validBidRequest.params.position) || 0;
+}
+
+function getFloorInfo(validBidRequest, mainSize) {
+  if (typeof validBidRequest.getFloor === 'function') {
+    const sizeParam = mainSize[0] === 0 && mainSize[1] === 0 ? '*' : mainSize;
+    return validBidRequest.getFloor({
+      currency: SUPPORTED_CURRENCY,
+      mediaType: BANNER,
+      size: sizeParam
+    });
+  } else {
+    return {
+      currency: SUPPORTED_CURRENCY,
+      floor: getFloorPrice(validBidRequest)
+    };
+  }
+}
+
+function getFloorPrice(validBidRequest) {
+  return parseFloat(validBidRequest.params.floorPrice) || 0.0;
+}
+
+function buildPmpObject(validBidRequest) {
+  if (validBidRequest.params.dealIds) {
+    return {
+      deals: validBidRequest.params.dealIds.map(dealId => {
+        return {
+          id: dealId
+        };
+      })
+    };
+  }
+  return {};
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  onBidWon,
+  onTimeout
+};
+
+registerBidder(spec);
diff --git a/modules/koblerBidAdapter.md b/modules/koblerBidAdapter.md
new file mode 100644
index 00000000000..7a7b2388367
--- /dev/null
+++ b/modules/koblerBidAdapter.md
@@ -0,0 +1,67 @@
+# Overview
+
+**Module Name**: Kobler Bidder Adapter  
+**Module Type**: Bidder Adapter  
+**Maintainer**: bidding-support@kobler.no  
+
+# Description
+
+Connects to Kobler's demand sources.
+
+This adapter currently only supports Banner Ads.
+
+# Parameters
+
+| Parameter (in `params`) | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| placementId | Required | String | The identifier of the placement, it has to be issued by Kobler. | `'xjer0ch8'` |
+| zip | Optional | String | Zip code of the user or the medium. When multiple ad units are submitted together, it is enough to set this parameter on the first one. | `'102 22'` |
+| test | Optional | Boolean | Whether the request is for testing only. When multiple ad units are submitted together, it is enough to set this parameter on the first one. Defaults to false. | `true` |
+| floorPrice | Optional | Float | Floor price in CPM and USD. Can be used as an alternative to the [Floors module](https://docs.prebid.org/dev-docs/modules/floors.html), which is also supported by this adapter. Defaults to 0. | `5.0` |
+| position | Optional | Integer | The position of the ad unit. Can be used to differentiate between ad units if the same placement ID is used across multiple ad units. The first ad unit should have a `position` of 0, the second one should have a `position` of 1 and so on. Defaults to 0. | `1` |
+| dealIds | Optional | Array of Strings | Array of deal IDs. | `['abc328745', 'mxw243253']` |
+
+# Test Parameters
+```javascript
+  const adUnits = [{
+    code: 'div-gpt-ad-1460505748561-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[320, 250], [300, 250]],
+        }
+    },
+    bids: [{
+      bidder: 'kobler',
+      params: {
+        placementId: 'k5H7et3R0'
+      }
+    }]
+  }];
+```
+
+In order to see a sample bid from Kobler (without a proper setup), you have to also do the following:
+- Change the [`refererInfo` function](https://github.com/prebid/Prebid.js/blob/master/src/refererDetection.js) to return `'https://www.tv2.no/a/11734615'` as a [`referer`](https://github.com/prebid/Prebid.js/blob/caead3ccccc448e4cd09d074fd9f8833f56fe9b3/src/refererDetection.js#L169). This is necessary because Kobler only bids on recognized articles. 
+- Change the adapter's [`BIDDER_ENDPOINT`](https://github.com/prebid/Prebid.js/blob/master/modules/koblerBidAdapter.js#L8) to `'https://bid-service.dev.essrtb.com/bid/prebid_rtb_call'`. This endpoint belongs to the development server that is set up to always return a bid for the correct `placementId` and page URL combination. 
+
+# Test Optional Parameters
+```javascript
+  const adUnits = [{
+    code: 'div-gpt-ad-1460505748561-1',
+    mediaTypes: {
+        banner: {
+            sizes: [[320, 250], [300, 250]],
+        }
+    },
+    bids: [{
+      bidder: 'kobler',
+      params: {
+        placementId: 'k5H7et3R0',
+        zip: '102 22',
+        test: true,
+        floorPrice: 5.0,
+        position: 1,
+        dealIds: ['abc328745', 'mxw243253']
+      }
+    }]
+  }];
+```
diff --git a/modules/krushmediaBidAdapter.js b/modules/krushmediaBidAdapter.js
new file mode 100644
index 00000000000..de1cce503e3
--- /dev/null
+++ b/modules/krushmediaBidAdapter.js
@@ -0,0 +1,123 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.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;
+  }
+}
+
+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) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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 || {},
+      };
+
+      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];
+      } 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)) {
+        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
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/krushmediaBidAdapter.md b/modules/krushmediaBidAdapter.md
new file mode 100644
index 00000000000..7bf7c4fe491
--- /dev/null
+++ b/modules/krushmediaBidAdapter.md
@@ -0,0 +1,80 @@
+# Overview
+
+```
+Module Name: krushmedia Bidder Adapter
+Module Type: krushmedia Bidder Adapter
+Maintainer: adapter@krushmedia.com
+```
+
+# Description
+
+Module that connects to krushmedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                // Will return static test banner
+                {
+                    code: 'adunit1',
+                    mediaTypes: {
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'banner'
+                            }
+                        }
+                    ]
+                },
+                // Will return test vast xml. All video params are stored under placement in publishers UI
+                {
+                    code: 'addunit2',
+                    mediaTypes: {
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'video'
+                            }
+                        }
+                    ]
+                },
+                {
+                    code: 'addunit3',
+                    mediaTypes: {
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            body: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids: [
+                        {
+                            bidder: 'krushmedia',
+                            params: {
+                                key: 0,
+                                traffic: 'native'
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/kubientBidAdapter.js b/modules/kubientBidAdapter.js
new file mode 100644
index 00000000000..8f6ea53ecce
--- /dev/null
+++ b/modules/kubientBidAdapter.js
@@ -0,0 +1,111 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'kubient';
+const END_POINT = 'https://kssp.kbntx.ch/pbjs';
+const VERSION = '1.0';
+const VENDOR_ID = 794;
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: VENDOR_ID,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.params);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (!validBidRequests || !bidderRequest) {
+      return;
+    }
+    const result = validBidRequests.map(function (bid) {
+      let data = {
+        v: VERSION,
+        requestId: bid.bidderRequestId,
+        adSlots: [{
+          bidId: bid.bidId,
+          zoneId: bid.params.zoneid || '',
+          floor: bid.params.floor || 0.0,
+          sizes: bid.sizes || [],
+          schain: bid.schain || {},
+          mediaTypes: bid.mediaTypes
+        }],
+        referer: (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) ? bidderRequest.refererInfo.referer : null,
+        tmax: bidderRequest.timeout,
+        gdpr: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0,
+        consent: (bidderRequest.gdprConsent && bidderRequest.gdprConsent.consentString) ? bidderRequest.gdprConsent.consentString : null,
+        consentGiven: kubientGetConsentGiven(bidderRequest.gdprConsent),
+        uspConsent: bidderRequest.uspConsent
+      };
+      return {
+        method: 'POST',
+        url: END_POINT,
+        data: JSON.stringify(data)
+      };
+    });
+    return result;
+  },
+  interpretResponse: function interpretResponse(serverResponse, request) {
+    if (!serverResponse || !serverResponse.body || !serverResponse.body.seatbid) {
+      return [];
+    }
+    let bidResponses = [];
+    serverResponse.body.seatbid.forEach(seatbid => {
+      let bids = seatbid.bid || [];
+      bids.forEach(bid => {
+        bidResponses.push({
+          requestId: bid.bidId,
+          cpm: bid.price,
+          currency: bid.cur,
+          width: bid.w,
+          height: bid.h,
+          creativeId: bid.creativeId,
+          netRevenue: bid.netRevenue,
+          ttl: bid.ttl,
+          ad: bid.adm
+        });
+      });
+    });
+    return bidResponses;
+  },
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    let gdprParams = '';
+    if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+      gdprParams = `?consent_str=${gdprConsent.consentString}`;
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = gdprParams + `&gdpr=${Number(gdprConsent.gdprApplies)}`;
+      }
+      gdprParams = gdprParams + `&consent_given=` + kubientGetConsentGiven(gdprConsent);
+    }
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'https://kdmp.kbntx.ch/init.html' + gdprParams
+      });
+    }
+    if (syncOptions.pixelEnabled) {
+      syncs.push({
+        type: 'image',
+        url: 'https://kdmp.kbntx.ch/init.png' + gdprParams
+      });
+    }
+    return syncs;
+  }
+};
+
+function kubientGetConsentGiven(gdprConsent) {
+  let consentGiven = 0;
+  if (typeof gdprConsent !== 'undefined') {
+    let apiVersion = utils.deepAccess(gdprConsent, `apiVersion`);
+    switch (apiVersion) {
+      case 1:
+        consentGiven = utils.deepAccess(gdprConsent, `vendorData.vendorConsents.${VENDOR_ID}`) ? 1 : 0;
+        break;
+      case 2:
+        consentGiven = utils.deepAccess(gdprConsent, `vendorData.vendor.consents.${VENDOR_ID}`) ? 1 : 0;
+        break;
+    }
+  }
+  return consentGiven;
+}
+registerBidder(spec);
diff --git a/modules/kubientBidAdapter.md b/modules/kubientBidAdapter.md
new file mode 100644
index 00000000000..9f3e1d5f52e
--- /dev/null
+++ b/modules/kubientBidAdapter.md
@@ -0,0 +1,26 @@
+# Overview
+​
+**Module Name**: Kubient Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**:  artem.aleksashkin@kubient.com
+​
+# Description
+​
+Connects to Kubient KSSP demand source to fetch bids.  
+​
+# Test Parameters
+```
+    var adUnits = [{
+      code: 'banner-ad-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250],[728, 90]],
+        }
+      },
+            bids: [{
+                "bidder": "kubient",
+                "params": {
+                    "zoneid": "5fbb948f1e22b",
+                }   
+            }]      
+        }];         
diff --git a/modules/lemmaBidAdapter.js b/modules/lemmaBidAdapter.js
index 1ad660e5916..c7440743d2c 100644
--- a/modules/lemmaBidAdapter.js
+++ b/modules/lemmaBidAdapter.js
@@ -5,10 +5,13 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 var BIDDER_CODE = 'lemma';
 var LOG_WARN_PREFIX = 'LEMMA: ';
 var ENDPOINT = 'https://ads.lemmatechnologies.com/lemma/servad';
+var USER_SYNC = 'https://sync.lemmatechnologies.com/js/usersync.html?';
 var DEFAULT_CURRENCY = 'USD';
 var AUCTION_TYPE = 2;
 var DEFAULT_TMAX = 300;
 var DEFAULT_NET_REVENUE = false;
+var pubId = 0;
+var adunitId = 0;
 
 export var spec = {
 
@@ -57,6 +60,17 @@ export var spec = {
   interpretResponse: (response, request) => {
     return parseRTBResponse(request, response.body);
   },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    let syncurl = USER_SYNC + 'pid=' + pubId;
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: syncurl
+      }];
+    } else {
+      utils.logWarn(LOG_WARN_PREFIX + 'Please enable iframe based user sync.');
+    }
+  },
 };
 
 function _initConf(refererInfo) {
@@ -70,6 +84,30 @@ function _initConf(refererInfo) {
   return conf;
 }
 
+function _setFloor(impObj, bid) {
+  let bidFloor = -1;
+  // get lowest floor from floorModule
+  if (typeof bid.getFloor === 'function') {
+    [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))) {
+          let mediaTypeFloor = parseFloat(floorInfo.floor);
+          bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
+        }
+      }
+    });
+  }
+  // get highest from impObj.bidfllor and floor from floor module
+  // as we are using Math.max, it is ok if we have not got any floor from floorModule, then value of bidFloor will be -1
+  if (impObj.bidfloor) {
+    bidFloor = Math.max(bidFloor, impObj.bidfloor)
+  }
+
+  // assign value only if bidFloor is > 0
+  impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : undefined);
+}
+
 function parseRTBResponse(request, response) {
   var bidResponses = [];
   try {
@@ -96,9 +134,9 @@ function parseRTBResponse(request, response) {
             newBid.dealId = bid.dealid;
           }
           if (req.imp && req.imp.length > 0) {
-            newBid.mediaType = req.mediaType;
             req.imp.forEach(robj => {
               if (bid.impid === robj.id) {
+                _checkMediaType(bid.adm, newBid);
                 switch (newBid.mediaType) {
                   case BANNER:
                     break;
@@ -167,8 +205,8 @@ function _getImpressionArray(request) {
 function endPointURL(request) {
   var params = request && request[0].params ? request[0].params : null;
   if (params) {
-    var pubId = params.pubId ? params.pubId : 0;
-    var adunitId = params.adunitId ? params.adunitId : 0;
+    pubId = params.pubId ? params.pubId : 0;
+    adunitId = params.adunitId ? params.adunitId : 0;
     return ENDPOINT + '?pid=' + pubId + '&aid=' + adunitId;
   }
   return null;
@@ -183,7 +221,7 @@ function _getDomain(url) {
 function _getSiteObject(request, conf) {
   var params = request && request.params ? request.params : null;
   if (params) {
-    var pubId = params.pubId ? params.pubId : '0';
+    pubId = params.pubId ? params.pubId : '0';
     var siteId = params.siteId ? params.siteId : '0';
     var appParams = params.app;
     if (!appParams) {
@@ -204,7 +242,7 @@ function _getSiteObject(request, conf) {
 function _getAppObject(request) {
   var params = request && request.params ? request.params : null;
   if (params) {
-    var pubId = params.pubId ? params.pubId : 0;
+    pubId = params.pubId ? params.pubId : 0;
     var appParams = params.app;
     if (appParams) {
       return {
@@ -251,10 +289,6 @@ function _getDeviceObject(request) {
 
 function setOtherParams(request, ortbRequest) {
   var params = request && request.params ? request.params : null;
-  if (request && request.gdprConsent) {
-    ortbRequest.regs = { ext: { gdpr: request.gdprConsent.gdprApplies ? 1 : 0 } };
-    ortbRequest.user = { ext: { consent: request.gdprConsent.consentString } };
-  }
   if (params) {
     ortbRequest.tmax = params.tmax;
     ortbRequest.bcat = params.bcat;
@@ -342,11 +376,9 @@ function _getImpressionObject(bid) {
     secure: window.location.protocol === 'https:' ? 1 : 0,
     bidfloorcur: params.currency ? params.currency : DEFAULT_CURRENCY
   };
-
   if (params.bidFloor) {
     impression.bidfloor = params.bidFloor;
   }
-
   if (bid.hasOwnProperty('mediaTypes')) {
     for (mediaTypes in bid.mediaTypes) {
       switch (mediaTypes) {
@@ -382,7 +414,7 @@ function _getImpressionObject(bid) {
     }
     impression.banner = bObj;
   }
-
+  _setFloor(impression, bid);
   return impression.hasOwnProperty(BANNER) ||
         impression.hasOwnProperty(VIDEO) ? impression : undefined;
 }
@@ -398,4 +430,13 @@ function parse(rawResp) {
   return null;
 }
 
+function _checkMediaType(adm, newBid) {
+  // Create a regex here to check the strings
+  var videoRegex = new RegExp(/VAST.*version/);
+  if (videoRegex.test(adm)) {
+    newBid.mediaType = VIDEO;
+  } else {
+    newBid.mediaType = BANNER;
+  }
+}
 registerBidder(spec);
diff --git a/modules/liveIntentIdSystem.js b/modules/liveIntentIdSystem.js
index bd2638e5936..8534f005585 100644
--- a/modules/liveIntentIdSystem.js
+++ b/modules/liveIntentIdSystem.js
@@ -5,14 +5,33 @@
  * @requires module:modules/userId
  */
 import * as utils from '../src/utils.js';
-import { ajax } from '../src/ajax.js';
+import { triggerPixel } from '../src/utils.js';
+import { ajaxBuilder } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
-import { LiveConnect } from 'live-connect-js/cjs/live-connect.js';
-import { uspDataHandler } from '../src/adapterManager.js';
+import { LiveConnect } from 'live-connect-js/esm/initializer.js';
+import { gdprDataHandler, uspDataHandler } from '../src/adapterManager.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { MinimalLiveConnect } from 'live-connect-js/esm/minimal-live-connect.js';
 
 const MODULE_NAME = 'liveIntentId';
 export const storage = getStorageManager(null, MODULE_NAME);
+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;
@@ -24,26 +43,18 @@ export function reset() {
   if (window && window.liQ) {
     window.liQ = [];
   }
+  liveIntentIdSubmodule.setModuleMode(null)
   eventFired = false;
   liveConnect = null;
 }
 
 function parseLiveIntentCollectorConfig(collectConfig) {
   const config = {};
-  if (collectConfig) {
-    if (collectConfig.appId) {
-      config.appId = collectConfig.appId;
-    }
-    if (collectConfig.fpiStorageStrategy) {
-      config.storageStrategy = collectConfig.fpiStorageStrategy;
-    }
-    if (collectConfig.fpiExpirationDays) {
-      config.expirationDays = collectConfig.fpiExpirationDays;
-    }
-    if (collectConfig.collectorUrl) {
-      config.collectorUrl = collectConfig.collectorUrl;
-    }
-  }
+  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);
   return config;
 }
 
@@ -64,18 +75,33 @@ function initializeLiveConnect(configParams) {
   if (configParams.partner) {
     identityResolutionConfig.source = configParams.partner
   }
+  if (configParams.ajaxTimeout) {
+    identityResolutionConfig.ajaxTimeout = configParams.ajaxTimeout;
+  }
 
   const liveConnectConfig = parseLiveIntentCollectorConfig(configParams.liCollectConfig);
   liveConnectConfig.wrapperName = 'prebid';
   liveConnectConfig.identityResolutionConfig = identityResolutionConfig;
   liveConnectConfig.identifiersToResolve = configParams.identifiersToResolve || [];
+  if (configParams.emailHash) {
+    liveConnectConfig.eventSource = { hash: configParams.emailHash }
+  }
   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, which means that all LS & Cookie manipulation will go through PBJS utils.
-  liveConnect = LiveConnect(liveConnectConfig, storage);
+  // The second param is the storage object, LS & Cookie manipulation uses PBJS utils.
+  // The third param is the ajax and pixel object, the ajax and pixel use PBJS utils.
+  liveConnect = liveIntentIdSubmodule.getInitializer()(liveConnectConfig, storage, calls);
+  if (configParams.emailHash) {
+    liveConnect.push({ hash: configParams.emailHash })
+  }
   return liveConnect;
 }
 
@@ -88,24 +114,33 @@ function tryFireEvent() {
 
 /** @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 this.moduleMode === 'minimal' ? MinimalLiveConnect : LiveConnect
+  },
+
   /**
    * 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 {SubmoduleParams|undefined} [configParams]
+   * @param {SubmoduleConfig|undefined} config
    * @returns {{lipb:Object}}
    */
-  decode(value, configParams) {
+  decode(value, config) {
+    const configParams = (config && config.params) || {};
     function composeIdObject(value) {
-      const base = { 'lipbid': value['unifiedId'] };
+      const base = { 'lipbid': value.unifiedId };
       delete value.unifiedId;
       return { 'lipb': { ...base, ...value } };
     }
@@ -121,38 +156,29 @@ export const liveIntentIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
+    const configParams = (config && config.params) || {};
     const liveConnect = initializeLiveConnect(configParams);
     if (!liveConnect) {
       return;
     }
     tryFireEvent();
-    // Don't do the internal ajax call, but use the composed url and fire it via PBJS ajax module
-    const url = liveConnect.resolutionCallUrl();
-    const result = function (callback) {
-      const callbacks = {
-        success: response => {
-          let responseObj = {};
-          if (response) {
-            try {
-              responseObj = JSON.parse(response);
-            } catch (error) {
-              utils.logError(error);
-            }
-          }
-          callback(responseObj);
+    const result = function(callback) {
+      liveConnect.resolve(
+        response => {
+          callback(response);
         },
-        error: error => {
+        error => {
           utils.logError(`${MODULE_NAME}: ID fetch encountered an error: `, error);
           callback();
         }
-      };
-      ajax(url, callbacks, undefined, { method: 'GET', withCredentials: true });
-    };
-    return {callback: result};
+      )
+    }
+
+    return { callback: result };
   }
 };
 
diff --git a/modules/livewrappedAnalyticsAdapter.js b/modules/livewrappedAnalyticsAdapter.js
index b331448161e..29b57e3dd97 100644
--- a/modules/livewrappedAnalyticsAdapter.js
+++ b/modules/livewrappedAnalyticsAdapter.js
@@ -34,6 +34,18 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
         cache.auctions[args.auctionId].timeStamp = args.start;
 
         args.bids.forEach(function(bidRequest) {
+          cache.auctions[args.auctionId].gdprApplies = args.gdprConsent ? args.gdprConsent.gdprApplies : undefined;
+          cache.auctions[args.auctionId].gdprConsent = args.gdprConsent ? args.gdprConsent.consentString : undefined;
+          let lwFloor;
+
+          if (bidRequest.lwflr) {
+            lwFloor = bidRequest.lwflr.flr;
+
+            let buyerFloor = bidRequest.lwflr.bflrs ? bidRequest.lwflr.bflrs[bidRequest.bidder] : undefined;
+
+            lwFloor = buyerFloor || lwFloor;
+          }
+
           cache.auctions[args.auctionId].bids[bidRequest.bidId] = {
             bidder: bidRequest.bidder,
             adUnit: bidRequest.adUnitCode,
@@ -42,7 +54,12 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
             timeout: false,
             sendStatus: 0,
             readyToSend: 0,
-            start: args.start
+            start: args.start,
+            lwFloor: lwFloor,
+            floorData: bidRequest.floorData,
+            auc: bidRequest.auc,
+            buc: bidRequest.buc,
+            lw: bidRequest.lw
           }
 
           utils.logInfo(bidRequest);
@@ -59,7 +76,7 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
         bidResponse.cpm = args.cpm;
         bidResponse.ttr = args.timeToRespond;
         bidResponse.readyToSend = 1;
-        bidResponse.mediaType = args.mediaType == 'native' ? 2 : 1;
+        bidResponse.mediaType = args.mediaType == 'native' ? 2 : (args.mediaType == 'video' ? 4 : 1);
         if (!bidResponse.ttr) {
           bidResponse.ttr = time - bidResponse.start;
         }
@@ -67,6 +84,7 @@ let livewrappedAnalyticsAdapter = Object.assign(adapter({EMPTYURL, ANALYTICSTYPE
           cache.auctions[args.auctionId].bidAdUnits[bidResponse.adUnit] =
             {
               sent: 0,
+              lw: bidResponse.lw,
               timeStamp: cache.auctions[args.auctionId].timeStamp
             };
         }
@@ -116,12 +134,15 @@ livewrappedAnalyticsAdapter.enableAnalytics = function (config) {
 };
 
 livewrappedAnalyticsAdapter.sendEvents = function() {
+  var sentRequests = getSentRequests();
   var events = {
     publisherId: initOptions.publisherId,
-    requests: getSentRequests(),
-    responses: getResponses(),
-    wins: getWins(),
-    timeouts: getTimeouts(),
+    gdpr: sentRequests.gdpr,
+    auctionIds: sentRequests.auctionIds,
+    requests: sentRequests.sentRequests,
+    responses: getResponses(sentRequests.gdpr, sentRequests.auctionIds),
+    wins: getWins(sentRequests.gdpr, sentRequests.auctionIds),
+    timeouts: getTimeouts(sentRequests.auctionIds),
     bidAdUnits: getbidAdUnits(),
     rcv: getAdblockerRecovered()
   };
@@ -144,10 +165,15 @@ function getAdblockerRecovered() {
 
 function getSentRequests() {
   var sentRequests = [];
+  var gdpr = [];
+  var auctionIds = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
+    let auction = cache.auctions[auctionId];
+    let gdprPos = getGdprPos(gdpr, auction);
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
+
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
-      let auction = cache.auctions[auctionId];
       let bid = auction.bids[bidId];
       if (!(bid.sendStatus & REQUESTSENT)) {
         bid.sendStatus |= REQUESTSENT;
@@ -155,21 +181,29 @@ function getSentRequests() {
         sentRequests.push({
           timeStamp: auction.timeStamp,
           adUnit: bid.adUnit,
-          bidder: bid.bidder
+          bidder: bid.bidder,
+          gdpr: gdprPos,
+          floor: bid.lwFloor,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
   });
 
-  return sentRequests;
+  return {gdpr: gdpr, auctionIds: auctionIds, sentRequests: sentRequests};
 }
 
-function getResponses() {
+function getResponses(gdpr, auctionIds) {
   var responses = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId)
       let bid = auction.bids[bidId];
       if (bid.readyToSend && !(bid.sendStatus & RESPONSESENT) && !bid.timeout) {
         bid.sendStatus |= RESPONSESENT;
@@ -183,7 +217,14 @@ function getResponses() {
           cpm: bid.cpm,
           ttr: bid.ttr,
           IsBid: bid.isBid,
-          mediaType: bid.mediaType
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.floorData ? bid.floorData.floorValue : bid.lwFloor,
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
@@ -192,13 +233,16 @@ function getResponses() {
   return responses;
 }
 
-function getWins() {
+function getWins(gdpr, auctionIds) {
   var wins = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
+      let gdprPos = getGdprPos(gdpr, auction);
+      let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
       let bid = auction.bids[bidId];
+
       if (!(bid.sendStatus & WINSENT) && bid.won) {
         bid.sendStatus |= WINSENT;
 
@@ -209,7 +253,14 @@ function getWins() {
           width: bid.width,
           height: bid.height,
           cpm: bid.cpm,
-          mediaType: bid.mediaType
+          mediaType: bid.mediaType,
+          gdpr: gdprPos,
+          floor: bid.floorData ? bid.floorData.floorValue : bid.lwFloor,
+          floorCur: bid.floorData ? bid.floorData.floorCurrency : undefined,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
@@ -218,10 +269,42 @@ function getWins() {
   return wins;
 }
 
-function getTimeouts() {
+function getGdprPos(gdpr, auction) {
+  var gdprPos = 0;
+  for (gdprPos = 0; gdprPos < gdpr.length; gdprPos++) {
+    if (gdpr[gdprPos].gdprApplies == auction.gdprApplies &&
+        gdpr[gdprPos].gdprConsent == auction.gdprConsent) {
+      break;
+    }
+  }
+
+  if (gdprPos == gdpr.length) {
+    gdpr[gdprPos] = {gdprApplies: auction.gdprApplies, gdprConsent: auction.gdprConsent};
+  }
+
+  return gdprPos;
+}
+
+function getAuctionIdPos(auctionIds, auctionId) {
+  var auctionIdPos = 0;
+  for (auctionIdPos = 0; auctionIdPos < auctionIds.length; auctionIdPos++) {
+    if (auctionIds[auctionIdPos] == auctionId) {
+      break;
+    }
+  }
+
+  if (auctionIdPos == auctionIds.length) {
+    auctionIds[auctionIdPos] = auctionId;
+  }
+
+  return auctionIdPos;
+}
+
+function getTimeouts(auctionIds) {
   var timeouts = [];
 
   Object.keys(cache.auctions).forEach(auctionId => {
+    let auctionIdPos = getAuctionIdPos(auctionIds, auctionId);
     Object.keys(cache.auctions[auctionId].bids).forEach(bidId => {
       let auction = cache.auctions[auctionId];
       let bid = auction.bids[bidId];
@@ -231,7 +314,11 @@ function getTimeouts() {
         timeouts.push({
           bidder: bid.bidder,
           adUnit: bid.adUnit,
-          timeStamp: auction.timeStamp
+          timeStamp: auction.timeStamp,
+          auctionId: auctionIdPos,
+          auc: bid.auc,
+          buc: bid.buc,
+          lw: bid.lw
         });
       }
     });
@@ -252,7 +339,8 @@ function getbidAdUnits() {
 
         bidAdUnits.push({
           adUnit: adUnit,
-          timeStamp: bidAdUnit.timeStamp
+          timeStamp: bidAdUnit.timeStamp,
+          lw: bidAdUnit.lw
         });
       }
     });
diff --git a/modules/livewrappedAnalyticsAdapter.md b/modules/livewrappedAnalyticsAdapter.md
new file mode 100644
index 00000000000..de4f352aa19
--- /dev/null
+++ b/modules/livewrappedAnalyticsAdapter.md
@@ -0,0 +1,22 @@
+# Overview
+Module Name: Livewrapped Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: info@livewrapped.com
+
+# Description
+
+Analytics adapter for Livewrapped AB. In order to use the adapter, please contact Livewrapped AB.
+
+# Test Parameters
+
+```
+{
+  provider: 'livewrapped',
+    options : {
+      publisherId: "64c01620-fa98-4936-9794-6001d8ebfdb0"
+    }
+}
+
+```
diff --git a/modules/livewrappedBidAdapter.js b/modules/livewrappedBidAdapter.js
index 78b29ab5016..93552638007 100644
--- a/modules/livewrappedBidAdapter.js
+++ b/modules/livewrappedBidAdapter.js
@@ -2,18 +2,19 @@ import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { config } from '../src/config.js';
 import find from 'core-js-pure/features/array/find.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
 
 export const storage = getStorageManager();
 
 const BIDDER_CODE = 'livewrapped';
 export const URL = 'https://lwadm.com/ad';
-const VERSION = '1.3';
+const VERSION = '1.4';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
+  gvlid: 919,
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -80,6 +81,8 @@ export const spec = {
       version: VERSION,
       gdprApplies: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.gdprApplies : undefined,
       gdprConsent: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.consentString : undefined,
+      coppa: getCoppa(),
+      usPrivacy: bidderRequest.uspConsent,
       cookieSupport: !utils.isSafariBrowser() && storage.cookiesAreEnabled(),
       rcv: getAdblockerRecovered(),
       adRequests: [...adRequests],
@@ -129,7 +132,12 @@ export const spec = {
 
       if (ad.native) {
         bidResponse.native = ad.native;
-        bidResponse.mediaType = NATIVE
+        bidResponse.mediaType = NATIVE;
+      }
+
+      if (ad.video) {
+        bidResponse.mediaType = VIDEO;
+        bidResponse.vastXml = ad.tag;
       }
 
       bidResponses.push(bidResponse);
@@ -216,9 +224,15 @@ function bidToAdRequest(bid) {
     options: bid.params.options
   };
 
+  if (bid.auc !== undefined) {
+    adRequest.auc = bid.auc;
+  }
+
   adRequest.native = utils.deepAccess(bid, 'mediaTypes.native');
 
-  if (adRequest.native && utils.deepAccess(bid, 'mediaTypes.banner')) {
+  adRequest.video = utils.deepAccess(bid, 'mediaTypes.video');
+
+  if ((adRequest.native || adRequest.video) && utils.deepAccess(bid, 'mediaTypes.banner')) {
     adRequest.banner = true;
   }
 
@@ -247,33 +261,10 @@ function getAdblockerRecovered() {
   } catch (e) {}
 }
 
-function AddExternalUserId(eids, value, source, atype, rtiPartner) {
-  if (utils.isStr(value)) {
-    var eid = {
-      source,
-      uids: [{
-        id: value,
-        atype
-      }]
-    };
-
-    if (rtiPartner) {
-      eid.uids[0] = {ext: {rtiPartner}};
-    }
-
-    eids.push(eid);
-  }
-}
-
 function handleEids(bidRequests) {
-  let eids = [];
   const bidRequest = bidRequests[0];
-  if (bidRequest && bidRequest.userId) {
-    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1); // Also add this to eids
-    AddExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-  }
-  if (eids.length > 0) {
-    return {user: {ext: {eids}}};
+  if (bidRequest && bidRequest.userIdAsEids) {
+    return {user: {ext: {eids: bidRequest.userIdAsEids}}};
   }
 
   return undefined;
@@ -320,4 +311,9 @@ function getDeviceHeight() {
   return window.innerHeight;
 }
 
+function getCoppa() {
+  if (typeof config.getConfig('coppa') === 'boolean') {
+    return config.getConfig('coppa');
+  }
+}
 registerBidder(spec);
diff --git a/modules/livewrappedBidAdapter.md b/modules/livewrappedBidAdapter.md
index 15e3e8d533a..10fc2a4778a 100644
--- a/modules/livewrappedBidAdapter.md
+++ b/modules/livewrappedBidAdapter.md
@@ -8,7 +8,7 @@
 
 Connects to Livewrapped Header Bidding wrapper for bids.
 
-Livewrapped supports banner.
+Livewrapped supports banner, native and video.
 
 # Test Parameters
 
@@ -20,7 +20,7 @@ var adUnits = [
        bids: [{
          bidder: 'livewrapped',
          params: {
-           adUnitId: '6A32352E-BC17-4B94-B2A7-5BF1724417D7'
+           adUnitId: 'D801852A-681F-11E8-86A7-0A44794250D4'
          }
        }]
    }
diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
index 51d5c48e1fc..0f5782649ad 100644
--- a/modules/lkqdBidAdapter.js
+++ b/modules/lkqdBidAdapter.js
@@ -1,6 +1,7 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { VIDEO } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'lkqd';
 const BID_TTL_DEFAULT = 300;
@@ -148,6 +149,9 @@ function buildRequests(validBidRequests, bidderRequest) {
       if (bidRequest.params.hasOwnProperty('dnt') && bidRequest.params.dnt != null) {
         sspData.dnt = bidRequest.params.dnt;
       }
+      if (config.getConfig('coppa') === true) {
+        sspData.coppa = 1;
+      }
       if (bidRequest.params.hasOwnProperty('pageurl') && bidRequest.params.pageurl != null) {
         sspData.pageurl = bidRequest.params.pageurl;
       } else if (bidderRequest && bidderRequest.refererInfo) {
@@ -177,6 +181,12 @@ function buildRequests(validBidRequests, bidderRequest) {
       sspData.bidWidth = playerWidth;
       sspData.bidHeight = playerHeight;
 
+      for (let k = 1; k <= 40; k++) {
+        if (bidRequest.params.hasOwnProperty(`c${k}`) && bidRequest.params[`c${k}`]) {
+          sspData[`c${k}`] = bidRequest.params[`c${k}`];
+        }
+      }
+
       bidRequests.push({
         method: 'GET',
         url: sspUrl,
diff --git a/modules/lockerdomeBidAdapter.js b/modules/lockerdomeBidAdapter.js
index 80c40b39f9a..4e30519c6d3 100644
--- a/modules/lockerdomeBidAdapter.js
+++ b/modules/lockerdomeBidAdapter.js
@@ -66,7 +66,10 @@ export const spec = {
         currency: bid.currency,
         netRevenue: bid.netRevenue,
         ad: bid.ad,
-        ttl: bid.ttl
+        ttl: bid.ttl,
+        meta: {
+          advertiserDomains: bid.adomain && Array.isArray(bid.adomain) ? bid.adomain : []
+        }
       };
     });
   },
diff --git a/modules/loganBidAdapter.js b/modules/loganBidAdapter.js
new file mode 100644
index 00000000000..e55876de675
--- /dev/null
+++ b/modules/loganBidAdapter.js
@@ -0,0 +1,118 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'logan';
+const AD_URL = 'https://USeast2.logan.ai/?c=o&m=multi';
+const SYNC_URL = 'https://ssp-cookie.logan.ai/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;
+  }
+}
+
+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) => {
+    const winTop = utils.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 || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } 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 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
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/loganBidAdapter.md b/modules/loganBidAdapter.md
new file mode 100644
index 00000000000..3c628cdacc2
--- /dev/null
+++ b/modules/loganBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: logan Bidder Adapter
+Module Type: logan Bidder Adapter
+Maintainer: support@logan.ai
+```
+
+# Description
+
+Module that connects to logan demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'logan',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/logicadBidAdapter.js b/modules/logicadBidAdapter.js
index 74c00ee39d6..2c919f9c157 100644
--- a/modules/logicadBidAdapter.js
+++ b/modules/logicadBidAdapter.js
@@ -1,12 +1,12 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, NATIVE} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'logicad';
 const ENDPOINT_URL = 'https://pb.ladsp.com/adrequest/prebid';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE],
   isBidRequestValid: function (bid) {
     return !!(bid.params && bid.params.tid);
   },
@@ -62,6 +62,7 @@ function newBidRequest(bid, bidderRequest) {
     prebidJsVersion: '$prebid.version$',
     referrer: bidderRequest.refererInfo.referer,
     auctionStartTime: bidderRequest.auctionStart,
+    eids: bid.userIdAsEids,
   };
 }
 
diff --git a/modules/logicadBidAdapter.md b/modules/logicadBidAdapter.md
index 32d40a7d3cd..de439f3f8c2 100644
--- a/modules/logicadBidAdapter.md
+++ b/modules/logicadBidAdapter.md
@@ -11,15 +11,48 @@ Currently module supports only banner mediaType.
 
 # Test Parameters
 ```
-    var adUnits = [{
-        code: 'test-code',
-        sizes: [[300, 250],[300, 600]],
-        bids: [{
-            bidder: 'logicad',
-            params: {
-                tid: 'test',
-                page: 'url',
-            }
-        }]
-    }];
+var adUnits = [
+  // Banner adUnit
+  {
+    code: 'test-code',
+    sizes: [[300, 250], [300, 600]],
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    bids: [{
+      bidder: 'logicad',
+      params: {
+        tid: 'lfp-test-banner',
+        page: 'url'
+      }
+    }]
+  },
+  // Native adUnit
+  {
+    code: 'test-native-code',
+    sizes: [[1, 1]],
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
+    },
+    bids: [{
+      bidder: 'logicad',
+      params: {
+        tid: 'lfp-test-native',
+        page: 'url'
+      }
+    }]
+  }
+];
 ```
diff --git a/modules/lotamePanoramaIdSystem.js b/modules/lotamePanoramaIdSystem.js
index cdf9131dd68..6d36687b4e8 100644
--- a/modules/lotamePanoramaIdSystem.js
+++ b/modules/lotamePanoramaIdSystem.js
@@ -16,8 +16,11 @@ const MODULE_NAME = 'lotamePanoramaId';
 const NINE_MONTHS_MS = 23328000 * 1000;
 const DAYS_TO_CACHE = 7;
 const DAY_MS = 60 * 60 * 24 * 1000;
+const MISSING_CORE_CONSENT = 111;
+const GVLID = 95;
 
-export const storage = getStorageManager(null, MODULE_NAME);
+export const storage = getStorageManager(GVLID, MODULE_NAME);
+let cookieDomain;
 
 /**
  * Set the Lotame First Party Profile ID in the first party namespace
@@ -26,7 +29,14 @@ export const storage = getStorageManager(null, MODULE_NAME);
 function setProfileId(profileId) {
   if (storage.cookiesAreEnabled()) {
     let expirationDate = new Date(utils.timestamp() + NINE_MONTHS_MS).toUTCString();
-    storage.setCookie(KEY_PROFILE, profileId, expirationDate, 'Lax', undefined, undefined);
+    storage.setCookie(
+      KEY_PROFILE,
+      profileId,
+      expirationDate,
+      'Lax',
+      cookieDomain,
+      undefined
+    );
   }
   if (storage.hasLocalStorage()) {
     storage.setDataInLocalStorage(KEY_PROFILE, profileId, undefined);
@@ -88,7 +98,7 @@ function saveLotameCache(
         value,
         expirationDate,
         'Lax',
-        undefined,
+        cookieDomain,
         undefined
       );
     }
@@ -115,7 +125,7 @@ function getLotameLocalCache() {
   try {
     const rawExpiry = getFromStorage(KEY_EXPIRY);
     if (utils.isStr(rawExpiry)) {
-      cache.expiryTimestampMs = parseInt(rawExpiry, 0);
+      cache.expiryTimestampMs = parseInt(rawExpiry, 10);
     }
   } catch (error) {
     utils.logError(error);
@@ -132,7 +142,14 @@ function clearLotameCache(key) {
   if (key) {
     if (storage.cookiesAreEnabled()) {
       let expirationDate = new Date(0).toUTCString();
-      storage.setCookie(key, '', expirationDate, 'Lax', undefined, undefined);
+      storage.setCookie(
+        key,
+        '',
+        expirationDate,
+        'Lax',
+        cookieDomain,
+        undefined
+      );
     }
     if (storage.hasLocalStorage()) {
       storage.removeDataFromLocalStorage(key, undefined);
@@ -141,39 +158,46 @@ function clearLotameCache(key) {
 }
 /** @type {Submodule} */
 export const lotamePanoramaIdSubmodule = {
-
   /**
    * used to link submodule with config
    * @type {string}
    */
   name: MODULE_NAME,
 
+  /**
+   * Vendor id of Lotame
+   * @type {Number}
+   */
+  gvlid: GVLID,
+
   /**
    * 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, configParams) {
-    return utils.isStr(value) ? { 'lotamePanoramaId': value } : undefined;
+  decode(value, config) {
+    return utils.isStr(value) ? { lotamePanoramaId: value } : undefined;
   },
 
   /**
    * Retrieve the Lotame Panorama Id
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams, consentData, cacheIdObj) {
+  getId(config, consentData, cacheIdObj) {
+    cookieDomain = lotamePanoramaIdSubmodule.findRootDomain();
     let localCache = getLotameLocalCache();
 
     let refreshNeeded = Date.now() > localCache.expiryTimestampMs;
 
     if (!refreshNeeded) {
       return {
-        id: localCache.data
+        id: localCache.data,
       };
     }
 
@@ -182,14 +206,25 @@ export const lotamePanoramaIdSubmodule = {
     const resolveIdFunction = function (callback) {
       let queryParams = {};
       if (storedUserId) {
-        queryParams.fp = storedUserId
+        queryParams.fp = storedUserId;
       }
 
-      if (consentData && utils.isBoolean(consentData.gdprApplies)) {
-        queryParams.gdpr_applies = consentData.gdprApplies;
-        if (consentData.gdprApplies) {
-          queryParams.gdpr_consent = consentData.consentString;
+      let consentString;
+      if (consentData) {
+        if (utils.isBoolean(consentData.gdprApplies)) {
+          queryParams.gdpr_applies = consentData.gdprApplies;
         }
+        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;
       }
       const url = utils.buildUrl({
         protocol: 'https',
@@ -204,10 +239,17 @@ export const lotamePanoramaIdSubmodule = {
           if (response) {
             try {
               let responseObj = JSON.parse(response);
-              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts);
+              const shouldUpdateProfileId = !(
+                utils.isArray(responseObj.errors) &&
+                responseObj.errors.indexOf(MISSING_CORE_CONSENT) !== -1
+              );
+
+              saveLotameCache(KEY_EXPIRY, responseObj.expiry_ts, responseObj.expiry_ts);
 
               if (utils.isStr(responseObj.profile_id)) {
-                setProfileId(responseObj.profile_id);
+                if (shouldUpdateProfileId) {
+                  setProfileId(responseObj.profile_id);
+                }
 
                 if (utils.isStr(responseObj.core_id)) {
                   saveLotameCache(
@@ -220,7 +262,9 @@ export const lotamePanoramaIdSubmodule = {
                   clearLotameCache(KEY_ID);
                 }
               } else {
-                clearLotameCache(KEY_PROFILE);
+                if (shouldUpdateProfileId) {
+                  clearLotameCache(KEY_PROFILE);
+                }
                 clearLotameCache(KEY_ID);
               }
             } catch (error) {
@@ -232,7 +276,7 @@ export const lotamePanoramaIdSubmodule = {
         undefined,
         {
           method: 'GET',
-          withCredentials: true
+          withCredentials: true,
         }
       );
     };
diff --git a/modules/lunamediaBidAdapter.js b/modules/lunamediaBidAdapter.js
index 83be806af17..b309ef42240 100755
--- a/modules/lunamediaBidAdapter.js
+++ b/modules/lunamediaBidAdapter.js
@@ -8,8 +8,8 @@ import includes from 'core-js-pure/features/array/includes.js';
 const ADAPTER_VERSION = '1.0';
 const BIDDER_CODE = 'lunamedia';
 
-export const VIDEO_ENDPOINT = 'https://api.lunamedia.io/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
-export const BANNER_ENDPOINT = 'https://api.lunamedia.io/xp/get?pubid=';// 0cf8d6d643e13d86a5b6374148a4afac';
+export const VIDEO_ENDPOINT = 'https://nep.advangelists.com/xp/get?pubid=';// https://api.lunamedia.io/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'];
 export const DEFAULT_MIMES = ['video/mp4', 'application/javascript'];
@@ -44,6 +44,7 @@ export const spec = {
 
     bannerBids.forEach(bid => {
       pubid = getBannerBidParam(bid, 'pubid');
+
       requests.push({
         method: 'POST',
         url: BANNER_ENDPOINT + pubid,
@@ -210,8 +211,16 @@ function createVideoRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
   let topReferrer = getTopWindowReferrer();
 
-  let sizes = getVideoSizes(bid);
-  let firstSize = getFirstSize(sizes);
+  // if size is explicitly given via adapter params
+  let paramSize = getVideoBidParam(bid, 'size');
+  let sizes = [];
+
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getVideoSizes(bid);
+  }
+  const firstSize = getFirstSize(sizes);
 
   let video = getVideoTargetingParams(bid);
   const o = {
@@ -301,7 +310,15 @@ function createBannerRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
   let topReferrer = getTopWindowReferrer();
 
-  let sizes = getBannerSizes(bid);
+  // if size is explicitly given via adapter params
+
+  let paramSize = getBannerBidParam(bid, 'size');
+  let sizes = [];
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getBannerSizes(bid);
+  }
 
   const o = {
     'device': {
@@ -379,5 +396,4 @@ function createBannerRequestData(bid, bidderRequest) {
 
   return o;
 }
-
 registerBidder(spec);
diff --git a/modules/lunamediaBidAdapter.md b/modules/lunamediaBidAdapter.md
index d0314d0fa41..ff5cc86c462 100755
--- a/modules/lunamediaBidAdapter.md
+++ b/modules/lunamediaBidAdapter.md
@@ -29,7 +29,8 @@ var displayAdUnit = [
         bidder: 'lunamedia',
         params: {
             pubid: '121ab139faf7ac67428a23f1d0a9a71b',
-            placement: 1234
+			placement: 1234,
+			size: "320x50"
         }
     }]
 }];
@@ -52,7 +53,8 @@ var videoAdUnit = {
       	bidder: 'lunamedia',
       	params: {
         	pubid: '121ab139faf7ac67428a23f1d0a9a71b',
-        	placement: 1234,
+			placement: 1234,
+			size: "320x480",
         	video: {
             	id: 123,
             	skip: 1,
diff --git a/modules/lunamediahbBidAdapter.js b/modules/lunamediahbBidAdapter.js
new file mode 100644
index 00000000000..1376d0c1714
--- /dev/null
+++ b/modules/lunamediahbBidAdapter.js
@@ -0,0 +1,107 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'lunamediahb';
+const AD_URL = 'https://balancer.lmgssp.com/?c=o&m=multi';
+
+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;
+  }
+}
+
+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) => {
+    let winTop = window;
+    let location;
+    try {
+      location = new URL(bidderRequest.refererInfo.referer)
+      winTop = window.top;
+    } catch (e) {
+      location = winTop.location;
+      utils.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] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } 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;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/lunamediahbBidAdapter.md b/modules/lunamediahbBidAdapter.md
new file mode 100644
index 00000000000..184dd846a9d
--- /dev/null
+++ b/modules/lunamediahbBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: lunamedia Bidder Adapter
+Module Type: lunamedia Bidder Adapter
+Maintainer: support@lunamedia.io
+```
+
+# Description
+
+Module that connects to lunamedia demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'lunamediahb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
diff --git a/modules/luponmediaBidAdapter.js b/modules/luponmediaBidAdapter.js
index 0a2eed0ad13..29b54f77fbb 100644
--- a/modules/luponmediaBidAdapter.js
+++ b/modules/luponmediaBidAdapter.js
@@ -2,6 +2,7 @@ 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 { ajax } from '../src/ajax.js';
 
 const BIDDER_CODE = 'luponmedia';
 const ENDPOINT_URL = 'https://rtb.adxpremium.services/openrtb2/auction';
@@ -113,6 +114,19 @@ 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'
+    });
+  }
 };
 
 function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
@@ -265,8 +279,9 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
   }
 
-  const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
-  const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
+  const fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
+  const siteData = Object.assign({}, bidRequest.params.inventory, fpd.context);
+  const userData = Object.assign({}, bidRequest.params.visitor, fpd.user);
 
   if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
     const bidderData = {
@@ -287,7 +302,7 @@ function newOrtbBidRequest(bidRequest, bidderRequest, currentImps) {
     utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
   }
 
-  const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
+  const pbAdSlot = utils.deepAccess(bidRequest, 'ortb2Imp.ext.data.pbadslot');
   if (typeof pbAdSlot === 'string' && pbAdSlot) {
     utils.deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
   }
diff --git a/modules/malltvBidAdapter.js b/modules/malltvBidAdapter.js
new file mode 100644
index 00000000000..4e600135e0b
--- /dev/null
+++ b/modules/malltvBidAdapter.js
@@ -0,0 +1,119 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'malltv';
+const ENDPOINT_URL = 'https://central.mall.tv/bid';
+const DIMENSION_SEPARATOR = 'x';
+const SIZE_SEPARATOR = ';';
+
+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) {
+    return !!(bid.params.propertyId && 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.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let propertyId = '';
+    let pageViewGuid = '';
+    let storageId = '';
+    let bidderRequestId = '';
+    let url = '';
+    let contents = [];
+    let data = {};
+
+    let placements = validBidRequests.map(bidRequest => {
+      if (!propertyId) { propertyId = bidRequest.params.propertyId; }
+      if (!pageViewGuid && bidRequest.params) { pageViewGuid = bidRequest.params.pageViewGuid || ''; }
+      if (!storageId && bidRequest.params) { storageId = bidRequest.params.storageId || ''; }
+      if (!bidderRequestId) { bidderRequestId = bidRequest.bidderRequestId; }
+      if (!url && bidderRequest) { url = bidderRequest.refererInfo.referer; }
+      if (!contents.length && bidRequest.params.contents && bidRequest.params.contents.length) { contents = bidRequest.params.contents; }
+      if (Object.keys(data).length === 0 && bidRequest.params.data && Object.keys(bidRequest.params.data).length !== 0) { data = bidRequest.params.data; }
+
+      let adUnitId = bidRequest.adUnitCode;
+      let placementId = bidRequest.params.placementId;
+      let sizes = generateSizeParam(bidRequest.sizes);
+
+      return {
+        sizes: sizes,
+        adUnitId: adUnitId,
+        placementId: placementId,
+        bidid: bidRequest.bidId,
+        count: bidRequest.params.count,
+        skipTime: bidRequest.params.skipTime
+      };
+    });
+
+    let body = {
+      propertyId: propertyId,
+      pageViewGuid: pageViewGuid,
+      storageId: storageId,
+      url: url,
+      requestid: bidderRequestId,
+      placements: placements,
+      contents: contents,
+      data: data
+    }
+
+    return [{
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: body
+    }];
+  },
+  /**
+   * 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 responses = serverResponse.body;
+    const bidResponses = [];
+    for (var i = 0; i < responses.length; i++) {
+      const bidResponse = {
+        requestId: responses[i].BidId,
+        cpm: responses[i].CPM,
+        width: responses[i].Width,
+        height: responses[i].Height,
+        creativeId: responses[i].CreativeId,
+        currency: responses[i].Currency,
+        netRevenue: responses[i].NetRevenue,
+        ttl: responses[i].TTL,
+        referrer: responses[i].Referrer,
+        ad: responses[i].Ad,
+        vastUrl: responses[i].VastUrl,
+        mediaType: responses[i].MediaType,
+        meta: {
+          advertiserDomains: Array.isArray(responses[i].ADomain) ? responses[i].ADomain : []
+        }
+      };
+      bidResponses.push(bidResponse);
+    }
+    return bidResponses;
+  }
+}
+
+/**
+* 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);
+}
+
+registerBidder(spec);
diff --git a/modules/malltvBidAdapter.md b/modules/malltvBidAdapter.md
new file mode 100644
index 00000000000..e32eb54f90f
--- /dev/null
+++ b/modules/malltvBidAdapter.md
@@ -0,0 +1,68 @@
+# Overview
+Module Name: MallTV Bidder Adapter Module
+
+Type: Bidder Adapter
+
+Maintainer: arditb@gjirafa.com
+
+# Description
+MallTV Bidder Adapter for Prebid.js.
+
+# Test Parameters
+```js
+var adUnits = [
+    {
+        code: 'test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [
+                    [300, 250],
+                    [300, 300]
+                ]
+            }
+        },
+        bids: [{
+            bidder: 'malltv',
+            params: {
+                propertyId: '105134',  //Required
+                placementId: '846832', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    },
+    {
+        code: 'test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream'
+            }
+        },
+        bids: [{
+            bidder: 'malltv',
+            params: {
+                propertyId: '105134',  //Required
+                placementId: '846832', //Required
+                data: {                //Optional
+                    catalogs: [{
+                        catalogId: 9,
+                        items: ["193", "4", "1"]
+                    }],
+                    inventory: {
+                        category: ["tech"],
+                        query: ["iphone 12"]
+                    }
+                }
+            }
+        }]
+    }
+];
+```
diff --git a/modules/mantisBidAdapter.js b/modules/mantisBidAdapter.js
index 19e70a3e68b..61b7c31c8e4 100644
--- a/modules/mantisBidAdapter.js
+++ b/modules/mantisBidAdapter.js
@@ -1,7 +1,7 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
 
-const storage = getStorageManager();
+export const storage = getStorageManager();
 
 function inIframe() {
   try {
@@ -16,15 +16,7 @@ function pixel(url, parent) {
   img.style.cssText = 'display:none !important;';
   (parent || document.body).appendChild(img);
 }
-function isDesktop(ignoreTouch) {
-  var supportsTouch = !ignoreTouch && ('ontouchstart' in window || navigator.msMaxTouchPoints);
-  if (inIframe()) {
-    return !supportsTouch;
-  }
-  var width = window.innerWidth || window.document.documentElement.clientWidth || window.document.body.clientWidth;
-  return !supportsTouch && (!width || width >= (window.mantis_breakpoint || 768));
-}
-function onVisible(element, doOnVisible, time, pct) {
+export function onVisible(win, element, doOnVisible, time, pct) {
   var started = null;
   var notified = false;
   var onNotVisible = null;
@@ -78,15 +70,15 @@ function onVisible(element, doOnVisible, time, pct) {
     });
   };
   if (isAmp()) {
-    listener = window.context.observeIntersection(function (changes) {
+    listener = win.context.observeIntersection(function (changes) {
       changes.forEach(function (change) {
         doCheck(change.rootBounds.width, change.rootBounds.height, change.boundingClientRect);
       });
     });
   }
   interval = setInterval(function () {
-    var winHeight = (window.innerHeight || document.documentElement.clientHeight);
-    var winWidth = (window.innerWidth || document.documentElement.clientWidth);
+    var winHeight = (win.innerHeight || document.documentElement.clientHeight);
+    var winWidth = (win.innerWidth || document.documentElement.clientWidth);
     doCheck(winWidth, winHeight, element.getBoundingClientRect());
   }, 100);
 }
@@ -136,9 +128,6 @@ function isArray(value) {
 }
 
 function jsonToQuery(data, chain, form) {
-  if (!data) {
-    return null;
-  }
   var parts = form || [];
   for (var key in data) {
     var queryKey = key;
@@ -152,8 +141,6 @@ function jsonToQuery(data, chain, form) {
         var aval = val[index];
         if (isObject(aval)) {
           jsonToQuery(aval, akey, parts);
-        } else if (isSendable(aval)) {
-          parts.push(akey + '=' + encodeURIComponent(aval));
         }
       }
     } else if (isObject(val) && val != data) {
@@ -173,9 +160,7 @@ function buildMantisUrl(path, data, domain) {
     secure: isSecure(),
     version: 9
   };
-  if (!inIframe() || isAmp()) {
-    params.mobile = !isAmp() && isDesktop(true) ? 'false' : 'true';
-  }
+
   if (window.mantis_uuid) {
     params.uuid = window.mantis_uuid;
   } else if (storage.hasLocalStorage()) {
@@ -206,20 +191,20 @@ function buildMantisUrl(path, data, domain) {
       params.referrer = window.context.referrer;
     }
   }
-  Object.keys(data || {}).forEach(function (key) {
+  Object.keys(data).forEach(function (key) {
     params[key] = data[key];
   });
   var query = jsonToQuery(params);
   return (window.mantis_domain === undefined ? domain || 'https://mantodea.mantisadnetwork.com' : window.mantis_domain) + path + '?' + query;
 }
 
-const spec = {
+export const spec = {
   code: 'mantis',
-  supportedMediaTypes: ['banner', 'video', 'native'],
+  supportedMediaTypes: ['banner'],
   isBidRequestValid: function (bid) {
     return !!(bid.params.property && (bid.params.code || bid.params.zoneId || bid.params.zone));
   },
-  buildRequests: function (validBidRequests) {
+  buildRequests: function (validBidRequests, bidderRequest) {
     var property = null;
     validBidRequests.some(function (bid) {
       if (bid.params.property) {
@@ -229,6 +214,7 @@ const spec = {
     });
     const query = {
       measurable: true,
+      usp: bidderRequest && bidderRequest.uspConsent,
       bids: validBidRequests.map(function (bid) {
         return {
           bidId: bid.bidId,
@@ -240,6 +226,12 @@ const spec = {
       }),
       property: property
     };
+
+    if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+      // we purposefully do not track data for users in the EU
+      query.consent = false;
+    }
+
     return {
       method: 'GET',
       url: buildMantisUrl('/prebid/display', query) + '&foo',
@@ -255,6 +247,9 @@ const spec = {
         width: ad.width,
         height: ad.height,
         ad: ad.html,
+        meta: {
+          advertiserDomains: ad.domains || []
+        },
         ttl: ad.ttl || serverResponse.body.ttl || 86400,
         creativeId: ad.view,
         netRevenue: true,
@@ -262,47 +257,54 @@ const spec = {
       };
     });
   },
-  getUserSyncs: function (syncOptions) {
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent, uspConsent) {
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: buildMantisUrl('/prebid/iframe')
+        url: buildMantisUrl('/prebid/iframe', {gdpr: gdprConsent, uspConsent: uspConsent})
       }];
     }
     if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: buildMantisUrl('/prebid/pixel')
+        url: buildMantisUrl('/prebid/pixel', {gdpr: gdprConsent, uspConsent: uspConsent})
       }];
     }
   }
 };
+
+export function sfPostMessage ($sf, width, height, callback) {
+  var viewed = false;
+  // eslint-disable-next-line no-undef
+  $sf.ext.register(width, height, function () {
+    // eslint-disable-next-line no-undef
+    if ($sf.ext.inViewPercentage() < 50 || viewed) {
+      return;
+    }
+    viewed = true;
+    callback();
+  });
+};
+
+export function iframePostMessage (win, name, callback) {
+  var frames = document.getElementsByTagName('iframe');
+  for (var i = 0; i < frames.length; i++) {
+    var frame = frames[i];
+    if (frame.name == name) {
+      onVisible(win, frame, function (stop) {
+        callback();
+        stop();
+      }, 1000, 0.50);
+    }
+  }
+}
+
 onMessage('iframe', function (data) {
   if (window.$sf) {
-    var viewed = false;
-    // eslint-disable-next-line no-undef
-    $sf.ext.register(data.width, data.height, function () {
-      // eslint-disable-next-line no-undef
-      if ($sf.ext.inViewPercentage() < 50 || viewed) {
-        return;
-      }
-      viewed = true;
-      pixel(data.pixel);
-    });
+    sfPostMessage(window.$sf, data.width, data.height, () => pixel(data.pixel));
   } else {
-    var frames = document.getElementsByTagName('iframe');
-    for (var i = 0; i < frames.length; i++) {
-      var frame = frames[i];
-      if (frame.name == data.frame) {
-        onVisible(frame, function (stop) {
-          pixel(data.pixel);
-          stop();
-        }, 1000, 0.50);
-      }
-    }
+    iframePostMessage(window, data.frame, () => pixel(data.pixel));
   }
 });
 
-export { spec };
-
 registerBidder(spec);
diff --git a/modules/marsmediaBidAdapter.js b/modules/marsmediaBidAdapter.js
index 1ce2558b8de..bb1763ebb2e 100644
--- a/modules/marsmediaBidAdapter.js
+++ b/modules/marsmediaBidAdapter.js
@@ -3,6 +3,7 @@
 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';
 
 function MarsmediaAdapter() {
   this.code = 'marsmedia';
@@ -16,7 +17,7 @@ function MarsmediaAdapter() {
   let SUPPORTED_VIDEO_API = [1, 2, 5];
   let slotsToBids = {};
   let that = this;
-  let version = '2.3';
+  let version = '2.4';
 
   this.isBidRequestValid = function (bid) {
     return !!(bid.params && bid.params.zoneId);
@@ -53,6 +54,7 @@ function MarsmediaAdapter() {
       if (!(impObj.banner || impObj.video)) {
         continue;
       }
+      impObj.bidfloor = _getFloor(BRs[i]);
       impObj.ext = frameExt(BRs[i]);
       impList.push(impObj);
     }
@@ -153,9 +155,31 @@ function MarsmediaAdapter() {
   }
 
   function frameExt(bid) {
-    return {
-      bidder: {
-        zoneId: bid.params['zoneId']
+    if ((bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes)) {
+      let bidSizes = (bid.mediaTypes && bid.mediaTypes.banner && bid.mediaTypes.banner.sizes) || bid.sizes;
+      bidSizes = ((utils.isArray(bidSizes) && utils.isArray(bidSizes[0])) ? bidSizes : [bidSizes]);
+      bidSizes = bidSizes.filter(size => utils.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, utils.getWindowTop(), minSize)
+        : 'na';
+      const viewabilityAmountRounded = isNaN(viewabilityAmount) ? viewabilityAmount : Math.round(viewabilityAmount);
+
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: viewabilityAmountRounded
+      }
+    } else {
+      return {
+        bidder: {
+          zoneId: bid.params['zoneId']
+        },
+        viewability: 'na'
       }
     }
   }
@@ -180,12 +204,15 @@ function MarsmediaAdapter() {
       }
     };
     if (BRs[0].schain) {
-      bid.source = {
-        'ext': {
-          'schain': BRs[0].schain
-        }
-      }
+      utils.deepSetValue(bid, 'source.ext.schain', BRs[0].schain);
+    }
+    if (bidderRequest.uspConsent) {
+      utils.deepSetValue(bid, 'regs.ext.us_privacy', bidderRequest.uspConsent)
     }
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(bid, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
     return bid;
   }
 
@@ -241,12 +268,6 @@ function MarsmediaAdapter() {
     sendbeacon(bid, 20)
   };
 
-  function sendbeacon(bid, type) {
-    const bidString = JSON.stringify(bid);
-    const encodedBuf = window.btoa(bidString);
-    utils.triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
-  }
-
   this.interpretResponse = function (serverResponse) {
     let responses = serverResponse.body || [];
     let bids = [];
@@ -295,6 +316,126 @@ function MarsmediaAdapter() {
 
     return bids;
   };
+
+  function sendbeacon(bid, type) {
+    const bidString = JSON.stringify(bid);
+    const encodedBuf = window.btoa(bidString);
+    utils.triggerPixel('https://ping-hqx-1.go2speed.media/notification/rtb/beacon/?bt=' + type + '&bid=3mhdom&hb_j=' + encodedBuf, null);
+  }
+
+  /**
+   * Gets bidfloor
+   * @param {Object} bid
+   * @returns {Number} floor
+   */
+  function _getFloor (bid) {
+    const curMediaType = bid.mediaTypes.video ? 'video' : 'banner';
+    let floor = 0;
+
+    if (typeof bid.getFloor === 'function') {
+      const floorInfo = bid.getFloor({
+        currency: 'USD',
+        mediaType: curMediaType,
+        size: '*'
+      });
+
+      if (typeof floorInfo === 'object' &&
+        floorInfo.currency === 'USD' &&
+        !isNaN(parseFloat(floorInfo.floor))) {
+        floor = floorInfo.floor;
+      }
+    }
+
+    return floor;
+  }
+
+  function _getMinSize(sizes) {
+    return sizes.reduce((min, size) => size.h * size.w < min.h * min.w ? size : min);
+  }
+
+  function _isViewabilityMeasurable(element) {
+    return !_isIframe() && element !== null;
+  }
+
+  function _isIframe() {
+    try {
+      return utils.getWindowSelf() !== utils.getWindowTop();
+    } catch (e) {
+      return true;
+    }
+  }
+
+  function _getViewability(element, topWin, { w, h } = {}) {
+    return topWin.document.visibilityState === 'visible'
+      ? _getPercentInView(element, topWin, { w, h })
+      : 0;
+  }
+
+  function _getPercentInView(element, topWin, { w, h } = {}) {
+    const elementBoundingBox = _getBoundingBox(element, { w, h });
+
+    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);
+    }
+
+    return 0;
+  }
+
+  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 spec = new MarsmediaAdapter();
diff --git a/modules/mass.js b/modules/mass.js
new file mode 100644
index 00000000000..01135e7ddff
--- /dev/null
+++ b/modules/mass.js
@@ -0,0 +1,184 @@
+/**
+ * This module adds MASS support to Prebid.js.
+ */
+
+import { config } from '../src/config.js';
+import { getHook } from '../src/hook.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const defaultCfg = {
+  dealIdPattern: /^MASS/i
+};
+let cfg;
+
+export let listenerAdded = false;
+export let isEnabled = false;
+
+const matchedBids = {};
+let renderers;
+
+init();
+config.getConfig('mass', config => init(config.mass));
+
+/**
+ * Module init.
+ */
+export function init(userCfg) {
+  cfg = Object.assign({}, defaultCfg, window.massConfig && window.massConfig.mass, userCfg);
+
+  if (cfg.enabled === false) {
+    if (isEnabled) {
+      getHook('addBidResponse').getHooks({hook: addBidResponseHook}).remove();
+      isEnabled = false;
+    }
+  } else {
+    if (!isEnabled) {
+      getHook('addBidResponse').before(addBidResponseHook);
+      isEnabled = true;
+    }
+  }
+
+  if (isEnabled) {
+    updateRenderers();
+  }
+}
+
+/**
+ * Update the list of renderers based on current config.
+ */
+export function updateRenderers() {
+  renderers = [];
+
+  // official MASS renderer:
+  if (cfg.dealIdPattern && cfg.renderUrl) {
+    renderers.push({
+      match: isMassBid,
+      render: useDefaultRender(cfg.renderUrl, 'mass')
+    });
+  }
+
+  // add any custom renderer defined in the config:
+  (cfg.custom || []).forEach(renderer => {
+    if (!renderer.match && renderer.dealIdPattern) {
+      renderer.match = useDefaultMatch(renderer.dealIdPattern);
+    }
+
+    if (!renderer.render && renderer.renderUrl && renderer.namespace) {
+      renderer.render = useDefaultRender(renderer.renderUrl, renderer.namespace);
+    }
+
+    if (renderer.match && renderer.render) {
+      renderers.push(renderer);
+    }
+  });
+
+  return renderers;
+}
+
+/**
+ * Before hook for 'addBidResponse'.
+ */
+export function addBidResponseHook(next, adUnitCode, bid) {
+  let renderer;
+  for (let i = 0; i < renderers.length; i++) {
+    if (renderers[i].match(bid)) {
+      renderer = renderers[i];
+      break;
+    }
+  }
+
+  if (renderer) {
+    const bidRequest = find(this.bidderRequest.bids, bidRequest =>
+      bidRequest.bidId === bid.requestId
+    );
+
+    matchedBids[bid.requestId] = {
+      renderer,
+      payload: {
+        bidRequest,
+        bid,
+        adm: bid.ad
+      }
+    };
+
+    bid.ad = '
 
 ```
 
+# Ad Unit and Setup: For Testing (Video Instream)
 
-# Ad Unit and Setup: For Testing (Native)
+```html
+
+ 
+
+```
+# Ad Unit and Setup: For Testing (Video Outstream)
 
 ```html
  
  
 
+```
+
+# Ad Unit and Setup: For Testing (Native)
+
+```html
+ 
+ 
+
+
diff --git a/modules/mediasquareBidAdapter.js b/modules/mediasquareBidAdapter.js
index cb52c288caf..a586157bf20 100644
--- a/modules/mediasquareBidAdapter.js
+++ b/modules/mediasquareBidAdapter.js
@@ -1,7 +1,7 @@
 import {ajax} from '../src/ajax.js';
 import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
-import {BANNER} from '../src/mediaTypes.js';
+import {BANNER, NATIVE, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'mediasquare';
 const BIDDER_URL_PROD = 'https://pbs-front.mediasquare.fr/'
@@ -13,7 +13,7 @@ const BIDDER_ENDPOINT_WINNING = 'winning';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['msq'], // short code
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, NATIVE, VIDEO],
   /**
          * Determines whether or not the given bid request is valid.
          *
@@ -59,7 +59,11 @@ export const spec = {
       }
       if (bidderRequest.uspConsent) { payload.uspConsent = bidderRequest.uspConsent; }
       if (bidderRequest.schain) { payload.schain = bidderRequest.schain; }
-      if (bidderRequest.userId) { payload.userId = bidderRequest.userId; }
+      if (bidderRequest.userId) {
+        payload.userId = bidderRequest.userId;
+      } 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 (test) { payload.debug = true; }
     const payloadString = JSON.stringify(payload);
@@ -97,8 +101,19 @@ export const spec = {
           mediasquare: {
             'bidder': value['bidder'],
             'code': value['code']
+          },
+          meta: {
+            'advertiserDomains': value['adomain']
           }
         };
+        if ('native' in value) {
+          bidResponse['native'] = value['native'];
+          bidResponse['mediaType'] = 'native';
+        } else if ('video' in value) {
+          if ('url' in value['video']) { bidResponse['vastUrl'] = value['video']['url'] }
+          if ('xml' in value['video']) { bidResponse['vastXml'] = value['video']['xml'] }
+          bidResponse['mediaType'] = 'video';
+        }
         if (value.hasOwnProperty('deal_id')) { bidResponse['dealId'] = value['deal_id']; }
         bidResponses.push(bidResponse);
       });
@@ -116,7 +131,8 @@ export const spec = {
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
     let params = '';
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    if (serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
+    if (typeof serverResponses === 'object' && serverResponses != null && serverResponses.length > 0 && serverResponses[0].hasOwnProperty('body') &&
+        serverResponses[0].body.hasOwnProperty('cookies') && typeof serverResponses[0].body.cookies === 'object') {
       return serverResponses[0].body.cookies;
     } else {
       if (gdprConsent && typeof gdprConsent.consentString === 'string') { params += typeof gdprConsent.gdprApplies === 'boolean' ? `&gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}` : `&gdpr_consent=${gdprConsent.consentString}`; }
@@ -136,7 +152,7 @@ export const spec = {
     // fires a pixel to confirm a winning bid
     let params = [];
     let endpoint = document.location.search.match(/msq_test=true/) ? BIDDER_URL_TEST : BIDDER_URL_PROD;
-    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond']
+    let paramsToSearchFor = ['cpm', 'size', 'mediaType', 'currency', 'creativeId', 'adUnitCode', 'timeToRespond', 'requestId', 'auctionId']
     if (bid.hasOwnProperty('mediasquare')) {
       if (bid['mediasquare'].hasOwnProperty('bidder')) { params.push('bidder=' + bid['mediasquare']['bidder']); }
       if (bid['mediasquare'].hasOwnProperty('code')) { params.push('code=' + bid['mediasquare']['code']); }
diff --git a/modules/merkleIdSystem.js b/modules/merkleIdSystem.js
new file mode 100644
index 00000000000..353cc45473d
--- /dev/null
+++ b/modules/merkleIdSystem.js
@@ -0,0 +1,125 @@
+/**
+ * This module adds merkleId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/merkleIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'merkleId';
+const SESSION_COOKIE_NAME = '_svsid';
+const ID_URL = 'https://id2.sv.rkdms.com/identity/';
+
+export const storage = getStorageManager();
+
+function getSession(configParams) {
+  let session = null;
+  if (typeof configParams.sv_session !== 'string') {
+    session = configParams.sv_session;
+  } else {
+    session = readCookie() || readFromLocalStorage();
+  }
+  return session;
+}
+
+function readCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie(SESSION_COOKIE_NAME) : null;
+}
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(SESSION_COOKIE_NAME) : null;
+}
+
+function constructUrl(configParams) {
+  const session = getSession(configParams);
+  let url = ID_URL + `?vendor=${configParams.vendor}&sv_cid=${configParams.sv_cid}&sv_domain=${configParams.sv_domain}&sv_pubid=${configParams.sv_pubid}`;
+  if (session) {
+    url.append(`&sv_session=${session}`);
+  }
+  utils.logInfo('Merkle url :' + url);
+  return url;
+}
+
+/** @type {Submodule} */
+export const merkleIdSubmodule = {
+  /**
+   * 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 {{merkleId:string}}
+   */
+  decode(value) {
+    const id = (value && value.pam_id && typeof value.pam_id.id === 'string') ? value.pam_id : undefined;
+    utils.logInfo('Merkle id ' + JSON.stringify(id));
+    return id ? { 'merkleId': id } : 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) {
+    const configParams = (config && config.params) || {};
+    if (!configParams || typeof configParams.vendor !== 'string') {
+      utils.logError('User ID - merkleId submodule requires a valid vendor to be defined');
+      return;
+    }
+
+    if (typeof configParams.sv_cid !== 'string') {
+      utils.logError('User ID - merkleId submodule requires a valid sv_cid string to be defined');
+      return;
+    }
+
+    if (typeof configParams.sv_pubid !== 'string') {
+      utils.logError('User ID - merkleId submodule requires a valid sv_pubid string to be defined');
+      return;
+    }
+
+    if (typeof configParams.sv_domain !== 'string') {
+      utils.logError('User ID - merkleId submodule requires a valid sv_domain string to be defined');
+      return;
+    }
+
+    if (consentData && typeof consentData.gdprApplies === 'boolean' && consentData.gdprApplies) {
+      utils.logError('User ID - merkleId submodule does not currently handle consent strings');
+      return;
+    }
+    const url = constructUrl(configParams);
+
+    const resp = function (callback) {
+      const callbacks = {
+        success: response => {
+          let responseObj;
+          if (response) {
+            try {
+              responseObj = JSON.parse(response);
+              utils.logInfo('Merkle responseObj ' + JSON.stringify(responseObj));
+            } catch (error) {
+              utils.logError(error);
+            }
+          }
+          callback(responseObj);
+        },
+        error: error => {
+          utils.logError(`${MODULE_NAME}: merkleId fetch encountered an error`, error);
+          callback();
+        }
+      };
+      ajax(url, callbacks, undefined, {method: 'GET', withCredentials: true});
+    };
+    return {callback: resp};
+  }
+};
+
+submodule('userId', merkleIdSubmodule);
diff --git a/modules/missenaBidAdapter.js b/modules/missenaBidAdapter.js
new file mode 100644
index 00000000000..2b1d6bdb118
--- /dev/null
+++ b/modules/missenaBidAdapter.js
@@ -0,0 +1,94 @@
+import * as utils from '../src/utils.js';
+import { BANNER } from '../src/mediaTypes.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'missena';
+const ENDPOINT_URL = 'https://bid.missena.io/';
+
+export const spec = {
+  aliases: [BIDDER_CODE],
+  code: BIDDER_CODE,
+  gvlid: 687,
+  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 typeof bid == 'object' && !!bid.params.apiKey;
+  },
+
+  /**
+   * 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) {
+    return validBidRequests.map((bidRequest) => {
+      const payload = {
+        request_id: bidRequest.bidId,
+        timeout: bidderRequest.timeout,
+      };
+
+      if (bidderRequest && bidderRequest.refererInfo) {
+        payload.referer = bidderRequest.refererInfo.referer;
+        payload.referer_canonical = bidderRequest.refererInfo.canonicalUrl;
+      }
+
+      if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.consent_string = bidderRequest.gdprConsent.consentString;
+        payload.consent_required = bidderRequest.gdprConsent.gdprApplies;
+      }
+
+      return {
+        method: 'POST',
+        url:
+          ENDPOINT_URL +
+          '?' +
+          utils.formatQS({
+            t: bidRequest.params.apiKey,
+          }),
+        data: JSON.stringify(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, bidRequest) {
+    const bidResponses = [];
+    const response = serverResponse.body;
+
+    if (response && !response.timeout && !!response.ad) {
+      bidResponses.push(response);
+    }
+
+    return bidResponses;
+  },
+
+  /**
+   * Register bidder specific code, which will execute if bidder timed out after an auction
+   * @param {data} Containing timeout specific data
+   */
+  onTimeout: function onTimeout(timeoutData) {
+    utils.logInfo('Missena - Timeout from adapter', timeoutData);
+  },
+
+  /**
+   * 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) {
+    utils.logInfo('Missena - Bid won', bid);
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/missenaBidAdapter.md b/modules/missenaBidAdapter.md
new file mode 100644
index 00000000000..d5fcacf04ab
--- /dev/null
+++ b/modules/missenaBidAdapter.md
@@ -0,0 +1,70 @@
+# Overview
+
+```
+Module Name:  Missena Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: jney@missena.com
+```
+
+## Introduction
+
+Connects to Missena for bids.
+
+**Note:** this adapter doesn't support SafeFrame.
+
+Useful resources:
+
+- [README](../README.md#Build)
+- [https://docs.prebid.org/dev-docs/bidder-adaptor.html](https://docs.prebid.org/dev-docs/bidder-adaptor.html)
+
+## Develop
+
+Setup the missena adapter in `integrationExamples/gpt/userId_example.html`.
+
+For example:
+
+```js
+const AD_UNIT_CODE = "test-div";
+const PUBLISHER_MISSENA_TOKEN = "PA-34745704";
+
+var adUnits = [
+  {
+    code: AD_UNIT_CODE,
+    mediaTypes: {
+      banner: {
+        sizes: [1, 1],
+      },
+    },
+    bids: [
+      {
+        bidder: "missena",
+        params: {
+          apiKey: PUBLISHER_MISSENA_TOKEN,
+        },
+      },
+    ],
+  },
+];
+```
+
+Then start the demo app:
+
+```shell
+gulp serve-fast --modules=missenaBidAdapter
+```
+
+And open [http://localhost:9999/integrationExamples/gpt/userId_example.html](http://localhost:9999/integrationExamples/gpt/userId_example.html)
+
+## Test
+
+```shell
+gulp test --file test/spec/modules/missenaBidAdapter_spec.js
+```
+
+Add the `--watch` option to re-run unit tests whenever the source code changes.
+
+## Build
+
+```shell
+gulp build --modules=missenaBidAdapter
+```
diff --git a/modules/mobfoxpbBidAdapter.js b/modules/mobfoxpbBidAdapter.js
new file mode 100644
index 00000000000..c7e96b95179
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.js
@@ -0,0 +1,99 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE, VIDEO } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const BIDDER_CODE = 'mobfoxpb';
+const AD_URL = 'https://bes.mobfox.com/?c=o&m=multi';
+
+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;
+  }
+}
+
+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) => {
+    const winTop = utils.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 || {},
+      };
+      const mediaType = bid.mediaTypes
+
+      if (mediaType && mediaType[BANNER] && mediaType[BANNER].sizes) {
+        placement.sizes = mediaType[BANNER].sizes;
+        placement.traffic = BANNER;
+      } else if (mediaType && mediaType[VIDEO] && mediaType[VIDEO].playerSize) {
+        placement.wPlayer = mediaType[VIDEO].playerSize[0];
+        placement.hPlayer = mediaType[VIDEO].playerSize[1];
+        placement.traffic = VIDEO;
+      } 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;
+  },
+};
+
+registerBidder(spec);
diff --git a/modules/mobfoxpbBidAdapter.md b/modules/mobfoxpbBidAdapter.md
new file mode 100644
index 00000000000..6eb549919d7
--- /dev/null
+++ b/modules/mobfoxpbBidAdapter.md
@@ -0,0 +1,72 @@
+# Overview
+
+```
+Module Name: mobfox Bidder Adapter
+Module Type: mobfox Bidder Adapter
+Maintainer: platform@mobfox.com
+```
+
+# Description
+
+Module that connects to mobfox demand sources
+
+# Test Parameters
+```
+    var adUnits = [
+                {
+                    code:'1',
+                    mediaTypes:{
+                        banner: {
+                            sizes: [[300, 250]],
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        video: {
+                            playerSize: [640, 480],
+                            context: 'instream'
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    code:'1',
+                    mediaTypes:{
+                        native: {
+                            title: {
+                                required: true
+                            },
+                            icon: {
+                                required: true,
+                                size: [64, 64]
+                            }
+                        }
+                    },
+                    bids:[
+                        {
+                            bidder: 'mobfoxpb',
+                            params: {
+                                placementId: 0
+                            }
+                        }
+                    ]
+                }
+            ];
+```
\ No newline at end of file
diff --git a/modules/multibid/index.js b/modules/multibid/index.js
new file mode 100644
index 00000000000..dd4999b2dca
--- /dev/null
+++ b/modules/multibid/index.js
@@ -0,0 +1,234 @@
+/**
+ * This module adds Multibid support to prebid.js
+ * @module modules/multibid
+ */
+
+import {config} from '../../src/config.js';
+import {setupBeforeHookFnOnce, getHook} from '../../src/hook.js';
+import * as utils from '../../src/utils.js';
+import events from '../../src/events.js';
+import CONSTANTS from '../../src/constants.json';
+import {addBidderRequests} from '../../src/auction.js';
+import {getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm} from '../../src/targeting.js';
+
+const MODULE_NAME = 'multibid';
+let hasMultibid = false;
+let multiConfig = {};
+let multibidUnits = {};
+
+// Storing this globally on init for easy reference to configuration
+config.getConfig(MODULE_NAME, conf => {
+  if (!Array.isArray(conf.multibid) || !conf.multibid.length || !validateMultibid(conf.multibid)) return;
+
+  resetMultiConfig();
+  hasMultibid = true;
+
+  conf.multibid.forEach(entry => {
+    if (entry.bidder) {
+      multiConfig[entry.bidder] = {
+        maxbids: entry.maxBids,
+        prefix: entry.targetBiddercodePrefix
+      }
+    } else {
+      entry.bidders.forEach(key => {
+        multiConfig[key] = {
+          maxbids: entry.maxBids,
+          prefix: entry.targetBiddercodePrefix
+        }
+      });
+    }
+  });
+});
+
+/**
+   * @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 => {
+    // Check if entry.bidder is not defined or typeof string, filter entry and reset configuration
+    if ((!entry.bidder || typeof entry.bidder !== 'string') && (!entry.bidders || !Array.isArray(entry.bidders))) {
+      utils.logWarn('Filtering multibid entry. Missing required bidder or bidders property.');
+      check = false;
+      return false;
+    }
+
+    return true;
+  }).map(entry => {
+    // Check if entry.maxbids is not defined, not typeof number, or less than 1, set maxbids to 1 and reset configuration
+    // Check if entry.maxbids is greater than 9, set maxbids to 9 and reset configuration
+    if (typeof entry.maxBids !== 'number' || entry.maxBids < 1 || entry.maxBids > 9) {
+      entry.maxBids = (typeof entry.maxBids !== 'number' || entry.maxBids < 1) ? 1 : 9;
+      check = false;
+    }
+
+    return entry;
+  });
+
+  if (!check) config.setConfig({multibid: duplicate});
+
+  return check;
+}
+
+/**
+   * @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
+    // If true, add bidderRequest.bidLimit to bidder request
+    if (multiConfig[bidRequest.bidderCode]) {
+      bidRequest.bidLimit = multiConfig[bidRequest.bidderCode].maxbids
+    }
+    return bidRequest;
+  })
+
+  fn.call(this, 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
+*/
+export function addBidResponseHook(fn, adUnitCode, bid) {
+  let floor = utils.deepAccess(bid, 'floorData.floorValue');
+
+  if (!config.getConfig('multibid')) resetMultiConfig();
+  // Checks if multiconfig exists and bid bidderCode exists within config and is an adpod bid
+  // Else checks if multiconfig exists and bid bidderCode exists within config
+  // Else continue with no modifications
+  if (hasMultibid && multiConfig[bid.bidderCode] && utils.deepAccess(bid, 'video.context') === 'adpod') {
+    fn.call(this, adUnitCode, bid);
+  } else if (hasMultibid && multiConfig[bid.bidderCode]) {
+    // Set property multibidPrefix on bid
+    if (multiConfig[bid.bidderCode].prefix) bid.multibidPrefix = multiConfig[bid.bidderCode].prefix;
+    bid.originalBidder = bid.bidderCode;
+    // Check if stored bids for auction include adUnitCode.bidder and max limit not reach for ad unit
+    if (utils.deepAccess(multibidUnits, `${adUnitCode}.${bid.bidderCode}`)) {
+      // Store request id under new property originalRequestId, create new unique bidId,
+      // and push bid into multibid stored bids for auction if max not reached and bid cpm above floor
+      if (!multibidUnits[adUnitCode][bid.bidderCode].maxReached && (!floor || floor <= bid.cpm)) {
+        bid.originalRequestId = bid.requestId;
+
+        bid.requestId = utils.getUniqueIdentifierStr();
+        multibidUnits[adUnitCode][bid.bidderCode].ads.push(bid);
+
+        let length = multibidUnits[adUnitCode][bid.bidderCode].ads.length;
+
+        if (multiConfig[bid.bidderCode].prefix) bid.targetingBidder = multiConfig[bid.bidderCode].prefix + length;
+        if (length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
+
+        fn.call(this, adUnitCode, bid);
+      } else {
+        utils.logWarn(`Filtering multibid received from bidder ${bid.bidderCode}: ` + ((multibidUnits[adUnitCode][bid.bidderCode].maxReached) ? `Maximum bid limit reached for ad unit code ${adUnitCode}` : 'Bid cpm under floors value.'));
+      }
+    } else {
+      if (utils.deepAccess(bid, 'floorData.floorValue')) utils.deepSetValue(multibidUnits, `${adUnitCode}.${bid.bidderCode}`, {floor: utils.deepAccess(bid, 'floorData.floorValue')});
+
+      utils.deepSetValue(multibidUnits, `${adUnitCode}.${bid.bidderCode}`, {ads: [bid]});
+      if (multibidUnits[adUnitCode][bid.bidderCode].ads.length === multiConfig[bid.bidderCode].maxbids) multibidUnits[adUnitCode][bid.bidderCode].maxReached = true;
+
+      fn.call(this, adUnitCode, bid);
+    }
+  } else {
+    fn.call(this, adUnitCode, bid);
+  }
+}
+
+/**
+* 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;
+  }
+
+  if (a.bidder === a.bidderCode && b.bidder !== b.bidderCode) {
+    return -1;
+  }
+
+  return 0;
+}
+
+/**
+   * @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) {
+    const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
+    let modifiedBids = [];
+    let buckets = utils.groupBy(bidsReceived, 'adUnitCode');
+    let bids = [].concat.apply([], Object.keys(buckets).reduce((result, slotId) => {
+      let bucketBids = [];
+      // Get bids and group by property originalBidder
+      let bidsByBidderName = utils.groupBy(buckets[slotId], 'originalBidder');
+      let adjustedBids = [].concat.apply([], Object.keys(bidsByBidderName).map(key => {
+        // Reset all bidderCodes to original bidder values and sort by CPM
+        return bidsByBidderName[key].sort((bidA, bidB) => {
+          if (bidA.originalBidder && bidA.originalBidder !== bidA.bidderCode) bidA.bidderCode = bidA.originalBidder;
+          if (bidA.originalBidder && bidB.originalBidder !== bidB.bidderCode) bidB.bidderCode = bidB.originalBidder;
+          return bidA.cpm > bidB.cpm ? -1 : (bidA.cpm < bidB.cpm ? 1 : 0);
+        }).map((bid, index) => {
+          // For each bid (post CPM sort), set dynamic bidderCode using prefix and index if less than maxbid amount
+          if (utils.deepAccess(multiConfig, `${bid.bidderCode}.prefix`) && index !== 0 && index < multiConfig[bid.bidderCode].maxbids) {
+            bid.bidderCode = multiConfig[bid.bidderCode].prefix + (index + 1);
+          }
+
+          return bid
+        })
+      }));
+      // Get adjustedBids by bidderCode and reduce using highestCpmCallback
+      let bidsByBidderCode = utils.groupBy(adjustedBids, 'bidderCode');
+      Object.keys(bidsByBidderCode).forEach(key => bucketBids.push(bidsByBidderCode[key].reduce(highestCpmCallback)));
+      // if adUnitBidLimit is set, pass top N number bids
+      if (adUnitBidLimit > 0) {
+        bucketBids = dealPrioritization ? bucketBids.sort(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
+        bucketBids.sort(sortByMultibid);
+        modifiedBids.push(...bucketBids.slice(0, adUnitBidLimit));
+      } else {
+        modifiedBids.push(...bucketBids);
+      }
+
+      return [].concat.apply([], modifiedBids);
+    }, []));
+
+    fn.call(this, bids, highestCpmCallback, adUnitBidLimit, true);
+  } else {
+    fn.call(this, bidsReceived, highestCpmCallback, adUnitBidLimit);
+  }
+}
+
+/**
+* Resets globally stored multibid configuration
+*/
+export const resetMultiConfig = () => { hasMultibid = false; multiConfig = {}; };
+
+/**
+* Resets globally stored multibid ad unit bids
+*/
+export const resetMultibidUnits = () => multibidUnits = {};
+
+/**
+* Set up hooks on init
+*/
+function init() {
+  events.on(CONSTANTS.EVENTS.AUCTION_INIT, resetMultibidUnits);
+  setupBeforeHookFnOnce(addBidderRequests, adjustBidderRequestsHook);
+  getHook('addBidResponse').before(addBidResponseHook, 3);
+  setupBeforeHookFnOnce(getHighestCpmBidsFromBidPool, targetBidPoolHook);
+}
+
+init();
diff --git a/modules/multibid/index.md b/modules/multibid/index.md
new file mode 100644
index 00000000000..a431d9b7960
--- /dev/null
+++ b/modules/multibid/index.md
@@ -0,0 +1,40 @@
+# Overview
+
+Module Name: multibid
+
+Purpose: To expand the number of key value pairs going to the ad server in the normal Prebid way by establishing the concept of a "dynamic alias" -- a bidder code that exists only on the response, not in the adunit. 
+
+
+# Description
+Allowing a single bidder to multi-bid into an auction has several use cases:
+
+1. allows a bidder to provide both outstream and banner
+2. supports the video VAST fallback scenario
+3. allows one bid to be blocked in the ad server and the second one still considered
+4. add extra high-value bids to the cache for future refreshes
+
+
+# Example of using config
+```
+    pbjs.setConfig({
+        multibid: [{
+            bidder: "bidderA",
+            maxBids: 3,
+            targetBiddercodePrefix: "bidA"
+        },{
+            bidder: "bidderB",
+            maxBids: 3,
+            targetBiddercodePrefix: "bidB"
+        },{
+            bidder: "bidderC",
+            maxBids: 3
+        },{
+            bidders: ["bidderD", "bidderE"],
+            maxBids: 2
+        }]
+    });
+```
+
+# Please Note:
+- 
+
diff --git a/modules/mwOpenLinkIdSystem.js b/modules/mwOpenLinkIdSystem.js
new file mode 100644
index 00000000000..b2381836d5d
--- /dev/null
+++ b/modules/mwOpenLinkIdSystem.js
@@ -0,0 +1,142 @@
+/**
+ * This module adds MediaWallah OpenLink to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/mwOpenLinkIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const openLinkID = {
+  name: 'mwol',
+  cookie_expiration: (86400 * 1000 * 365 * 1) // 1 year
+}
+
+const storage = getStorageManager();
+
+function getExpirationDate() {
+  return (new Date(utils.timestamp() + openLinkID.cookie_expiration)).toGMTString();
+}
+
+function isValidConfig(configParams) {
+  if (!configParams) {
+    utils.logError('User ID - mwOlId submodule requires configParams');
+    return false;
+  }
+  if (!configParams.accountId) {
+    utils.logError('User ID - mwOlId submodule requires accountId to be defined');
+    return false;
+  }
+  if (!configParams.partnerId) {
+    utils.logError('User ID - mwOlId submodule requires partnerId to be defined');
+    return false;
+  }
+  return true;
+}
+
+function deserializeMwOlId(mwOlIdStr) {
+  const mwOlId = {};
+  const mwOlIdArr = mwOlIdStr.split(',');
+
+  mwOlIdArr.forEach(function(value) {
+    const pair = value.split(':');
+    // unpack a value of 1 as true
+    mwOlId[pair[0]] = +pair[1] === 1 ? true : pair[1];
+  });
+
+  return mwOlId;
+}
+
+function serializeMwOlId(mwOlId) {
+  let components = [];
+
+  if (mwOlId.eid) {
+    components.push('eid:' + mwOlId.eid);
+  }
+  if (mwOlId.ibaOptout) {
+    components.push('ibaOptout:1');
+  }
+  if (mwOlId.ccpaOptout) {
+    components.push('ccpaOptout:1');
+  }
+
+  return components.join(',');
+}
+
+function readCookie(name) {
+  if (!name) name = openLinkID.name;
+  const mwOlIdStr = storage.getCookie(name);
+  if (mwOlIdStr) {
+    return deserializeMwOlId(decodeURIComponent(mwOlIdStr));
+  }
+  return null;
+}
+
+function writeCookie(mwOlId) {
+  if (mwOlId) {
+    const mwOlIdStr = encodeURIComponent(serializeMwOlId(mwOlId));
+    storage.setCookie(openLinkID.name, mwOlIdStr, getExpirationDate(), 'lax');
+  }
+}
+
+function register(configParams, olid) {
+  const { accountId, partnerId, uid } = configParams;
+  const url = 'https://ol.mediawallahscript.com/?account_id=' + accountId +
+            '&partner_id=' + partnerId +
+            '&uid=' + uid +
+            '&olid=' + olid +
+            '&cb=' + Math.random()
+            ;
+  ajax(url);
+}
+
+function setID(configParams) {
+  if (!isValidConfig(configParams)) return undefined;
+  const mwOlId = readCookie();
+  const newMwOlId = mwOlId ? utils.deepClone(mwOlId) : {eid: utils.generateUUID()};
+  writeCookie(newMwOlId);
+  register(configParams, newMwOlId.eid);
+  return {
+    id: newMwOlId
+  };
+};
+
+/* End MW */
+
+export { writeCookie };
+
+/** @type {Submodule} */
+export const mwOpenLinkIdSubModule = {
+  /**
+     * 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(mwOlId) {
+    const id = mwOlId && utils.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}
+     */
+  getId(submoduleConfig) {
+    const submoduleConfigParams = (submoduleConfig && submoduleConfig.params) || {};
+    if (!isValidConfig(submoduleConfigParams)) return undefined;
+    return setID(submoduleConfigParams);
+  }
+};
+
+submodule('userId', mwOpenLinkIdSubModule);
diff --git a/modules/mwOpenLinkIdSystem.md b/modules/mwOpenLinkIdSystem.md
new file mode 100644
index 00000000000..f55913f2983
--- /dev/null
+++ b/modules/mwOpenLinkIdSystem.md
@@ -0,0 +1,43 @@
+## MediaWallah openLink User ID Submodule
+
+OpenLink ID User ID Module generates a UUID that can be utilized to improve user matching. This module enables timely synchronization which handles MediaWallah optout. You must have a pre-existing relationship with MediaWallah prior to integrating.  
+
+### Building Prebid with openLink Id Support
+Your Prebid build must include the modules for both **userId** and **mwOpenLinkId** submodule. Follow the build instructions for Prebid as
+explained in the top level README.md file of the Prebid source tree.
+
+ex: $ gulp build --modules=userId,mwOpenLinkIdSystem
+
+##$ MediaWallah openLink ID Example Configuration
+
+When the module is included, it's automatically enabled and saves an id to both cookie with an expiration time of 1 year.  
+
+### Prebid Params
+
+Individual params may be set for the MediaWallah openLink User ID Submodule. At least accountId and partnerId must be set in the params.
+
+```javascript
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'mwOpenLinkId',
+            params: {
+                accountId: '1000',
+                partnerId: '1001',
+                uid: 'u-123xyz'
+            }
+        }]
+    }
+});
+```
+
+### Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the MediaWallah OpenLink ID User ID Module integration.
+
+| Params under usersync.userIds[]| Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | The name of this module. | `'mwOpenLinkId'` |
+| params | Required | Object | Details for mwOLID syncing. | |
+| params.accountId | Required | String | The MediaWallah assigned Account Id | `1000` |
+| params.partnerId | Required | String | The MediaWallah assign Partner Id | `1001` |
+| params.uid | Optional | String | Your unique Id for the user or browser. Used for matching | `u-123xyz` |
\ No newline at end of file
diff --git a/modules/nativoBidAdapter.js b/modules/nativoBidAdapter.js
new file mode 100644
index 00000000000..fc0925bf2ca
--- /dev/null
+++ b/modules/nativoBidAdapter.js
@@ -0,0 +1,322 @@
+import * as utils from '../src/utils.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import { BANNER } from '../src/mediaTypes.js'
+// import { config } from 'src/config'
+
+const BIDDER_CODE = 'nativo'
+const BIDDER_ENDPOINT = 'https://exchange.postrelease.com/prebid'
+
+const TIME_TO_LIVE = 360
+
+const SUPPORTED_AD_TYPES = [BANNER]
+
+const bidRequestMap = {}
+
+// Prebid adapter referrence doc: https://docs.prebid.org/dev-docs/bidder-adaptor.html
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['ntv'], // short code
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+
+  /**
+   * 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 && !!bid.params.placementId
+  },
+
+  /**
+   * Called when the page asks Prebid.js for bids
+   * Make a server request from the list of BidRequests
+   *
+   * @param {Array} validBidRequests - An array of bidRequest objects, one for each AdUnit that your module is involved in. This array has been processed for special features like sizeConfig, so it’s the list that you should be looping through
+   * @param {Object} bidderRequest - The master bidRequest object. This object is useful because it carries a couple of bid parameters that are global to all the bids.
+   * @return ServerRequest Info describing the request to the server.
+   */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    const placementIds = []
+    const placmentBidIdMap = {}
+    let placementId, pageUrl
+    validBidRequests.forEach((request) => {
+      pageUrl = pageUrl || request.params.url // Use the first url value found
+      placementId = request.params.placementId
+      placementIds.push(placementId)
+      placmentBidIdMap[placementId] = {
+        bidId: request.bidId,
+        size: getLargestSize(request.sizes),
+      }
+    })
+    bidRequestMap[bidderRequest.bidderRequestId] = placmentBidIdMap
+
+    if (!pageUrl) pageUrl = bidderRequest.refererInfo.referer
+
+    // Build adUnit data
+    const adUnitData = {
+      adUnits: validBidRequests.map((adUnit) => {
+        return {
+          adUnitCode: adUnit.adUnitCode,
+          mediaTypes: adUnit.mediaTypes,
+        }
+      }),
+    }
+
+    // Build QS Params
+    let params = [
+      { key: 'ntv_ptd', value: placementIds.toString() },
+      { key: 'ntv_pb_rid', value: bidderRequest.bidderRequestId },
+      {
+        key: 'ntv_ppc',
+        value: btoa(JSON.stringify(adUnitData)), // Convert to Base 64
+      },
+      {
+        key: 'ntv_url',
+        value: encodeURIComponent(pageUrl),
+      },
+    ]
+
+    if (bidderRequest.gdprConsent) {
+      // Put on the beginning of the qs param array
+      params.unshift({
+        key: 'ntv_gdpr_consent',
+        value: bidderRequest.gdprConsent.consentString,
+      })
+    }
+
+    if (bidderRequest.uspConsent) {
+      // Put on the beginning of the qs param array
+      params.unshift({ key: 'us_privacy', value: bidderRequest.uspConsent })
+    }
+
+    let serverRequest = {
+      method: 'GET',
+      url: BIDDER_ENDPOINT + arrayToQS(params),
+    }
+
+    return serverRequest
+  },
+
+  /**
+   * Will be called when the browser has received the response from your server.
+   * The function will parse the response and create a bidResponse object containing one or more bids.
+   * The adapter should indicate no valid bids by returning an empty array.
+   *
+   * @param {Object} response - Data returned from the bidding server request endpoint
+   * @param {Object} request - The request object used to call the server request endpoint
+   * @return {Array} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (response, request) {
+    // If the bid response was empty, return []
+    if (!response || !response.body || utils.isEmpty(response.body)) return []
+
+    try {
+      const body =
+        typeof response.body === 'string'
+          ? JSON.parse(response.body)
+          : response.body
+
+      const bidResponses = []
+      const seatbids = body.seatbid
+
+      // Step through and grab pertinent data
+      let bidResponse, adUnit
+      seatbids.forEach((seatbid) => {
+        seatbid.bid.forEach((bid) => {
+          adUnit = this.getRequestId(body.id, bid.impid)
+          bidResponse = {
+            requestId: adUnit.bidId,
+            cpm: bid.price,
+            currency: body.cur,
+            width: bid.w || adUnit.size[0],
+            height: bid.h || adUnit.size[1],
+            creativeId: bid.crid,
+            dealId: bid.id,
+            netRevenue: true,
+            ttl: bid.ttl || TIME_TO_LIVE,
+            ad: bid.adm,
+            meta: {
+              advertiserDomains: bid.adomain,
+            },
+          }
+
+          bidResponses.push(bidResponse)
+        })
+      })
+
+      // Don't need the map anymore as it was unique for one request/response
+      delete bidRequestMap[body.id]
+
+      return bidResponses
+    } catch (error) {
+      // If there is an error, return []
+      return []
+    }
+  },
+
+  /**
+   * All user ID sync activity should be done using the getUserSyncs callback of the BaseAdapter model.
+   * Given an array of all the responses from the server, getUserSyncs is used to determine which user syncs should occur.
+   * The order of syncs in the serverResponses array matters. The most important ones should come first, since publishers may limit how many are dropped on their page.
+   * @param {Object} syncOptions - Which user syncs are allowed?
+   * @param {Array} serverResponses - Array of server's responses
+   * @param {Object} gdprConsent - GDPR consent data
+   * @param {Object} uspConsent - USP consent data
+   * @return {Array} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (
+    syncOptions,
+    serverResponses,
+    gdprConsent,
+    uspConsent
+  ) {
+    // Generate consent qs string
+    let params = ''
+    // GDPR
+    if (gdprConsent) {
+      params = appendQSParamString(
+        params,
+        'gdpr',
+        gdprConsent.gdprApplies ? 1 : 0
+      )
+      params = appendQSParamString(
+        params,
+        'gdpr_consent',
+        encodeURIComponent(gdprConsent.consentString || '')
+      )
+    }
+    // CCPA
+    if (uspConsent) {
+      params = appendQSParamString(
+        params,
+        'us_privacy',
+        encodeURIComponent(uspConsent.uspConsent)
+      )
+    }
+
+    // Get sync urls from the respnse and inject cinbsent params
+    const types = {
+      iframe: syncOptions.iframeEnabled,
+      image: syncOptions.pixelEnabled,
+    }
+    const syncs = []
+
+    let body
+    serverResponses.forEach((response) => {
+      // If the bid response was empty, return []
+      if (!response || !response.body || utils.isEmpty(response.body)) {
+        return syncs
+      }
+
+      body =
+        typeof response.body === 'string'
+          ? JSON.parse(response.body)
+          : response.body
+
+      // 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),
+              })
+            }
+          }
+        })
+      })
+    })
+
+    return syncs
+  },
+
+  /**
+   * Will be called when an adpater timed out for an auction.
+   * Adapter can fire a ajax or pixel call to register a timeout at thier end.
+   * @param {Object} timeoutData - Timeout specific data
+   */
+  onTimeout: function (timeoutData) {},
+
+  /**
+   * Will be called when a bid from the adapter won the auction.
+   * @param {Object} bid - The bid that won the auction
+   */
+  onBidWon: function (bid) {},
+
+  /**
+   * Will be called when the adserver targeting has been set for a bid from the adapter.
+   * @param {Object} bidder - The bid of which the targeting has been set
+   */
+  onSetTargeting: function (bid) {},
+
+  /**
+   * Maps Prebid's bidId to Nativo's placementId values per unique bidderRequestId
+   * @param {String} bidderRequestId - The unique ID value associated with the bidderRequest
+   * @param {String} placementId - The placement ID value from Nativo
+   * @returns {String} - The bidId value associated with the corresponding placementId
+   */
+  getRequestId: function (bidderRequestId, placementId) {
+    return (
+      bidRequestMap[bidderRequestId] &&
+      bidRequestMap[bidderRequestId][placementId]
+    )
+  },
+}
+registerBidder(spec)
+
+// Utils
+/**
+ * Append QS param to existing string
+ * @param {String} str - String to append to
+ * @param {String} key - Key to append
+ * @param {String} value - Value to append
+ * @returns
+ */
+function appendQSParamString(str, key, value) {
+  return str + `${str.length ? '&' : ''}${key}=${value}`
+}
+
+/**
+ * Convert an object to query string parameters
+ * @param {Object} obj - Object to convert
+ * @returns
+ */
+function arrayToQS(arr) {
+  return (
+    '?' +
+    arr.reduce((value, obj) => {
+      return appendQSParamString(value, obj.key, obj.value)
+    }, '')
+  )
+}
+
+/**
+ * Get the largest size array
+ * @param {Array} sizes - Array of size arrays
+ * @returns Size array with the largest area
+ */
+function getLargestSize(sizes, method = area) {
+  if (!sizes || sizes.length === 0) return []
+  if (sizes.length === 1) return sizes[0]
+
+  return sizes.reduce((prev, current) => {
+    if (method(current) > method(prev)) {
+      return current
+    } else {
+      return prev
+    }
+  })
+}
+
+/**
+ * Calculate the area
+ * @param {Array} size - [width, height]
+ * @returns The calculated area
+ */
+const area = (size) => size[0] * size[1]
diff --git a/modules/nativoBidAdapter.md b/modules/nativoBidAdapter.md
new file mode 100644
index 00000000000..ec0980aae50
--- /dev/null
+++ b/modules/nativoBidAdapter.md
@@ -0,0 +1,40 @@
+# Overview
+
+```
+Module Name: Nativo Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: prebiddev@nativo.com
+```
+
+# Description
+
+Module that connects to Nativo's demand sources
+
+# Dev
+
+gulp serve --modules=nativoBidAdapter
+
+# Test Parameters
+
+```
+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: {
+                    placementId: 1125609,
+                    url: 'https://test-sites.internal.nativo.net/testing/prebid_adpater.html'
+                }
+            }]
+
+        }
+    ];
+
+```
diff --git a/modules/netIdSystem.js b/modules/netIdSystem.js
index cfe78d9f488..90c8735c993 100644
--- a/modules/netIdSystem.js
+++ b/modules/netIdSystem.js
@@ -26,12 +26,12 @@ export const netIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @param {(Object|undefined)} cacheIdObj
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
     /* currently not possible */
     return {};
   }
diff --git a/modules/nextMillenniumBidAdapter.js b/modules/nextMillenniumBidAdapter.js
index af1f0562ba4..86da82753b6 100644
--- a/modules/nextMillenniumBidAdapter.js
+++ b/modules/nextMillenniumBidAdapter.js
@@ -3,8 +3,7 @@ import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'nextMillennium';
-const HOST = 'https://brainlyads.com';
-const CURRENCY = 'USD';
+const ENDPOINT = 'https://pbs.nextmillmedia.com/openrtb2/auction';
 const TIME_TO_LIVE = 360;
 
 export const spec = {
@@ -13,7 +12,7 @@ export const spec = {
 
   isBidRequestValid: function(bid) {
     return !!(
-      bid.params.placement_id && utils.isNumber(bid.params.placement_id)
+      bid.params.placement_id && utils.isStr(bid.params.placement_id)
     );
   },
 
@@ -23,13 +22,19 @@ export const spec = {
     utils._each(validBidRequests, function(bid) {
       requests.push({
         method: 'POST',
-        url: HOST + '/hb/s2s',
+        url: ENDPOINT,
         options: {
           contentType: 'application/json',
           withCredentials: true
         },
         data: JSON.stringify({
-          placement_id: utils.getBidIdParameter('placement_id', bid.params)
+          'ext': {
+            'prebid': {
+              'storedrequest': {
+                'id': utils.getBidIdParameter('placement_id', bid.params)
+              }
+            }
+          }
         }),
         bidId: bid.bidId
       });
@@ -39,47 +44,32 @@ export const spec = {
   },
 
   interpretResponse: function(serverResponse, bidRequest) {
-    try {
-      const bidResponse = serverResponse.body;
-      const bidResponses = [];
+    const response = serverResponse.body;
+    const bidResponses = [];
 
-      if (Number(bidResponse.cpm) > 0) {
-        bidResponses.push({
-          requestId: bidRequest.bidId,
-          cpm: bidResponse.cpm,
-          width: bidResponse.width,
-          height: bidResponse.height,
-          creativeId: bidResponse.creativeId,
-          currency: CURRENCY,
-          netRevenue: false,
-          ttl: TIME_TO_LIVE,
-          ad: bidResponse.ad
+    try {
+      utils._each(response.seatbid, (resp) => {
+        utils._each(resp.bid, (bid) => {
+          bidResponses.push({
+            requestId: bidRequest.bidId,
+            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 || []
+            },
+            ad: bid.adm
+          });
         });
-      }
-
-      return bidResponses;
+      })
     } catch (err) {
       utils.logError(err);
-      return [];
-    }
-  },
-
-  getUserSyncs: function(syncOptions) {
-    const syncs = []
-    if (syncOptions.iframeEnabled) {
-      syncs.push({
-        type: 'iframe',
-        url: HOST + '/hb/s2s/matching'
-      });
-    }
-
-    if (syncOptions.pixelEnabled) {
-      syncs.push({
-        type: 'image',
-        url: HOST + '/hb/s2s/matching'
-      });
     }
-    return syncs;
+    return bidResponses;
   }
 };
 registerBidder(spec);
diff --git a/modules/nextMillenniumBidAdapter.md b/modules/nextMillenniumBidAdapter.md
index c583969b4af..048fe907ac7 100644
--- a/modules/nextMillenniumBidAdapter.md
+++ b/modules/nextMillenniumBidAdapter.md
@@ -2,7 +2,7 @@
 ```
 Module Name: NextMillennium Bid Adapter
 Module Type: Bidder Adapter
-Maintainer: mikhail.ivanchenko@iageengineering.net
+Maintainer: mihail.ivanchenko@nextmillennium.io
 ```
 
 # Description
@@ -21,7 +21,7 @@ Currently module supports only banner mediaType.
         bids: [{
             bidder: 'nextMillennium',
             params: {
-                placement_id: -1
+                placement_id: '-1'
             }
         }]
     }];
diff --git a/modules/nextrollBidAdapter.js b/modules/nextrollBidAdapter.js
index 02ebcd3f87a..cb317190bea 100644
--- a/modules/nextrollBidAdapter.js
+++ b/modules/nextrollBidAdapter.js
@@ -177,7 +177,7 @@ function _getNativeAssets(mediaTypeNative) {
 }
 
 function _getUser(requests) {
-  const id = utils.deepAccess(requests, '0.userId.nextroll');
+  const id = utils.deepAccess(requests, '0.userId.nextrollId');
   if (id === undefined) {
     return;
   }
diff --git a/modules/nextrollIdSystem.js b/modules/nextrollIdSystem.js
new file mode 100644
index 00000000000..5a59e216394
--- /dev/null
+++ b/modules/nextrollIdSystem.js
@@ -0,0 +1,50 @@
+/**
+ * This module adds Nextroll ID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/nextrollIdSystem
+ * @requires module:modules/userId
+ */
+
+import { deepAccess } from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const NEXTROLL_ID_LS_KEY = 'dca0.com';
+const KEY_PREFIX = 'AdID:'
+
+export const storage = getStorageManager();
+
+/** @type {Submodule} */
+export const nextrollIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'nextrollId',
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @return {{nextrollId: string} | undefined}
+   */
+  decode(value) {
+    return value;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {{id: {nextrollId: string} | undefined}}
+   */
+  getId(config) {
+    const key = KEY_PREFIX + deepAccess(config, 'params.partnerId', 'undefined');
+    const dataString = storage.getDataFromLocalStorage(NEXTROLL_ID_LS_KEY) || '{}';
+    const data = JSON.parse(dataString);
+    const idValue = deepAccess(data, `${key}.value`);
+
+    return { id: idValue ? {nextrollId: idValue} : undefined };
+  }
+};
+
+submodule('userId', nextrollIdSubmodule);
diff --git a/modules/nobidBidAdapter.js b/modules/nobidBidAdapter.js
index f1a9092e31d..3aabd8f0635 100644
--- a/modules/nobidBidAdapter.js
+++ b/modules/nobidBidAdapter.js
@@ -6,7 +6,7 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const storage = getStorageManager();
 const BIDDER_CODE = 'nobid';
-window.nobidVersion = '1.2.6';
+window.nobidVersion = '1.3.0';
 window.nobid = window.nobid || {};
 window.nobid.bidResponses = window.nobid.bidResponses || {};
 window.nobid.timeoutTotal = 0;
@@ -24,6 +24,15 @@ function nobidSetCookie(cname, cvalue, hours) {
 function nobidGetCookie(cname) {
   return storage.getCookie(cname);
 }
+function nobidHasPurpose1Consent(bidderRequest) {
+  let result = true;
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    if (bidderRequest.gdprConsent.gdprApplies && bidderRequest.gdprConsent.apiVersion === 2) {
+      result = !!(utils.deepAccess(bidderRequest.gdprConsent, 'vendorData.purpose.consents.1') === true);
+    }
+  }
+  return result;
+}
 function nobidBuildRequests(bids, bidderRequest) {
   var serializeState = function(divIds, siteId, adunits) {
     var filterAdUnitsByIds = function(divIds, adUnits) {
@@ -105,6 +114,23 @@ function nobidBuildRequests(bids, bidderRequest) {
         utils.logWarn('Could not parse screen dimensions, error details:', e);
       }
     }
+    var getEIDs = function(eids) {
+      if (utils.isArray(eids) && eids.length > 0) {
+        let src = [];
+        eids.forEach((eid) => {
+          let ids = [];
+          if (eid.uids) {
+            eid.uids.forEach(value => {
+              ids.push({'id': value.id + ''});
+            });
+          }
+          if (eid.source && ids.length > 0) {
+            src.push({source: eid.source, uids: ids});
+          }
+        });
+        return src;
+      }
+    }
     var state = {};
     state['sid'] = siteId;
     state['l'] = topLocation(bidderRequest);
@@ -122,6 +148,8 @@ function nobidBuildRequests(bids, bidderRequest) {
     if (sch) state['schain'] = sch;
     const cop = coppa();
     if (cop) state['coppa'] = cop;
+    const eids = getEIDs(utils.deepAccess(bids, '0.userIdAsEids'));
+    if (eids && eids.length > 0) state['eids'] = eids;
     return state;
   }
   function newAdunit(adunitObject, adunits) {
@@ -270,6 +298,9 @@ function nobidInterpretResponse(response, bidRequest) {
     if (bid.videoCacheKey) {
       bidResponse.videoCacheKey = bid.videoCacheKey;
     }
+    if (bid.meta) {
+      bidResponse.meta = bid.meta;
+    }
 
     bidResponses.push(bidResponse);
   }
@@ -296,19 +327,7 @@ window.addEventListener('message', function (event) {
     if (window.nobid && window.nobid.bidResponses) {
       var bid = window.nobid.bidResponses['' + adId];
       if (bid && bid.adm2) {
-        var markup = null;
-        if (bid.is_combo && bid.adm_combo) {
-          for (var i in bid.adm_combo) {
-            var combo = bid.adm_combo[i];
-            if (!combo.done) {
-              markup = combo.adm;
-              combo.done = true;
-              break;
-            }
-          }
-        } else {
-          markup = bid.adm2;
-        }
+        var markup = bid.adm2;
         if (markup) {
           event.source.postMessage('nbTagRenderer.renderAdInSafeFrame|' + markup, '*');
         }
@@ -358,11 +377,18 @@ export const spec = {
     window.nobid.refreshCount++;
     const payloadString = JSON.stringify(payload).replace(/'|&|#/g, '')
     const endpoint = buildEndpoint();
+
+    let options = {};
+    if (!nobidHasPurpose1Consent(bidderRequest)) {
+      options = { withCredentials: false };
+    }
+
     return {
       method: 'POST',
       url: endpoint,
       data: payloadString,
-      bidderRequest
+      bidderRequest,
+      options
     };
   },
   /**
diff --git a/modules/novatiqIdSystem.js b/modules/novatiqIdSystem.js
new file mode 100644
index 00000000000..fbfa6ca8abc
--- /dev/null
+++ b/modules/novatiqIdSystem.js
@@ -0,0 +1,88 @@
+/**
+ * This module adds novatiqId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/novatiqIdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { submodule } from '../src/hook.js';
+
+/** @type {Submodule} */
+export const novatiqIdSubmodule = {
+
+/**
+* used to link submodule with config
+* @type {string}
+*/
+  name: 'novatiq',
+
+  /**
+* decode the stored id value for passing to bid requests
+* @function
+* @returns {novatiq: {snowflake: string}}
+*/
+  decode(novatiqId, config) {
+    let responseObj = {
+      novatiq: {
+        snowflake: novatiqId
+      }
+    };
+    return responseObj;
+  },
+
+  /**
+* performs action to obtain id and return a value in the callback's response argument
+* @function
+* @param {SubmoduleConfig} config
+* @returns {id: string}
+*/
+  getId(config) {
+    function snowflakeId(placeholder) {
+      return placeholder
+        ? (placeholder ^ Math.random() * 16 >> placeholder / 4).toString(16)
+        : ([1e7] + -1e3 + -4e3 + -8e3 + -1e11 + 1e3).replace(/[018]/g, snowflakeId);
+    }
+
+    const configParams = config.params || {};
+    const srcId = this.getSrcId(configParams);
+    utils.logInfo('NOVATIQ Sync request used sourceid param: ' + srcId);
+
+    let partnerhost;
+    partnerhost = window.location.hostname;
+    utils.logInfo('NOVATIQ partner hostname: ' + partnerhost);
+
+    const novatiqId = snowflakeId();
+    const url = 'https://spadsync.com/sync?sptoken=' + novatiqId + '&sspid=' + srcId + '&ssphost=' + partnerhost;
+    ajax(url, undefined, undefined, { method: 'GET', withCredentials: false });
+
+    utils.logInfo('NOVATIQ snowflake: ' + novatiqId);
+    return { 'id': novatiqId }
+  },
+
+  getSrcId(configParams) {
+    utils.logInfo('NOVATIQ Configured sourceid param: ' + configParams.sourceid);
+
+    function isHex(str) {
+      var a = parseInt(str, 16);
+      return (a.toString(16) === str)
+    }
+
+    let srcId;
+    if (typeof configParams.sourceid === 'undefined' || configParams.sourceid === null || configParams.sourceid === '') {
+      srcId = '000';
+      utils.logInfo('NOVATIQ sourceid param set to value 000 due to undefined parameter or missing value in config section');
+    } else if (configParams.sourceid.length < 3 || configParams.sourceid.length > 3) {
+      srcId = '001';
+      utils.logInfo('NOVATIQ sourceid param set to value 001 due to wrong size in config section 3 chars max e.g. 1ab');
+    } else if (isHex(configParams.sourceid) == false) {
+      srcId = '002';
+      utils.logInfo('NOVATIQ sourceid param set to value 002 due to wrong format in config section expecting hex value only');
+    } else {
+      srcId = configParams.sourceid;
+    }
+    return srcId
+  }
+};
+submodule('userId', novatiqIdSubmodule);
diff --git a/modules/novatiqIdSystem.md b/modules/novatiqIdSystem.md
new file mode 100644
index 00000000000..ce561a696e3
--- /dev/null
+++ b/modules/novatiqIdSystem.md
@@ -0,0 +1,36 @@
+# Novatiq Snowflake ID
+
+Novatiq proprietary dynamic snowflake ID is a unique, non sequential and single use identifier for marketing activation. Our in network solution matches verification requests to telco network IDs, safely and securely inside telecom infrastructure. Novatiq snowflake ID can be used for identity validation and as a secured 1st party data delivery mechanism.
+
+## Novatiq Snowflake ID Configuration
+
+Enable by adding the Novatiq submodule to your Prebid.js package with:
+
+```
+gulp build --modules=novatiqIdSystem,userId
+```
+
+Module activation and configuration:
+
+```javascript
+pbjs.setConfig({
+  userSync: {
+    userIds: [{
+      name: 'novatiq',
+      params: {
+        sourceid '1a3',            // change to the Partner Number you received from Novatiq
+        }
+      }
+    }],
+    auctionDelay: 50             // 50ms maximum auction delay, applies to all userId modules
+  }
+});
+```
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | Module identification: `"novatiq"` | `"novatiq"` |
+| params | Required | Object | Configuration specifications for the Novatiq module. | |
+| params.sourceid | Required | String | This is the Novatiq Partner Number obtained via Novatiq registration. | `1a3` |
+
+If you have any questions, please reach out to us at prebid@novatiq.com.
diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
new file mode 100644
index 00000000000..0b4982bc8dc
--- /dev/null
+++ b/modules/oguryBidAdapter.js
@@ -0,0 +1,135 @@
+'use strict';
+
+import { BANNER } from '../src/mediaTypes.js';
+import { getAdUnitSizes, logWarn, isFn } from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'ogury';
+const DEFAULT_TIMEOUT = 1000;
+const BID_HOST = 'https://webmobile.presage.io/api/header-bidding-request';
+
+function isBidRequestValid(bid) {
+  const adUnitSizes = getAdUnitSizes(bid);
+
+  const isValidSizes = Boolean(adUnitSizes) && adUnitSizes.length > 0;
+  const isValidAdUnitId = !!bid.params.adUnitId;
+  const isValidAssetKey = !!bid.params.assetKey;
+
+  return (isValidSizes && isValidAdUnitId && isValidAssetKey);
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const openRtbBidRequestBanner = {
+    id: bidderRequest.auctionId,
+    tmax: DEFAULT_TIMEOUT,
+    at: 2,
+    regs: {
+      ext: {
+        gdpr: 1
+      },
+    },
+    site: {
+      domain: location.hostname
+    },
+    user: {
+      ext: {
+        consent: ''
+      }
+    },
+    imp: []
+  };
+
+  if (bidderRequest.hasOwnProperty('gdprConsent') &&
+    bidderRequest.gdprConsent.hasOwnProperty('gdprApplies')) {
+    openRtbBidRequestBanner.regs.ext.gdpr = bidderRequest.gdprConsent.gdprApplies ? 1 : 0
+  }
+
+  if (bidderRequest.hasOwnProperty('gdprConsent') &&
+    bidderRequest.gdprConsent.hasOwnProperty('consentString') &&
+    bidderRequest.gdprConsent.consentString.length > 0) {
+    openRtbBidRequestBanner.user.ext.consent = bidderRequest.gdprConsent.consentString
+  }
+
+  validBidRequests.forEach((bidRequest) => {
+    const sizes = getAdUnitSizes(bidRequest)
+      .map(size => ({ w: size[0], h: size[1] }));
+
+    if (bidRequest.hasOwnProperty('mediaTypes') &&
+      bidRequest.mediaTypes.hasOwnProperty('banner')) {
+      openRtbBidRequestBanner.site.id = bidRequest.params.assetKey;
+
+      openRtbBidRequestBanner.imp.push({
+        id: bidRequest.bidId,
+        tagid: bidRequest.params.adUnitId,
+        bidfloor: getFloor(bidRequest),
+        banner: {
+          format: sizes
+        }
+      });
+    }
+  });
+
+  return {
+    method: 'POST',
+    url: BID_HOST,
+    data: openRtbBidRequestBanner
+  };
+}
+
+function interpretResponse(openRtbBidResponse) {
+  if (!openRtbBidResponse ||
+    !openRtbBidResponse.body ||
+    typeof openRtbBidResponse.body != 'object' ||
+    Object.keys(openRtbBidResponse.body).length === 0) {
+    logWarn('no response or body is malformed');
+    return [];
+  }
+
+  const bidResponses = [];
+
+  openRtbBidResponse.body.seatbid.forEach((seatbid) => {
+    seatbid.bid.forEach((bid) => {
+      let bidResponse = {
+        requestId: bid.impid,
+        cpm: bid.price,
+        currency: 'USD',
+        width: bid.w,
+        height: bid.h,
+        creativeId: bid.id,
+        netRevenue: true,
+        ttl: 60,
+        meta: {
+          advertiserDomains: bid.adomain
+        }
+      };
+
+      bidResponse.ad = bid.adm;
+
+      bidResponses.push(bidResponse);
+    });
+  });
+  return bidResponses;
+}
+
+function getFloor(bid) {
+  if (!isFn(bid.getFloor)) {
+    return 0;
+  }
+  let floorResult = bid.getFloor({
+    currency: 'USD',
+    mediaType: 'banner',
+    size: '*'
+  });
+  return floorResult.currency === 'USD' ? floorResult.floor : 0;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+  getFloor
+}
+
+registerBidder(spec);
diff --git a/modules/oguryBidAdapter.md b/modules/oguryBidAdapter.md
new file mode 100644
index 00000000000..00896762dc4
--- /dev/null
+++ b/modules/oguryBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Ogury Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: web.inventory@ogury.co
+```
+
+# Description
+
+Module that connects to Ogury's SSP solution
+Ogury bid adapter supports Banner media type.
+
+# Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'test-div',
+            mediaTypes: {
+                banner: {
+                    sizes: [[300, 250]],  // a display size
+                }
+            },
+            bids: [
+                {
+                    bidder: "ogury",
+                    params: {
+                        assetKey: 'OGY-CA41D116484F',
+                        adUnitId: '2c4d61d0-90aa-0139-0cda-0242ac120004'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/oneVideoBidAdapter.js b/modules/oneVideoBidAdapter.js
index 00f7086e7fb..dfedbd156a9 100644
--- a/modules/oneVideoBidAdapter.js
+++ b/modules/oneVideoBidAdapter.js
@@ -1,13 +1,14 @@
 import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
+
 const BIDDER_CODE = 'oneVideo';
 export const spec = {
   code: 'oneVideo',
-  VERSION: '3.0.3',
+  VERSION: '3.1.1',
   ENDPOINT: 'https://ads.adaptv.advertising.com/rtb/openrtb?ext_id=',
-  SYNC_ENDPOINT1: 'https://cm.g.doubleclick.net/pixel?google_nid=adaptv_dbm&google_cm&google_sc',
-  SYNC_ENDPOINT2: 'https://pr-bh.ybp.yahoo.com/sync/adaptv_ortb/{combo_uid}',
-  SYNC_ENDPOINT3: 'https://match.adsrvr.org/track/cmf/generic?ttd_pid=adaptv&ttd_tpi=1',
+  E2ETESTENDPOINT: 'https://ads-wc.v.ssp.yahoo.com/rtb/openrtb?ext_id=',
+  SYNC_ENDPOINT1: 'https://pixel.advertising.com/ups/57304/sync?gdpr=&gdpr_consent=&_origin=0&redir=true',
+  SYNC_ENDPOINT2: 'https://match.adsrvr.org/track/cmf/generic?ttd_pid=adaptv&ttd_tpi=1',
   supportedMediaTypes: ['video', 'banner'],
   /**
    * Determines whether or not the given bid request is valid.
@@ -16,26 +17,52 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid: function(bid) {
+    // Bidder code validation
     if (bid.bidder !== BIDDER_CODE || typeof bid.params === 'undefined') {
       return false;
     }
 
-    // Video validations
-    if (typeof bid.params.video === 'undefined' || typeof bid.params.video.playerWidth === 'undefined' || typeof bid.params.video.playerHeight == 'undefined' || typeof bid.params.video.mimes == 'undefined') {
-      return false;
+    // E2E test skip validations
+    if (bid.params && bid.params.video && bid.params.video.e2etest) {
+      return true;
     }
+    // MediaTypes Video / Banner validation
+    if (typeof bid.mediaTypes.video === 'undefined' && typeof bid.mediaTypes.banner === 'undefined') {
+      utils.logError('Failed validation: adUnit mediaTypes.video OR mediaTypes.banner not declared');
+      return false;
+    };
 
-    // Prevend DAP Outstream validation, Banner DAP validation & Multi-Format adUnit support
     if (bid.mediaTypes.video) {
-      if (bid.mediaTypes.video.context === 'outstream' && bid.params.video.display === 1) {
+      // Player size validation
+      if (typeof bid.mediaTypes.video.playerSize === 'undefined') {
+        if (bid.params.video && (typeof bid.params.video.playerWidth === 'undefined' || typeof bid.params.video.playerHeight === 'undefined')) {
+          utils.logError('Failed validation: Player size not declared in either mediaTypes.playerSize OR bid.params.video.plauerWidth & bid.params.video.playerHeight.');
+          return false;
+        };
+      };
+      // Mimes validation
+      if (typeof bid.mediaTypes.video.mimes === 'undefined') {
+        if (!bid.params.video || typeof bid.params.video.mimes === 'undefined') {
+          utils.logError('Failed validation: adUnit mediaTypes.mimes OR params.video.mimes not declared');
+          return false;
+        };
+      };
+      // Prevend DAP Outstream validation, Banner DAP validation & Multi-Format adUnit support
+      if (bid.mediaTypes.video.context === 'outstream' && bid.params.video && bid.params.video.display === 1) {
+        utils.logError('Failed validation: Dynamic Ad Placement cannot be used with context Outstream (params.video.display=1)');
         return false;
-      }
-    } else if (bid.mediaTypes.banner && !bid.params.video.display) {
+      };
+    };
+
+    // DAP Validation
+    if (bid.mediaTypes.banner && bid.params.video && !bid.params.video.display) {
+      utils.logError('Failed validation: If you are trying to use Dynamic Ad Placement you must pass params.video.display=1');
       return false;
-    }
+    };
 
-    // Pub Id validation
+    // Publisher Id (Exchange) validation
     if (typeof bid.params.pubId === 'undefined') {
+      utils.logError('Failed validation: Adapter cannot send requests without bid.params.pubId');
       return false;
     }
 
@@ -48,15 +75,21 @@ export const spec = {
    * @param bidderRequest
    * @return ServerRequest Info describing the request to the server.
    */
-  buildRequests: function(bids, bidRequest) {
+  buildRequests: function (bids, bidRequest) {
     let consentData = bidRequest ? bidRequest.gdprConsent : null;
 
     return bids.map(bid => {
+      let url = spec.ENDPOINT
+      let pubId = bid.params.pubId;
+      if (bid.params.video.e2etest) {
+        url = spec.E2ETESTENDPOINT;
+        pubId = 'HBExchange';
+      }
       return {
         method: 'POST',
         /** removing adding local protocal since we
          * can get cookie data only if we call with https. */
-        url: spec.ENDPOINT + bid.params.pubId,
+        url: url + pubId,
         data: getRequestData(bid, consentData, bidRequest),
         bidRequest: bid
       }
@@ -68,7 +101,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(response, { bidRequest }) {
+  interpretResponse: function(response, {bidRequest}) {
     let bid;
     let size;
     let bidResponse;
@@ -87,14 +120,16 @@ export const spec = {
       requestId: bidRequest.bidId,
       bidderCode: spec.code,
       cpm: bid.price,
-      adId: bid.adid,
       creativeId: bid.crid,
       width: size.width,
       height: size.height,
       currency: response.cur,
-      ttl: 100,
+      ttl: (bidRequest.params.video.ttl > 0 && bidRequest.params.video.ttl <= 3600) ? bidRequest.params.video.ttl : 300,
       netRevenue: true,
-      adUnitCode: bidRequest.adUnitCode
+      adUnitCode: bidRequest.adUnitCode,
+      meta: {
+        advertiserDomains: bid.adomain
+      }
     };
 
     bidResponse.mediaType = (bidRequest.mediaTypes.banner) ? 'banner' : 'video'
@@ -106,7 +141,6 @@ export const spec = {
     } else if (bid.adm) {
       bidResponse.vastXml = bid.adm;
     }
-
     if (bidRequest.mediaTypes.video) {
       bidResponse.renderer = (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined;
     }
@@ -121,24 +155,23 @@ export const spec = {
    * @return {UserSync[]} The user syncs which should be dropped.
    */
   getUserSyncs: function(syncOptions, responses, consentData = {}) {
-    let { gdprApplies, consentString = '' } = consentData;
+    let {
+      gdprApplies,
+      consentString = ''
+    } = consentData;
 
     if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
         url: spec.SYNC_ENDPOINT1
       },
-      {
-        type: 'image',
-        url: spec.SYNC_ENDPOINT2
-      },
       {
         type: 'image',
         url: `https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0` + encodeURI(`&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}`)
       },
       {
         type: 'image',
-        url: spec.SYNC_ENDPOINT3
+        url: spec.SYNC_ENDPOINT2
       }];
     }
   }
@@ -161,14 +194,17 @@ function getRequestData(bid, consentData, bidRequest) {
   let loc = bidRequest.refererInfo.referer;
   let page = (bid.params.site && bid.params.site.page) ? (bid.params.site.page) : (loc.href);
   let ref = (bid.params.site && bid.params.site.referrer) ? bid.params.site.referrer : bidRequest.refererInfo.referer;
+  let getFloorRequestObject = {
+    currency: bid.params.cur || 'USD',
+    mediaType: 'video',
+    size: '*'
+  };
   let bidData = {
     id: utils.generateUUID(),
     at: 2,
-    cur: bid.cur || 'USD',
     imp: [{
       id: '1',
       secure: isSecure(),
-      bidfloor: bid.params.bidfloor,
       ext: {
         hb: 1,
         prebidver: '$prebid.version$',
@@ -187,41 +223,56 @@ function getRequestData(bid, consentData, bidRequest) {
 
   if (bid.params.video.display == undefined || bid.params.video.display != 1) {
     bidData.imp[0].video = {
-      mimes: bid.params.video.mimes,
-      w: bid.params.video.playerWidth,
-      h: bid.params.video.playerHeight,
-      pos: bid.params.video.position,
+      linearity: 1
+    };
+    if (bid.params.video.playerWidth && bid.params.video.playerHeight) {
+      bidData.imp[0].video.w = bid.params.video.playerWidth;
+      bidData.imp[0].video.h = bid.params.video.playerHeight;
+    } else {
+      const playerSize = getSize(bid.mediaTypes.video.playerSize);
+      bidData.imp[0].video.w = playerSize.width;
+      bidData.imp[0].video.h = playerSize.height;
+    };
+    if (bid.params.video.mimes) {
+      bidData.imp[0].video.mimes = bid.params.video.mimes;
+    } else {
+      bidData.imp[0].video.mimes = bid.mediaTypes.video.mimes;
     };
-    if (bid.params.video.maxbitrate) {
-      bidData.imp[0].video.maxbitrate = bid.params.video.maxbitrate
+    if (bid.mediaTypes.video.maxbitrate || bid.params.video.maxbitrate) {
+      bidData.imp[0].video.maxbitrate = bid.params.video.maxbitrate || bid.mediaTypes.video.maxbitrate;
     }
-    if (bid.params.video.maxduration) {
-      bidData.imp[0].video.maxduration = bid.params.video.maxduration
+    if (bid.mediaTypes.video.maxduration || bid.params.video.maxduration) {
+      bidData.imp[0].video.maxduration = bid.params.video.maxduration || bid.mediaTypes.video.maxduration;
     }
-    if (bid.params.video.minduration) {
-      bidData.imp[0].video.minduration = bid.params.video.minduration
+    if (bid.mediaTypes.video.minduration || bid.params.video.minduration) {
+      bidData.imp[0].video.minduration = bid.params.video.minduration || bid.mediaTypes.video.minduration;
     }
-    if (bid.params.video.api) {
-      bidData.imp[0].video.api = bid.params.video.api
+    if (bid.mediaTypes.video.api || bid.params.video.api) {
+      bidData.imp[0].video.api = bid.params.video.api || bid.mediaTypes.video.api;
     }
-    if (bid.params.video.delivery) {
-      bidData.imp[0].video.delivery = bid.params.video.delivery
+    if (bid.mediaTypes.video.delivery || bid.params.video.delivery) {
+      bidData.imp[0].video.delivery = bid.params.video.delivery || bid.mediaTypes.video.delivery;
     }
-    if (bid.params.video.position) {
-      bidData.imp[0].video.pos = bid.params.video.position
+    if (bid.mediaTypes.video.position || bid.params.video.position) {
+      bidData.imp[0].video.pos = bid.params.video.position || bid.mediaTypes.video.position;
     }
-    if (bid.params.video.playbackmethod) {
-      bidData.imp[0].video.playbackmethod = bid.params.video.playbackmethod
+    if (bid.mediaTypes.video.playbackmethod || bid.params.video.playbackmethod) {
+      bidData.imp[0].video.playbackmethod = bid.params.video.playbackmethod || bid.mediaTypes.video.playbackmethod;
     }
-    if (bid.params.video.placement) {
-      bidData.imp[0].video.placement = bid.params.video.placement
+    if (bid.mediaTypes.video.placement || bid.params.video.placement) {
+      bidData.imp[0].video.placement = bid.params.video.placement || bid.mediaTypes.video.placement;
     }
     if (bid.params.video.rewarded) {
       bidData.imp[0].ext.rewarded = bid.params.video.rewarded
     }
-    bidData.imp[0].video.linearity = 1;
-    bidData.imp[0].video.protocols = bid.params.video.protocols || [2, 5];
+    if (bid.mediaTypes.video.linearity || bid.params.video.linearity) {
+      bidData.imp[0].video.linearity = bid.params.video.linearity || bid.mediaTypes.video.linearity || 1;
+    }
+    if (bid.mediaTypes.video.protocols || bid.params.video.protocols) {
+      bidData.imp[0].video.protocols = bid.params.video.protocols || bid.mediaTypes.video.protocols || [2, 5];
+    }
   } else if (bid.params.video.display == 1) {
+    getFloorRequestObject.mediaType = 'banner';
     bidData.imp[0].banner = {
       mimes: bid.params.video.mimes,
       w: bid.params.video.playerWidth,
@@ -240,6 +291,15 @@ function getRequestData(bid, consentData, bidRequest) {
       bidData.imp[0].banner.ext.minduration = bid.params.video.minduration
     }
   }
+
+  if (utils.isFn(bid.getFloor)) {
+    let floorData = bid.getFloor(getFloorRequestObject);
+    bidData.imp[0].bidfloor = floorData.floor;
+    bidData.cur = floorData.currency;
+  } else {
+    bidData.imp[0].bidfloor = bid.params.bidfloor;
+  };
+
   if (bid.params.video.inventoryid) {
     bidData.imp[0].ext.inventoryid = bid.params.video.inventoryid
   }
@@ -258,6 +318,13 @@ function getRequestData(bid, consentData, bidRequest) {
     if (bid.params.video.hp == 1) {
       bidData.source.ext.schain.nodes[0].hp = bid.params.video.hp;
     }
+  } else if (bid.schain) {
+    bidData.source = {
+      ext: {
+        schain: bid.schain
+      }
+    }
+    bidData.source.ext.schain.nodes[0].rid = bidData.id;
   }
   if (bid.params.site && bid.params.site.id) {
     bidData.site.id = bid.params.site.id
@@ -282,7 +349,44 @@ function getRequestData(bid, consentData, bidRequest) {
       bidData.regs.ext.us_privacy = bidRequest.uspConsent
     }
   }
-
+  if (bid.params.video.e2etest) {
+    utils.logMessage('E2E test mode enabled: \n The following parameters are being overridden by e2etest mode:\n* bidfloor:null\n* width:300\n* height:250\n* mimes: video/mp4, application/javascript\n* api:2\n* site.page/ref: verizonmedia.com\n* tmax:1000');
+    bidData.imp[0].bidfloor = null;
+    bidData.imp[0].video.w = 300;
+    bidData.imp[0].video.h = 250;
+    bidData.imp[0].video.mimes = ['video/mp4', 'application/javascript'];
+    bidData.imp[0].video.api = [2];
+    bidData.site.page = 'https://verizonmedia.com';
+    bidData.site.ref = 'https://verizonmedia.com';
+    bidData.tmax = 1000;
+  }
+  if (bid.params.video.custom && utils.isPlainObject(bid.params.video.custom)) {
+    bidData.imp[0].ext.custom = {};
+    for (const key in bid.params.video.custom) {
+      if (utils.isStr(bid.params.video.custom[key]) || utils.isNumber(bid.params.video.custom[key])) {
+        bidData.imp[0].ext.custom[key] = bid.params.video.custom[key];
+      }
+    }
+  }
+  if (bid.params.video.content && utils.isPlainObject(bid.params.video.content)) {
+    bidData.site.content = {};
+    const contentStringKeys = ['id', 'title', 'series', 'season', 'genre', 'contentrating', 'language'];
+    const contentNumberkeys = ['episode', 'prodq', 'context', 'livestream', 'len'];
+    const contentArrayKeys = ['cat'];
+    const contentObjectKeys = ['ext'];
+    for (const contentKey in bid.params.video.content) {
+      if (
+        (contentStringKeys.indexOf(contentKey) > -1 && utils.isStr(bid.params.video.content[contentKey])) ||
+        (contentNumberkeys.indexOf(contentKey) > -1 && utils.isNumber(bid.params.video.content[contentKey])) ||
+        (contentObjectKeys.indexOf(contentKey) > -1 && utils.isPlainObject(bid.params.video.content[contentKey])) ||
+        (contentArrayKeys.indexOf(contentKey) > -1 && utils.isArray(bid.params.video.content[contentKey]) &&
+        bid.params.video.content[contentKey].every(catStr => utils.isStr(catStr)))) {
+        bidData.site.content[contentKey] = bid.params.video.content[contentKey];
+      } else {
+        utils.logMessage('oneVideo bid adapter validation error: ', contentKey, ' is either not supported is OpenRTB V2.5 or value is undefined');
+      }
+    }
+  }
   return bidData;
 }
 
@@ -298,7 +402,7 @@ function newRenderer(bidRequest, bid) {
     bidRequest.renderer = {};
     bidRequest.renderer.url = 'https://cdn.vidible.tv/prod/hb-outstream-renderer/renderer.js';
     bidRequest.renderer.render = function(bid) {
-      setTimeout(function () {
+      setTimeout(function() {
         // eslint-disable-next-line no-undef
         o2PlayerRender(bid);
       }, 700)
diff --git a/modules/oneVideoBidAdapter.md b/modules/oneVideoBidAdapter.md
index d50d57a4628..c1762ac0cd3 100644
--- a/modules/oneVideoBidAdapter.md
+++ b/modules/oneVideoBidAdapter.md
@@ -3,13 +3,18 @@
 **Module Name**: One Video Bidder Adapter
 **Module Type**: Bidder Adapter
 **Maintainer**: deepthi.neeladri.sravana@verizonmedia.com
+                adam.browning@verizonmedia.com
 
 # Description
-
 Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to fetch bids.
+# Prebid.js V5.0 Support
+The oneVideo adapter now reads `mediaTypes.video` for mandatory parameters such as `playerSize` & `mimes`.
+Note: You can use the `bid.params.video` object to specify explicit overrides for whatever is declared in `mediaTypes.video`.
+Important: You must pass `bid.params.video = {}` as bare minimum for the adapter to work.
+# Integration Examples:
 
-
-# Instream Video adUnit example & parameters
+## Instream Video adUnit using mediaTypes.video
+*Note:* By default, the adapter will read the mandatory parameters from mediaTypes.video.
 *Note:* The Video SSP ad server will respond with an VAST XML to load into your defined player.
 ```
   var adUnits = [
@@ -18,7 +23,18 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
           mediaTypes: {
             video: {
                   context: 'instream',
-                  playerSize: [480, 640]
+                  playerSize: [480, 640],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+                  position: 1,
+                  delivery: [2],
+                  minduration: 10,
+                  maxduration: 30,
+                  placement: 1,
+                  playbackmethod: [1,5],
+                  protocols: [2,5],
+                  api: [2],
             }
           },
           bids: [
@@ -26,22 +42,17 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
               bidder: 'oneVideo',
               params: {
                 video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
-                  mimes: ['video/mp4', 'application/javascript'],
-                  protocols: [2,5],
-                  api: [2],
-                  position: 1,
-                  delivery: [2],
-                  playbackmethod: [1,5],
-                  sid: ,
+                  sid: YOUR_VSSP_ORG_ID,
                   hp: 1,
                   rewarded: 1,
-                  placement: 1,
                   inventoryid: 123,
-                  minduration: 10,
-                  maxduration: 30,
+                  ttl: 300,
+                  custom: {
+                    key1: "value1",
+                    key2: 123345
+                  }
                 },
+                bidfloor: 0.5,
                 site: {
                     id: 1,
                     page: 'https://verizonmedia.com',
@@ -54,16 +65,16 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
       }
   ]
 ```
-# Outstream Video adUnit example & parameters
-*Note:* The Video SSP ad server will load it's own Outstream Renderer (player) as a fallback if no player is defined on the publisher page. The Outstream player will inject into the div id that has an identical adUnit code.
+## Instream Video adUnit using params.video overrides
+*Note:* If the mandatory parameters are not specified in mediaTypes.video the adapter will read check to see if overrides are set in params.video. Decalring values using params.video will always override the settings in mediaTypes.video.
+*Note:* The Video SSP ad server will respond with an VAST XML to load into your defined player.
 ```
   var adUnits = [
     {
         code: 'video1',
           mediaTypes: {
             video: {
-                  context: 'outstream',
-                  playerSize: [480, 640]
+                  context: 'instream',
             }
           },
           bids: [
@@ -71,22 +82,77 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
               bidder: 'oneVideo',
               params: {
                 video: {
-                  playerWidth: 480,
-                  playerHeight: 640,
+                  playerWidth: 640,
+                  playerHeight: 480,
                   mimes: ['video/mp4', 'application/javascript'],
                   protocols: [2,5],
                   api: [2],
                   position: 1,
                   delivery: [2],
+                  minduration: 10,
+                  maxduration: 30,
+                  placement: 1,
                   playbackmethod: [1,5],
-                  sid: ,
+                  protocols: [2,5],
+                  api: [2],
+                  sid: YOUR_VSSP_ORG_ID,
                   hp: 1,
                   rewarded: 1,
-                  placement: 1,
                   inventoryid: 123,
+                  ttl: 300,
+                  custom: {
+                    key1: "value1",
+                    key2: 123345
+                  }
+                },
+                bidfloor: 0.5,
+                site: {
+                    id: 1,
+                    page: 'https://verizonmedia.com',
+                    referrer: 'https://verizonmedia.com'
+                  },
+                pubId: 'HBExchange'
+                }
+            }
+          ]
+      }
+  ]
+```
+## Outstream Video adUnit example & parameters
+*Note:* The Video SSP ad server will load it's own Outstream Renderer (player) as a fallback if no player is defined on the publisher page. The Outstream player will inject into the div id that has an identical adUnit code.
+```
+  var adUnits = [
+    {
+        code: 'video1',
+          mediaTypes: {
+            video: {
+                  context: 'outstream',
+                  playerSize: [480, 640],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+                  position: 1,
+                  delivery: [2],
                   minduration: 10,
                   maxduration: 30,
+                  placement: 1,
+                  playbackmethod: [1,5],
+                  protocols: [2,5],
+                  api: [2],
+
+            }
+          },
+          bids: [
+            {
+              bidder: 'oneVideo',
+              params: {
+                video: {
+                  sid: YOUR_VSSP_ORG_ID,
+                  hp: 1,
+                  rewarded: 1,
+                  ttl: 250
                 },
+                bidfloor: 0.5,
                 site: {
                     id: 1,
                     page: 'https://verizonmedia.com',
@@ -100,7 +166,7 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
   ]
 ```
 
-# S2S / Video: Dynamic Ad Placement (DAP) adUnit example & parameters
+## S2S / Video: Dynamic Ad Placement (DAP) adUnit example & parameters
 *Note:* The Video SSP ad server will respond with HTML embed tag to be injected into an iFrame you create.
 ```
   var adUnits = [
@@ -109,7 +175,8 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
       mediaTypes: {
         video: {
           context: "instream",
-          playerSize: [480, 640]
+          playerSize: [480, 640],
+          mimes: ['video/mp4', 'application/javascript'],
         }
       },
       bids: [
@@ -117,12 +184,9 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
           bidder: 'oneVideo',
           params: {
             video: {
-              playerWidth: 480,
-              playerHeight: 640,
-              mimes: ['video/mp4', 'application/javascript'],
-              position: 1,
-              display: 1
+              ttl: 250
             },
+            bidfloor: 0.5,
             site: {
               id: 1,
               page: 'https://verizonmedia.com',
@@ -135,7 +199,7 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
     }
 ]
 ```
-# Prebid.js / Banner: Dynamic Ad Placement (DAP) adUnit example & parameters
+## Prebid.js / Banner: Dynamic Ad Placement (DAP) adUnit example & parameters
 *Note:* The Video SSP ad server will respond with HTML embed tag to be injected into an iFrame created by Google Ad Manager (GAM).
 ```
   var adUnits = [
@@ -156,6 +220,7 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
               mimes: ['video/mp4', 'application/javascript'],
               display: 1
             },
+            bidfloor: 0.5,
             site: {
               id: 1,
               page: 'https://verizonmedia.com',
@@ -168,3 +233,210 @@ Connects to Verizon Media's Video SSP (AKA ONE Video / Adap.tv) demand source to
     }
 ]
 ```
+
+# End 2 End Testing Mode
+By passing bid.params.video.e2etest = true you will be able to receive a test creative when connecting via VPN location U.S West Coast. This will allow you to trubleshoot how your player/ad-server parses and uses the VAST XML response.
+This automatically sets default values for the outbound bid-request to respond from our test exchange.
+No need to override the site/ref urls or change your pubId
+```
+var adUnits = [
+    {
+      code: 'video-1',
+      mediaTypes: {
+        video: {
+          context: "instream",
+          playerSize: [480, 640]
+          mimes: ['video/mp4', 'application/javascript'],
+        }
+      },
+      bids: [
+        {
+          bidder: 'oneVideo',
+          params: {
+            video: {
+              e2etest: true
+            }
+          }
+        }
+      ]
+    }
+]
+```
+
+# Supply Chain Object Support
+The oneVideoBidAdapter supports 2 methods for passing/creating an schain object.
+1. By passing your Video SSP Org ID in the bid.video.params.sid - The adapter will create a new schain object and our ad-server will fill in the data for you.
+2. Using the Prebid Supply Chain Object Module - The adapter will capture the schain object
+*Note:* You cannot pass both schain object and bid.video.params.sid together. Option 1 will always be the default.
+
+## Create new schain using bid.video.params.sid
+sid = your Video SSP Organization ID.
+This is for direct publishers only.
+```
+var adUnits = [
+    {
+        code: 'video1',
+          mediaTypes: {
+            video: {
+                  context: 'instream',
+                  playerSize: [480, 640],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+            }
+          },
+          bids: [
+            {
+              bidder: 'oneVideo',
+              params: {
+                video: {
+                  sid: 123456
+                },
+                bidfloor: 0.5,
+                site: {
+                    id: 1,
+                    page: 'https://verizonmedia.com',
+                    referrer: 'https://verizonmedia.com'
+                  },
+                pubId: 'HBExchange'
+                }
+            }
+          ]
+      }
+  ]
+```
+
+## Pass global schain using pbjs.setConfig(SCHAIN_OBJECT)
+For both Authorized resellers and direct publishers.
+```
+pbjs.setConfig({
+  "schain": {
+      "validation": "strict",
+      "config": {
+          "ver": "1.0",
+          "complete": 1,
+          "nodes": [{
+                  "asi": "some-platform.com",
+                  "sid": "111111",
+                  "hp": 1
+          }]
+      }
+  }
+});
+
+var adUnits = [
+    {
+        code: 'video1',
+          mediaTypes: {
+            video: {
+                  context: 'instream',
+                  playerSize: [480, 640],
+                  mimes: ['video/mp4', 'application/javascript'],
+                  protocols: [2,5],
+                  api: [2],
+            }
+          },
+          bids: [
+            {
+              bidder: 'oneVideo',
+              params: {
+                video: {
+                  ttl: 250
+                },
+                bidfloor: 0.5,
+                site: {
+                    id: 1,
+                    page: 'https://verizonmedia.com',
+                    referrer: 'https://verizonmedia.com'
+                  },
+                pubId: 'HBExchange'
+                }
+            }
+          ]
+      }
+  ]
+```
+# Content Object Support
+The oneVideoBidAdapter supports passing of OpenRTB V2.5 Content Object.
+
+```
+const adUnits = [{
+            code: 'video1',
+            mediaTypes: {
+                video: {
+                    context: 'outstream',
+                    playerSize: [640, 480],
+                    mimes: ['video/mp4', 'application/javascript'],
+                    protocols: [2, 5],
+                    api: [1, 2],
+                }
+            },
+            bids: [{
+                bidder: 'oneVideo',
+                params: {
+                    video: {
+                        ttl: 300,
+                        content: {
+                            id: "1234",
+                            title: "Title",
+                            series: "Series",
+                            season: "Season",
+                            episode: 1
+                            cat: [
+                                "IAB1",
+                                "IAB1-1",
+                                "IAB1-2",
+                                "IAB2",
+                                "IAB2-1"
+                            ],
+                            genre: "Genre",
+                            contentrating: "C-Rating",
+                            language: "EN",
+                            prodq: 1,
+                            context: 1,
+                            livestream: 0,
+                            len: 360,
+                            ext: {
+                                network: "ext-network",
+                                channel: "ext-channel"
+                            }
+                        }
+                      },
+                      bidfloor: 0.5,
+                      pubId: 'HBExchange'
+                    }
+                }
+            }]
+        }]
+```
+
+
+# TTL Support
+The oneVideoBidAdapter supports passing of "Time To Live" (ttl)  that indicates to prebid chache for how long to keep the chaced winning bid alive.
+Value is Number in seconds
+You can enter any number between 1 - 3600 (seconds)
+```
+const adUnits = [{
+            code: 'video1',
+            mediaTypes: {
+                video: {
+                    context: 'outstream',
+                    playerSize: [640, 480],
+                    mimes: ['video/mp4', 'application/javascript'],
+                    protocols: [2, 5],
+                    api: [1, 2],
+                }
+            },
+            bids: [{
+                bidder: 'oneVideo',
+                params: {
+                    video: {
+                        ttl: 300
+                    },
+                    bidfloor: 0.5,
+                    pubId: 'HBExchange'
+                }
+            }]
+        }]
+```
+
diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 6280dd12268..86f29b0dd73 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -4,11 +4,16 @@ import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { INSTREAM, OUTSTREAM } from '../src/video.js';
 import { Renderer } from '../src/Renderer.js';
 import find from 'core-js-pure/features/array/find.js';
-const { registerBidder } = require('../src/adapters/bidderFactory.js');
+import { getStorageManager } from '../src/storageManager.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createEidsArray } from './userId/eids.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
 const BIDDER_CODE = 'onetag';
+const GVLID = 241;
+
+const storage = getStorageManager(GVLID);
 
 /**
  * Determines whether or not the given bid request is valid.
@@ -59,17 +64,18 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.usPrivacy = bidderRequest.uspConsent;
   }
-  if (bidderRequest && bidderRequest.userId) {
-    payload.userId = bidderRequest.userId;
-  }
-  if (window.localStorage) {
-    payload.onetagSid = window.localStorage.getItem('onetag_sid');
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userId) {
+    payload.userId = createEidsArray(validBidRequests[0].userId);
   }
-  const payloadString = JSON.stringify(payload);
+  try {
+    if (storage.hasLocalStorage()) {
+      payload.onetagSid = storage.getDataFromLocalStorage('onetag_sid');
+    }
+  } catch (e) {}
   return {
     method: 'POST',
     url: ENDPOINT,
-    data: payloadString
+    data: JSON.stringify(payload)
   }
 }
 
@@ -83,47 +89,35 @@ function interpretResponse(serverResponse, bidderRequest) {
   if (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0) {
     return bids;
   }
-  body.bids.forEach(({
-    requestId,
-    cpm,
-    width,
-    height,
-    creativeId,
-    dealId,
-    currency,
-    mediaType,
-    ttl,
-    rendererUrl,
-    ad,
-    vastUrl,
-    videoCacheKey
-  }) => {
+  body.bids.forEach(bid => {
     const responseBid = {
-      requestId,
-      cpm,
-      width,
-      height,
-      creativeId,
-      dealId: dealId == null ? dealId : '',
-      currency,
-      netRevenue: false,
+      requestId: bid.requestId,
+      cpm: bid.cpm,
+      width: bid.width,
+      height: bid.height,
+      creativeId: bid.creativeId,
+      dealId: bid.dealId == null ? bid.dealId : '',
+      currency: bid.currency,
+      netRevenue: bid.netRevenue || false,
+      mediaType: bid.mediaType,
       meta: {
-        mediaType
+        mediaType: bid.mediaType,
+        advertiserDomains: bid.adomain
       },
-      ttl: ttl || 300
+      ttl: bid.ttl || 300
     };
-    if (mediaType === BANNER) {
-      responseBid.ad = ad;
-    } else if (mediaType === VIDEO) {
-      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === requestId);
+    if (bid.mediaType === BANNER) {
+      responseBid.ad = bid.ad;
+    } else if (bid.mediaType === VIDEO) {
+      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === bid.requestId);
       if (context === INSTREAM) {
-        responseBid.vastUrl = vastUrl;
-        responseBid.videoCacheKey = videoCacheKey;
+        responseBid.vastUrl = bid.vastUrl;
+        responseBid.videoCacheKey = bid.videoCacheKey;
       } else if (context === OUTSTREAM) {
-        responseBid.vastXml = ad;
-        responseBid.vastUrl = vastUrl;
-        if (rendererUrl) {
-          responseBid.renderer = createRenderer({requestId, rendererUrl, adUnitCode});
+        responseBid.vastXml = bid.ad;
+        responseBid.vastUrl = bid.vastUrl;
+        if (bid.rendererUrl) {
+          responseBid.renderer = createRenderer({ ...bid, adUnitCode });
         }
       }
     }
@@ -141,37 +135,41 @@ function createRenderer(bid, rendererOptions = {}) {
     loaded: false
   });
   try {
-    renderer.setRender(onetagRenderer);
+    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;
 }
 
-function onetagRenderer({renderer, width, height, vastXml, adUnitCode}) {
-  renderer.push(() => {
-    window.onetag.Player.init({
-      width,
-      height,
-      vastXml,
-      nodeId: adUnitCode,
-      config: renderer.getConfig()
-    });
-  });
-}
-
 function getFrameNesting() {
-  let frame = window;
+  let topmostFrame = window;
+  let parent = window.parent;
+  let currentFrameNesting = 0;
   try {
-    while (frame !== frame.top) {
+    while (topmostFrame !== topmostFrame.parent) {
+      parent = topmostFrame.parent;
       // eslint-disable-next-line no-unused-expressions
-      frame.location.href;
-      frame = frame.parent;
+      parent.location.href;
+      topmostFrame = topmostFrame.parent;
     }
-  } catch (e) {}
+  } catch (e) {
+    currentFrameNesting = parent === topmostFrame.top ? 1 : 2;
+  }
   return {
-    topmostFrame: frame,
-    currentFrameNesting: frame.top === frame ? 1 : 2
+    topmostFrame,
+    currentFrameNesting
   }
 }
 
@@ -198,8 +196,15 @@ function getDocumentVisibility(window) {
 function getPageInfo() {
   const { topmostFrame, currentFrameNesting } = getFrameNesting();
   return {
-    location: encodeURIComponent(topmostFrame.location.href),
-    referrer: encodeURIComponent(topmostFrame.document.referrer) || '0',
+    location: topmostFrame.location.href,
+    referrer:
+      topmostFrame.document.referrer !== ''
+        ? topmostFrame.document.referrer
+        : null,
+    ancestorOrigin:
+      window.location.ancestorOrigins && window.location.ancestorOrigins[0] != null
+        ? window.location.ancestorOrigins[0]
+        : null,
     masked: currentFrameNesting,
     wWidth: topmostFrame.innerWidth,
     wHeight: topmostFrame.innerHeight,
@@ -216,7 +221,11 @@ function getPageInfo() {
     docHidden: getDocumentVisibility(topmostFrame),
     docHeight: topmostFrame.document.body ? topmostFrame.document.body.scrollHeight : null,
     hLength: history.length,
-    timing: getTiming()
+    timing: getTiming(),
+    version: {
+      prebid: '$prebid.version$',
+      adapter: '1.1.0'
+    }
   };
 }
 
@@ -235,6 +244,7 @@ function requestsToBids(bidRequests) {
     videoObj['protocols'] = bidRequest.mediaTypes.video.protocols;
     videoObj['maxDuration'] = bidRequest.mediaTypes.video.maxduration;
     videoObj['api'] = bidRequest.mediaTypes.video.api;
+    videoObj['playbackmethod'] = bidRequest.mediaTypes.video.playbackmethod || [];
     videoObj['type'] = VIDEO;
     return videoObj;
   });
@@ -256,6 +266,7 @@ function setGeneralInfo(bidRequest) {
   this['auctionId'] = bidRequest.auctionId;
   this['transactionId'] = bidRequest.transactionId;
   this['pubId'] = params.pubId;
+  this['ext'] = params.ext;
   if (params.pubClick) {
     this['click'] = params.pubClick;
   }
@@ -326,7 +337,7 @@ function parseSizes(bid) {
 
 function getSizes(sizes) {
   const ret = [];
-  for (let i = 0, lenght = sizes.length; i < lenght; i++) {
+  for (let i = 0; i < sizes.length; i++) {
     const size = sizes[i];
     ret.push({width: size[0], height: size[1]})
   }
@@ -362,6 +373,7 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
diff --git a/modules/onomagicBidAdapter.js b/modules/onomagicBidAdapter.js
index 55fca29fbf3..548c0170c05 100644
--- a/modules/onomagicBidAdapter.js
+++ b/modules/onomagicBidAdapter.js
@@ -46,7 +46,7 @@ function buildRequests(bidReqs, bidderRequest) {
         },
         tagid: String(bid.adUnitCode)
       };
-      const bidFloor = utils.getBidIdParameter('bidFloor', bid.params);
+      const bidFloor = _getBidFloor(bid);
       if (bidFloor) {
         imp.bidfloor = bidFloor;
       }
@@ -117,7 +117,10 @@ function interpretResponse(serverResponse) {
           netRevenue: true,
           mediaType: BANNER,
           ad: _getAdMarkup(onomagicBid),
-          ttl: 60
+          ttl: 60,
+          meta: {
+            advertiserDomains: onomagicBid && onomagicBid.adomain ? onomagicBid.adomain : []
+          }
         });
       });
     }
@@ -243,4 +246,20 @@ function _getPercentInView(element, topWin, { w, h } = {}) {
   return 0;
 }
 
+function _getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return bid.params.bidFloor ? bid.params.bidFloor : null;
+  }
+
+  let floor = bid.getFloor({
+    currency: 'USD',
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+    return floor.floor;
+  }
+  return null;
+}
+
 registerBidder(spec);
diff --git a/modules/ooloAnalyticsAdapter.js b/modules/ooloAnalyticsAdapter.js
new file mode 100644
index 00000000000..7195d6ac177
--- /dev/null
+++ b/modules/ooloAnalyticsAdapter.js
@@ -0,0 +1,547 @@
+import adapter from '../src/AnalyticsAdapter.js'
+import adapterManager from '../src/adapterManager.js'
+import CONSTANTS from '../src/constants.json'
+import * as utils from '../src/utils.js'
+import { ajax } from '../src/ajax.js'
+import { config } from '../src/config.js'
+
+const baseUrl = 'https://pbdata.oolo.io/'
+const ENDPOINTS = {
+  CONFIG: 'https://config-pbdata.oolo.io',
+  PAGE_DATA: baseUrl + 'page',
+  AUCTION: baseUrl + 'auctionData',
+  BID_WON: baseUrl + 'bidWonData',
+  AD_RENDER_FAILED: baseUrl + 'adRenderFailedData',
+  RAW: baseUrl + 'raw',
+  HBCONFIG: baseUrl + 'hbconfig',
+}
+
+const pbModuleVersion = '1.0.0'
+const prebidVersion = '$prebid.version$'
+const analyticsType = 'endpoint'
+const ADAPTER_CODE = 'oolo'
+const AUCTION_END_SEND_TIMEOUT = 1500
+export const PAGEVIEW_ID = +generatePageViewId()
+
+const {
+  AUCTION_INIT,
+  AUCTION_END,
+  BID_REQUESTED,
+  BID_RESPONSE,
+  NO_BID,
+  BID_WON,
+  BID_TIMEOUT,
+  AD_RENDER_FAILED
+} = CONSTANTS.EVENTS
+
+const SERVER_EVENTS = {
+  AUCTION: 'auction',
+  WON: 'bidWon',
+  AD_RENDER_FAILED: 'adRenderFailed'
+}
+
+const SERVER_BID_STATUS = {
+  NO_BID: 'noBid',
+  BID_REQUESTED: 'bidRequested',
+  BID_RECEIVED: 'bidReceived',
+  BID_TIMEDOUT: 'bidTimedOut',
+  BID_WON: 'bidWon'
+}
+
+let auctions = {}
+let initOptions = {}
+let eventsQueue = []
+
+const onAuctionInit = (args) => {
+  const { auctionId, adUnits, timestamp } = args
+
+  let auction = auctions[auctionId] = {
+    ...args,
+    adUnits: {},
+    auctionStart: timestamp,
+    _sentToServer: false
+  }
+
+  handleCustomFields(auction, AUCTION_INIT, args)
+
+  utils._each(adUnits, adUnit => {
+    auction.adUnits[adUnit.code] = {
+      ...adUnit,
+      auctionId,
+      adunid: adUnit.code,
+      bids: {},
+    }
+  })
+}
+
+const onBidRequested = (args) => {
+  const { auctionId, bids, start, timeout } = args
+  const _start = start || Date.now()
+  const auction = auctions[auctionId]
+  const auctionAdUnits = auction.adUnits
+
+  bids.forEach(bid => {
+    const { adUnitCode } = bid
+    const bidId = parseBidId(bid)
+
+    auctionAdUnits[adUnitCode].bids[bidId] = {
+      ...bid,
+      timeout,
+      start: _start,
+      rs: _start - auction.auctionStart,
+      bidStatus: SERVER_BID_STATUS.BID_REQUESTED,
+    }
+  })
+}
+
+const onBidResponse = (args) => {
+  const { auctionId, adUnitCode } = args
+  const auction = auctions[auctionId]
+  const bidId = parseBidId(args)
+  let bid = auction.adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.BID_RECEIVED,
+    end: args.responseTimestamp,
+    re: args.responseTimestamp - auction.auctionStart
+  })
+}
+
+const onNoBid = (args) => {
+  const { auctionId, adUnitCode } = args
+  const bidId = parseBidId(args)
+  const end = Date.now()
+  const auction = auctions[auctionId]
+  let bid = auction.adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.NO_BID,
+    end,
+    re: end - auction.auctionStart
+  })
+}
+
+const onBidWon = (args) => {
+  const { auctionId, adUnitCode } = args
+  const bidId = parseBidId(args)
+  const bid = auctions[auctionId].adUnits[adUnitCode].bids[bidId]
+
+  Object.assign(bid, args, {
+    bidStatus: SERVER_BID_STATUS.BID_WON,
+    isW: true,
+    isH: true
+  })
+
+  if (auctions[auctionId]._sentToServer) {
+    const payload = {
+      auctionId,
+      adunid: adUnitCode,
+      bid: mapBid(bid, BID_WON)
+    }
+
+    sendEvent(SERVER_EVENTS.WON, payload)
+  }
+}
+
+const onBidTimeout = (args) => {
+  utils._each(args, bid => {
+    const { auctionId, adUnitCode } = bid
+    const bidId = parseBidId(bid)
+    let bidCache = auctions[auctionId].adUnits[adUnitCode].bids[bidId]
+
+    Object.assign(bidCache, bid, {
+      bidStatus: SERVER_BID_STATUS.BID_TIMEDOUT,
+    })
+  })
+}
+
+const onAuctionEnd = (args) => {
+  const { auctionId, adUnits, ...restAuctionEnd } = args
+
+  Object.assign(auctions[auctionId], restAuctionEnd, {
+    auctionEnd: args.auctionEnd || Date.now()
+  })
+
+  // wait for bidWon before sending to server
+  setTimeout(() => {
+    auctions[auctionId]._sentToServer = true
+    const finalAuctionData = buildAuctionData(auctions[auctionId])
+
+    sendEvent(SERVER_EVENTS.AUCTION, finalAuctionData)
+  }, initOptions.serverConfig.BID_WON_TIMEOUT || AUCTION_END_SEND_TIMEOUT)
+}
+
+const onAdRenderFailed = (args) => {
+  const data = utils.deepClone(args)
+  data.timestamp = Date.now()
+
+  if (data.bid) {
+    data.bid = mapBid(data.bid, AD_RENDER_FAILED)
+  }
+
+  sendEvent(SERVER_EVENTS.AD_RENDER_FAILED, data)
+}
+
+var ooloAdapter = Object.assign(
+  adapter({ analyticsType }), {
+    track({ eventType, args }) {
+      // wait for server configuration before processing the events
+      if (typeof initOptions.serverConfig !== 'undefined' && eventsQueue.length === 0) {
+        handleEvent(eventType, args)
+      } else {
+        eventsQueue.push({ eventType, args })
+      }
+    }
+  }
+)
+
+function handleEvent(eventType, args) {
+  try {
+    const { sendRaw } = initOptions.serverConfig.events[eventType]
+    if (sendRaw) {
+      sendEvent(eventType, args, true)
+    }
+  } catch (e) { }
+
+  switch (eventType) {
+    case AUCTION_INIT:
+      onAuctionInit(args)
+      break
+    case BID_REQUESTED:
+      onBidRequested(args)
+      break
+    case NO_BID:
+      onNoBid(args)
+      break
+    case BID_RESPONSE:
+      onBidResponse(args)
+      break
+    case BID_WON:
+      onBidWon(args)
+      break
+    case BID_TIMEOUT:
+      onBidTimeout(args)
+      break
+    case AUCTION_END:
+      onAuctionEnd(args)
+      break
+    case AD_RENDER_FAILED:
+      onAdRenderFailed(args)
+      break
+  }
+}
+
+function sendEvent(eventType, args, isRaw) {
+  let data = utils.deepClone(args)
+
+  Object.assign(data, buildCommonDataProperties(), {
+    eventType
+  })
+
+  if (isRaw) {
+    let rawEndpoint
+    try {
+      const { endpoint, omitRawFields } = initOptions.serverConfig.events[eventType]
+      rawEndpoint = endpoint
+      handleCustomRawFields(data, omitRawFields)
+    } catch (e) { }
+    ajaxCall(rawEndpoint || ENDPOINTS.RAW, () => { }, JSON.stringify(data))
+  } else {
+    let endpoint
+    if (eventType === SERVER_EVENTS.AD_RENDER_FAILED) {
+      endpoint = ENDPOINTS.AD_RENDER_FAILED
+    } else if (eventType === SERVER_EVENTS.WON) {
+      endpoint = ENDPOINTS.BID_WON
+    } else {
+      endpoint = ENDPOINTS.AUCTION
+    }
+
+    ajaxCall(endpoint, () => { }, JSON.stringify(data))
+  }
+}
+
+function checkEventsQueue() {
+  while (eventsQueue.length) {
+    const event = eventsQueue.shift()
+    handleEvent(event.eventType, event.args)
+  }
+}
+
+function buildAuctionData(auction) {
+  const auctionData = utils.deepClone(auction)
+  const keysToRemove = ['adUnitCodes', 'auctionStatus', 'bidderRequests', 'bidsReceived', 'noBids', 'winningBids', 'timestamp', 'config']
+
+  keysToRemove.forEach(key => {
+    delete auctionData[key]
+  })
+
+  handleCustomFields(auctionData, AUCTION_END, auction)
+
+  // turn bids object into array of objects
+  Object.keys(auctionData.adUnits).forEach(adUnit => {
+    const adUnitObj = auctionData.adUnits[adUnit]
+    adUnitObj.bids = Object.keys(adUnitObj.bids).map(key => mapBid(adUnitObj.bids[key]))
+    delete adUnitObj['adUnitCode']
+    delete adUnitObj['code']
+    delete adUnitObj['transactionId']
+  })
+
+  // turn adUnits objects into array of adUnits
+  auctionData.adUnits = Object.keys(auctionData.adUnits).map(key => auctionData.adUnits[key])
+
+  return auctionData
+}
+
+function buildCommonDataProperties() {
+  return {
+    pvid: PAGEVIEW_ID,
+    pid: initOptions.pid,
+    pbModuleVersion
+  }
+}
+
+function buildLogMessage(message) {
+  return `oolo: ${message}`
+}
+
+function parseBidId(bid) {
+  return bid.bidId || bid.requestId
+}
+
+function mapBid({
+  bidStatus,
+  start,
+  end,
+  mediaType,
+  creativeId,
+  originalCpm,
+  originalCurrency,
+  source,
+  netRevenue,
+  currency,
+  width,
+  height,
+  timeToRespond,
+  responseTimestamp,
+  ...rest
+}, eventType) {
+  const bidObj = {
+    bst: bidStatus,
+    s: start,
+    e: responseTimestamp || end,
+    mt: mediaType,
+    crId: creativeId,
+    oCpm: originalCpm,
+    oCur: originalCurrency,
+    src: source,
+    nrv: netRevenue,
+    cur: currency,
+    w: width,
+    h: height,
+    ttr: timeToRespond,
+    ...rest,
+  }
+
+  delete bidObj['bidRequestsCount']
+  delete bidObj['bidderRequestId']
+  delete bidObj['bidderRequestsCount']
+  delete bidObj['bidderWinsCount']
+  delete bidObj['schain']
+  delete bidObj['refererInfo']
+  delete bidObj['statusMessage']
+  delete bidObj['status']
+  delete bidObj['adUrl']
+  delete bidObj['ad']
+  delete bidObj['usesGenericKeys']
+  delete bidObj['requestTimestamp']
+
+  try {
+    handleCustomFields(bidObj, eventType || BID_RESPONSE, rest)
+  } catch (e) { }
+
+  return bidObj
+}
+
+function handleCustomFields(obj, eventType, args) {
+  try {
+    const { pickFields, omitFields } = initOptions.serverConfig.events[eventType]
+
+    if (pickFields && obj && args) {
+      Object.assign(obj, utils.pick(args, pickFields))
+    }
+
+    if (omitFields && obj && args) {
+      omitFields.forEach(field => {
+        utils.deepSetValue(obj, field, undefined)
+      })
+    }
+  } catch (e) { }
+}
+
+function handleCustomRawFields(obj, omitRawFields) {
+  try {
+    if (omitRawFields && obj) {
+      omitRawFields.forEach(field => {
+        utils.deepSetValue(obj, field, undefined)
+      })
+    }
+  } catch (e) { }
+}
+
+function getServerConfig() {
+  const defaultConfig = { events: {} }
+
+  ajaxCall(
+    ENDPOINTS.CONFIG + '?pid=' + initOptions.pid,
+    {
+      success: function (data) {
+        try {
+          initOptions.serverConfig = JSON.parse(data) || defaultConfig
+        } catch (e) {
+          initOptions.serverConfig = defaultConfig
+        }
+        checkEventsQueue()
+      },
+      error: function () {
+        initOptions.serverConfig = defaultConfig
+        checkEventsQueue()
+      }
+    },
+    null
+  )
+}
+
+function sendPage() {
+  setTimeout(() => {
+    const payload = {
+      timestamp: Date.now(),
+      screenWidth: window.screen.width,
+      screenHeight: window.screen.height,
+      url: window.location.href,
+      protocol: window.location.protocol,
+      origin: utils.getOrigin(),
+      referrer: getTopWindowReferrer(),
+      pbVersion: prebidVersion,
+    }
+
+    Object.assign(payload, buildCommonDataProperties(), getPagePerformance())
+    ajaxCall(ENDPOINTS.PAGE_DATA, () => { }, JSON.stringify(payload))
+  }, 0)
+}
+
+function sendHbConfigData() {
+  const conf = {}
+  const pbjsConfig = config.getConfig()
+
+  Object.keys(pbjsConfig).forEach(key => {
+    if (key[0] !== '_') {
+      conf[key] = pbjsConfig[key]
+    }
+  })
+
+  ajaxCall(ENDPOINTS.HBCONFIG, () => { }, JSON.stringify(conf))
+}
+
+function getPagePerformance() {
+  let timing
+
+  try {
+    timing = window.top.performance.timing
+  } catch (e) { }
+
+  if (!timing) {
+    return
+  }
+
+  const { navigationStart, domContentLoadedEventEnd, loadEventEnd } = timing
+  const domContentLoadTime = domContentLoadedEventEnd - navigationStart
+  const pageLoadTime = loadEventEnd - navigationStart
+
+  return {
+    domContentLoadTime,
+    pageLoadTime,
+  }
+}
+
+function getTopWindowReferrer() {
+  try {
+    return window.top.document.referrer
+  } catch (e) {
+    return ''
+  }
+}
+
+function generatePageViewId(min = 10000, max = 90000) {
+  var randomNumber = Math.floor((Math.random() * max) + min)
+  var currentdate = new Date()
+  var currentTime = {
+    getDate: currentdate.getDate(),
+    getMonth: currentdate.getMonth(),
+    getFullYear: currentdate.getFullYear(),
+    getHours: currentdate.getHours(),
+    getMinutes: currentdate.getMinutes(),
+    getSeconds: currentdate.getSeconds(),
+    getMilliseconds: currentdate.getMilliseconds()
+  }
+  return ((currentTime.getDate <= 9) ? '0' + (currentTime.getDate) : (currentTime.getDate)) + '' +
+    (currentTime.getMonth + 1 <= 9 ? '0' + (currentTime.getMonth + 1) : (currentTime.getMonth + 1)) + '' +
+    currentTime.getFullYear % 100 + '' +
+    (currentTime.getHours <= 9 ? '0' + currentTime.getHours : currentTime.getHours) + '' +
+    (currentTime.getMinutes <= 9 ? '0' + currentTime.getMinutes : currentTime.getMinutes) + '' +
+    (currentTime.getSeconds <= 9 ? '0' + currentTime.getSeconds : currentTime.getSeconds) + '' +
+    (currentTime.getMilliseconds % 100 <= 9 ? '0' + (currentTime.getMilliseconds % 100) : (currentTime.getMilliseconds % 100)) + '' +
+    (randomNumber)
+}
+
+function ajaxCall(endpoint, callback, data, options = {}) {
+  if (data) {
+    options.contentType = 'application/json'
+  }
+
+  return ajax(endpoint, callback, data, options)
+}
+
+ooloAdapter.originEnableAnalytics = ooloAdapter.enableAnalytics
+ooloAdapter.enableAnalytics = function (config) {
+  ooloAdapter.originEnableAnalytics(config)
+  initOptions = config ? config.options : {}
+
+  if (!initOptions.pid) {
+    utils.logError(buildLogMessage('enableAnalytics missing config object with "pid"'))
+    return
+  }
+
+  getServerConfig()
+  sendHbConfigData()
+
+  if (document.readyState === 'complete') {
+    sendPage()
+  } else {
+    window.addEventListener('load', sendPage)
+  }
+
+  utils.logInfo(buildLogMessage('enabled analytics adapter'), config)
+  ooloAdapter.enableAnalytics = function () {
+    utils.logInfo(buildLogMessage('Analytics adapter already enabled..'))
+  }
+}
+
+ooloAdapter.originDisableAnalytics = ooloAdapter.disableAnalytics
+ooloAdapter.disableAnalytics = function () {
+  auctions = {}
+  initOptions = {}
+  ooloAdapter.originDisableAnalytics()
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: ooloAdapter,
+  code: ADAPTER_CODE
+})
+
+// export for testing
+export {
+  buildAuctionData,
+  generatePageViewId
+}
+
+export default ooloAdapter
diff --git a/modules/ooloAnalyticsAdapter.md b/modules/ooloAnalyticsAdapter.md
new file mode 100644
index 00000000000..1ffb9cbe050
--- /dev/null
+++ b/modules/ooloAnalyticsAdapter.md
@@ -0,0 +1,24 @@
+# Overview
+
+Module Name: oolo Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: admin@oolo.io
+
+# Description
+
+Analytics adapter for oolo.
+
+oolo is an anomaly detection based monitoring solution for web publishers, built by adops for adops. Its purpose is to eliminate most of the daily manual work that teams are required to do, while increasing the overall performance, due to full & faster detection of problems and opportunities.
+
+Contact admin@oolo.io for information.
+
+# Usage
+
+```javascript
+pbjs.enableAnalytics({
+  provider: 'oolo',
+  options: {
+    pid: 12345 // id provided by oolo
+  }
+})
+```
diff --git a/modules/openxAnalyticsAdapter.js b/modules/openxAnalyticsAdapter.js
index 7addfe68bc6..07966e9e401 100644
--- a/modules/openxAnalyticsAdapter.js
+++ b/modules/openxAnalyticsAdapter.js
@@ -1,260 +1,733 @@
 import adapter from '../src/AnalyticsAdapter.js';
 import CONSTANTS from '../src/constants.json';
 import adapterManager from '../src/adapterManager.js';
-import { config } from '../src/config.js';
 import { ajax } from '../src/ajax.js';
-import * as utils from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
+import includes from 'core-js-pure/features/array/includes.js';
+const utils = require('../src/utils.js');
+
+export const AUCTION_STATES = {
+  INIT: 'initialized', // auction has initialized
+  ENDED: 'ended', // all auction requests have been accounted for
+  COMPLETED: 'completed' // all slots have rendered
+};
+
+const ADAPTER_VERSION = '0.1';
+const SCHEMA_VERSION = '0.1';
+
+const AUCTION_END_WAIT_TIME = 1000;
+const URL_PARAM = '';
+const ANALYTICS_TYPE = 'endpoint';
+const ENDPOINT = 'https://prebid.openx.net/ox/analytics/';
 
+// Event Types
 const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON }
+  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, AUCTION_END, BID_WON }
 } = CONSTANTS;
-
 const SLOT_LOADED = 'slotOnload';
 
-const ENDPOINT = 'https://ads.openx.net/w/1.0/pban';
+const UTM_TAGS = [
+  'utm_campaign',
+  'utm_source',
+  'utm_medium',
+  'utm_term',
+  'utm_content'
+];
+const UTM_TO_CAMPAIGN_PROPERTIES = {
+  'utm_campaign': 'name',
+  'utm_source': 'source',
+  'utm_medium': 'medium',
+  'utm_term': 'term',
+  'utm_content': 'content'
+};
 
-let initOptions;
+/**
+ * @typedef {Object} OxAnalyticsConfig
+ * @property {string} orgId
+ * @property {string} publisherPlatformId
+ * @property {number} publisherAccountId
+ * @property {number} sampling
+ * @property {boolean} enableV2
+ * @property {boolean} testPipeline
+ * @property {Object} campaign
+ * @property {number} payloadWaitTime
+ * @property {number} payloadWaitTimePadding
+ * @property {Array} adUnits
+ */
+
+/**
+ * @type {OxAnalyticsConfig}
+ */
+const DEFAULT_ANALYTICS_CONFIG = {
+  orgId: void (0),
+  publisherPlatformId: void (0),
+  publisherAccountId: void (0),
+  sampling: 0.05, // default sampling rate of 5%
+  testCode: 'default',
+  campaign: {},
+  adUnits: [],
+  payloadWaitTime: AUCTION_END_WAIT_TIME,
+  payloadWaitTimePadding: 2000
+};
 
+// Initialization
+/**
+ * @type {OxAnalyticsConfig}
+ */
+let analyticsConfig;
 let auctionMap = {};
+let auctionOrder = 1; // tracks the number of auctions ran on the page
 
-function onAuctionInit({ auctionId }) {
-  auctionMap[auctionId] = {
-    adUnitMap: {}
-  };
+let googletag = window.googletag || {};
+googletag.cmd = googletag.cmd || [];
+
+let openxAdapter = Object.assign(adapter({ urlParam: URL_PARAM, analyticsType: ANALYTICS_TYPE }));
+
+openxAdapter.originEnableAnalytics = openxAdapter.enableAnalytics;
+
+openxAdapter.enableAnalytics = function(adapterConfig = {options: {}}) {
+  if (isValidConfig(adapterConfig)) {
+    analyticsConfig = {...DEFAULT_ANALYTICS_CONFIG, ...adapterConfig.options};
+
+    // campaign properties defined by config will override utm query parameters
+    analyticsConfig.campaign = {...buildCampaignFromUtmCodes(), ...analyticsConfig.campaign};
+
+    utils.logInfo('OpenX Analytics enabled with config', analyticsConfig);
+
+    // override track method with v2 handlers
+    openxAdapter.track = prebidAnalyticsEventHandler;
+
+    googletag.cmd.push(function () {
+      let pubads = googletag.pubads();
+
+      if (pubads.addEventListener) {
+        pubads.addEventListener(SLOT_LOADED, args => {
+          openxAdapter.track({eventType: SLOT_LOADED, args});
+          utils.logInfo('OX: SlotOnLoad event triggered');
+        });
+      }
+    });
+
+    openxAdapter.originEnableAnalytics(adapterConfig);
+  }
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: openxAdapter,
+  code: 'openx'
+});
+
+export default openxAdapter;
+
+/**
+ * Test Helper Functions
+ */
+
+// reset the cache for unit tests
+openxAdapter.reset = function() {
+  auctionMap = {};
+  auctionOrder = 1;
+};
+
+/**
+ * Private Functions
+ */
+
+function isValidConfig({options: analyticsOptions}) {
+  let hasOrgId = analyticsOptions && analyticsOptions.orgId !== void (0);
+
+  const fieldValidations = [
+    // tuple of property, type, required
+    ['orgId', 'string', hasOrgId],
+    ['publisherPlatformId', 'string', !hasOrgId],
+    ['publisherAccountId', 'number', !hasOrgId],
+    ['sampling', 'number', false],
+    ['enableV2', 'boolean', false],
+    ['testPipeline', 'boolean', false],
+    ['adIdKey', 'string', false],
+    ['payloadWaitTime', 'number', false],
+    ['payloadWaitTimePadding', 'number', false],
+  ];
+
+  let failedValidation = find(fieldValidations, ([property, type, required]) => {
+    // if required, the property has to exist
+    // if property exists, type check value
+    return (required && !analyticsOptions.hasOwnProperty(property)) ||
+      /* eslint-disable valid-typeof */
+      (analyticsOptions.hasOwnProperty(property) && typeof analyticsOptions[property] !== type);
+  });
+  if (failedValidation) {
+    let [property, type, required] = failedValidation;
+
+    if (required) {
+      utils.logError(`OpenXAnalyticsAdapter: Expected '${property}' to exist and of type '${type}'`);
+    } else {
+      utils.logError(`OpenXAnalyticsAdapter: Expected '${property}' to be type '${type}'`);
+    }
+  }
+
+  return !failedValidation;
 }
 
-function onBidRequested({ auctionId, auctionStart, bids, start }) {
-  const adUnitMap = auctionMap[auctionId]['adUnitMap'];
+function buildCampaignFromUtmCodes() {
+  const location = utils.getWindowLocation();
+  const queryParams = utils.parseQS(location && location.search);
+  let campaign = {};
 
-  bids.forEach(bid => {
-    const { adUnitCode, bidId, bidder, params, transactionId } = bid;
+  UTM_TAGS.forEach(function(utmKey) {
+    let utmValue = queryParams[utmKey];
+    if (utmValue) {
+      let key = UTM_TO_CAMPAIGN_PROPERTIES[utmKey];
+      campaign[key] = decodeURIComponent(utmValue);
+    }
+  });
+  return campaign;
+}
+
+function detectMob() {
+  if (
+    navigator.userAgent.match(/Android/i) ||
+    navigator.userAgent.match(/webOS/i) ||
+    navigator.userAgent.match(/iPhone/i) ||
+    navigator.userAgent.match(/iPad/i) ||
+    navigator.userAgent.match(/iPod/i) ||
+    navigator.userAgent.match(/BlackBerry/i) ||
+    navigator.userAgent.match(/Windows Phone/i)
+  ) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function detectOS() {
+  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';
+}
 
-    adUnitMap[adUnitCode] = adUnitMap[adUnitCode] || {
-      auctionId,
-      auctionStart,
-      transactionId,
-      bidMap: {}
+function detectBrowser() {
+  var isChrome =
+    /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+  var isCriOS = navigator.userAgent.match('CriOS');
+  var isSafari =
+    /Safari/.test(navigator.userAgent) &&
+    /Apple Computer/.test(navigator.vendor);
+  var isFirefox = /Firefox/.test(navigator.userAgent);
+  var isIE =
+    /Trident/.test(navigator.userAgent) || /MSIE/.test(navigator.userAgent);
+  var isEdge = /Edge/.test(navigator.userAgent);
+  if (isIE) return 'Internet Explorer';
+  if (isEdge) return 'Microsoft Edge';
+  if (isCriOS) return 'Chrome';
+  if (isSafari) return 'Safari';
+  if (isFirefox) return 'Firefox';
+  if (isChrome) return 'Chrome';
+  return 'Others';
+}
+
+function prebidAnalyticsEventHandler({eventType, args}) {
+  utils.logMessage(eventType, Object.assign({}, args));
+  switch (eventType) {
+    case AUCTION_INIT:
+      onAuctionInit(args);
+      break;
+    case BID_REQUESTED:
+      onBidRequested(args);
+      break;
+    case BID_RESPONSE:
+      onBidResponse(args);
+      break;
+    case BID_TIMEOUT:
+      onBidTimeout(args);
+      break;
+    case AUCTION_END:
+      onAuctionEnd(args);
+      break;
+    case BID_WON:
+      onBidWon(args);
+      break;
+    case SLOT_LOADED:
+      onSlotLoadedV2(args);
+      break;
+  }
+}
+
+/**
+ * @typedef {Object} PbAuction
+ * @property {string} auctionId - Auction ID of the request this bid responded to
+ * @property {number} timestamp //: 1586675964364
+ * @property {number} auctionEnd - timestamp of when auction ended //: 1586675964364
+ * @property {string} auctionStatus //: "inProgress"
+ * @property {Array} adUnits //: [{…}]
+ * @property {string} adUnitCodes //: ["video1"]
+ * @property {string} labels //: undefined
+ * @property {Array} bidderRequests //: (2) [{…}, {…}]
+ * @property {Array} noBids //: []
+ * @property {Array} bidsReceived //: []
+ * @property {Array} winningBids //: []
+ * @property {number} timeout //: 3000
+ * @property {Object} config //: {publisherPlatformId: "a3aece0c-9e80-4316-8deb-faf804779bd1", publisherAccountId: 537143056, sampling: 1, enableV2: true}/*
+ */
+
+function onAuctionInit({auctionId, timestamp: startTime, timeout, adUnitCodes}) {
+  auctionMap[auctionId] = {
+    id: auctionId,
+    startTime,
+    endTime: void (0),
+    timeout,
+    auctionOrder,
+    userIds: [],
+    adUnitCodesCount: adUnitCodes.length,
+    adunitCodesRenderedCount: 0,
+    state: AUCTION_STATES.INIT,
+    auctionSendDelayTimer: void (0),
+  };
+
+  // setup adunit properties in map
+  auctionMap[auctionId].adUnitCodeToAdUnitMap = adUnitCodes.reduce((obj, adunitCode) => {
+    obj[adunitCode] = {
+      code: adunitCode,
+      adPosition: void (0),
+      bidRequestsMap: {}
     };
+    return obj;
+  }, {});
+
+  auctionOrder++;
+}
 
-    adUnitMap[adUnitCode]['bidMap'][bidId] = {
+/**
+ * @typedef {Object} PbBidRequest
+ * @property {string} auctionId - Auction ID of the request this bid responded to
+ * @property {number} auctionStart //: 1586675964364
+ * @property {Object} refererInfo
+ * @property {PbBidderRequest} bids
+ * @property {number} start - Start timestamp of the bidder request
+ *
+ */
+
+/**
+ * @typedef {Object} PbBidderRequest
+ * @property {string} adUnitCode - Name of div or google adunit path
+ * @property {string} bidder - Bame of bidder
+ * @property {string} bidId - Identifies the bid request
+ * @property {Object} mediaTypes
+ * @property {Object} params
+ * @property {string} src
+ * @property {Object} userId - Map of userId module to module object
+ */
+
+/**
+ * Tracks the bid request
+ * @param {PbBidRequest} bidRequest
+ */
+function onBidRequested(bidRequest) {
+  const {auctionId, bids: bidderRequests, start, timeout} = bidRequest;
+  const auction = auctionMap[auctionId];
+  const adUnitCodeToAdUnitMap = auction.adUnitCodeToAdUnitMap;
+
+  bidderRequests.forEach(bidderRequest => {
+    const { adUnitCode, bidder, bidId: requestId, mediaTypes, params, src, userId } = bidderRequest;
+
+    auction.userIds.push(userId);
+    adUnitCodeToAdUnitMap[adUnitCode].bidRequestsMap[requestId] = {
       bidder,
       params,
-      requestTimestamp: start
+      mediaTypes,
+      source: src,
+      startTime: start,
+      timedOut: false,
+      timeLimit: timeout,
+      bids: {}
     };
   });
 }
 
-function onBidResponse({
-  auctionId,
-  adUnitCode,
-  requestId: bidId,
-  cpm,
-  creativeId,
-  responseTimestamp,
-  ts,
-  adId
-}) {
-  const adUnit = auctionMap[auctionId]['adUnitMap'][adUnitCode];
-  const bid = adUnit['bidMap'][bidId];
-  bid.cpm = cpm;
-  bid.creativeId = creativeId;
-  bid.responseTimestamp = responseTimestamp;
-  bid.ts = ts;
-  bid.adId = adId;
+/**
+ *
+ * @param {BidResponse} bidResponse
+ */
+function onBidResponse(bidResponse) {
+  let {
+    auctionId,
+    adUnitCode,
+    requestId,
+    cpm,
+    creativeId,
+    requestTimestamp,
+    responseTimestamp,
+    ts,
+    mediaType,
+    dealId,
+    ttl,
+    netRevenue,
+    currency,
+    originalCpm,
+    originalCurrency,
+    width,
+    height,
+    timeToRespond: latency,
+    adId,
+    meta
+  } = bidResponse;
+
+  auctionMap[auctionId].adUnitCodeToAdUnitMap[adUnitCode].bidRequestsMap[requestId].bids[adId] = {
+    cpm,
+    creativeId,
+    requestTimestamp,
+    responseTimestamp,
+    ts,
+    adId,
+    meta,
+    mediaType,
+    dealId,
+    ttl,
+    netRevenue,
+    currency,
+    originalCpm,
+    originalCurrency,
+    width,
+    height,
+    latency,
+    winner: false,
+    rendered: false,
+    renderTime: 0,
+  };
 }
 
 function onBidTimeout(args) {
-  utils
-    ._map(args, value => value)
-    .forEach(({ auctionId, adUnitCode, bidId }) => {
-      const bid =
-        auctionMap[auctionId]['adUnitMap'][adUnitCode]['bidMap'][bidId];
-      bid.timedOut = true;
-    });
+  utils._each(args, ({auctionId, adUnitCode, bidId: requestId}) => {
+    let timedOutRequest = utils.deepAccess(auctionMap,
+      `${auctionId}.adUnitCodeToAdUnitMap.${adUnitCode}.bidRequestsMap.${requestId}`);
+
+    if (timedOutRequest) {
+      timedOutRequest.timedOut = true;
+    }
+  });
 }
+/**
+ *
+ * @param {PbAuction} endedAuction
+ */
+function onAuctionEnd(endedAuction) {
+  let auction = auctionMap[endedAuction.auctionId];
+
+  if (!auction) {
+    return;
+  }
 
-function onBidWon({ auctionId, adUnitCode, requestId: bidId }) {
-  const adUnit = auctionMap[auctionId]['adUnitMap'][adUnitCode];
-  const bid = adUnit['bidMap'][bidId];
-  bid.won = true;
+  clearAuctionTimer(auction);
+  auction.endTime = endedAuction.auctionEnd;
+  auction.state = AUCTION_STATES.ENDED;
+  delayedSend(auction);
 }
 
-function onSlotLoaded({ slot }) {
-  const targeting = slot.getTargetingKeys().reduce((targeting, key) => {
-    targeting[key] = slot.getTargeting(key);
-    return targeting;
-  }, {});
-  utils.logMessage(
-    'GPT slot is loaded. Current targeting set on slot:',
-    targeting
-  );
+/**
+ *
+ * @param {BidResponse} bidResponse
+ */
+function onBidWon(bidResponse) {
+  const { auctionId, adUnitCode, requestId, adId } = bidResponse;
+  let winningBid = utils.deepAccess(auctionMap,
+    `${auctionId}.adUnitCodeToAdUnitMap.${adUnitCode}.bidRequestsMap.${requestId}.bids.${adId}`);
+
+  if (winningBid) {
+    winningBid.winner = true
+  }
+}
 
-  const adId = slot.getTargeting('hb_adid')[0];
-  if (!adId) {
-    return;
+/**
+ *
+ * @param {GoogleTagSlot} slot
+ * @param {string} serviceName
+ */
+function onSlotLoadedV2({ slot }) {
+  const renderTime = Date.now();
+  const elementId = slot.getSlotElementId();
+  const bidId = slot.getTargeting('hb_adid')[0];
+
+  let [auction, adUnit, bid] = getPathToBidResponseByBidId(bidId);
+
+  if (!auction) {
+    // attempt to get auction by adUnitCode
+    auction = getAuctionByGoogleTagSLot(slot);
+
+    if (!auction) {
+      return; // slot is not participating in an active prebid auction
+    }
   }
 
-  const adUnit = getAdUnitByAdId(adId);
-  if (!adUnit) {
-    return;
+  clearAuctionTimer(auction);
+
+  // track that an adunit code has completed within an auction
+  auction.adunitCodesRenderedCount++;
+
+  // mark adunit as rendered
+  if (bid) {
+    let {x, y} = getPageOffset();
+    bid.rendered = true;
+    bid.renderTime = renderTime;
+    adUnit.adPosition = isAtf(elementId, x, y) ? 'ATF' : 'BTF';
   }
 
-  const adUnitData = getAdUnitData(adUnit);
-  const performanceData = getPerformanceData(adUnit.auctionStart);
-  const commonFields = {
-    'hb.asiid': slot.getAdUnitPath(),
-    'hb.cur': config.getConfig('currency.adServerCurrency'),
-    'hb.pubid': initOptions.publisherId
-  };
+  if (auction.adunitCodesRenderedCount === auction.adUnitCodesCount) {
+    auction.state = AUCTION_STATES.COMPLETED;
+  }
 
-  const data = Object.assign({}, adUnitData, performanceData, commonFields);
-  sendEvent(data);
+  // prepare to send regardless if auction is complete or not as a failsafe in case not all events are tracked
+  // add additional padding when not all slots are rendered
+  delayedSend(auction);
 }
 
-function getAdUnitByAdId(adId) {
-  let result;
+function isAtf(elementId, scrollLeft = 0, scrollTop = 0) {
+  let elem = document.querySelector('#' + elementId);
+  let isAtf = false;
+  if (elem) {
+    let bounding = elem.getBoundingClientRect();
+    if (bounding) {
+      let windowWidth = (window.innerWidth || document.documentElement.clientWidth);
+      let windowHeight = (window.innerHeight || document.documentElement.clientHeight);
+
+      // intersection coordinates
+      let left = Math.max(0, bounding.left + scrollLeft);
+      let right = Math.min(windowWidth, bounding.right + scrollLeft);
+      let top = Math.max(0, bounding.top + scrollTop);
+      let bottom = Math.min(windowHeight, bounding.bottom + scrollTop);
+
+      let intersectionWidth = right - left;
+      let intersectionHeight = bottom - top;
+
+      let intersectionArea = (intersectionHeight > 0 && intersectionWidth > 0) ? (intersectionHeight * intersectionWidth) : 0;
+      let adSlotArea = (bounding.right - bounding.left) * (bounding.bottom - bounding.top);
+
+      if (adSlotArea > 0) {
+        // Atleast 50% of intersection in window
+        isAtf = intersectionArea * 2 >= adSlotArea;
+      }
+    }
+  } else {
+    utils.logWarn('OX: DOM element not for id ' + elementId);
+  }
+  return isAtf;
+}
 
-  utils._map(auctionMap, value => value).forEach(auction => {
-    utils._map(auction.adUnitMap, value => value).forEach(adUnit => {
-      utils._map(adUnit.bidMap, value => value).forEach(bid => {
-        if (adId === bid.adId) {
-          result = adUnit;
-        }
-      })
-    });
-  });
+// backwards compatible pageOffset from https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollX
+function getPageOffset() {
+  var x = (window.pageXOffset !== undefined)
+    ? window.pageXOffset
+    : (document.documentElement || document.body.parentNode || document.body).scrollLeft;
 
-  return result;
+  var y = (window.pageYOffset !== undefined)
+    ? window.pageYOffset
+    : (document.documentElement || document.body.parentNode || document.body).scrollTop;
+  return {x, y};
 }
 
-function getAdUnitData(adUnit) {
-  const bids = utils._map(adUnit.bidMap, value => value);
-  const bidders = bids.map(bid => bid.bidder);
-  const requestTimes = bids.map(
-    bid => bid.requestTimestamp && bid.requestTimestamp - adUnit.auctionStart
-  );
-  const responseTimes = bids.map(
-    bid => bid.responseTimestamp && bid.responseTimestamp - adUnit.auctionStart
-  );
-  const bidValues = bids.map(bid => bid.cpm || 0);
-  const timeouts = bids.map(bid => !!bid.timedOut);
-  const creativeIds = bids.map(bid => bid.creativeId);
-  const winningBid = bids.filter(bid => bid.won)[0];
-  const winningExchangeIndex = bids.indexOf(winningBid);
-  const openxBid = bids.filter(bid => bid.bidder === 'openx')[0];
+function delayedSend(auction) {
+  const delayTime = auction.adunitCodesRenderedCount === auction.adUnitCodesCount
+    ? analyticsConfig.payloadWaitTime
+    : analyticsConfig.payloadWaitTime + analyticsConfig.payloadWaitTimePadding;
 
-  return {
-    'hb.ct': adUnit.auctionStart,
-    'hb.rid': adUnit.auctionId,
-    'hb.exn': bidders.join(','),
-    'hb.sts': requestTimes.join(','),
-    'hb.ets': responseTimes.join(','),
-    'hb.bv': bidValues.join(','),
-    'hb.to': timeouts.join(','),
-    'hb.crid': creativeIds.join(','),
-    'hb.we': winningExchangeIndex,
-    'hb.g1': winningExchangeIndex === -1,
-    dddid: adUnit.transactionId,
-    ts: openxBid && openxBid.ts,
-    auid: openxBid && openxBid.params && openxBid.params.unit
-  };
+  auction.auctionSendDelayTimer = setTimeout(() => {
+    let payload = JSON.stringify([buildAuctionPayload(auction)]);
+    ajax(ENDPOINT, deleteAuctionMap, payload, { contentType: 'application/json' });
+
+    function deleteAuctionMap() {
+      delete auctionMap[auction.id];
+    }
+  }, delayTime);
 }
 
-function getPerformanceData(auctionStart) {
-  let timing;
-  try {
-    timing = window.top.performance.timing;
-  } catch (e) {}
+function clearAuctionTimer(auction) {
+  // reset the delay timer to send the auction data
+  if (auction.auctionSendDelayTimer) {
+    clearTimeout(auction.auctionSendDelayTimer);
+    auction.auctionSendDelayTimer = void (0);
+  }
+}
 
-  if (!timing) {
-    return;
+/**
+ * Returns the path to a bid (auction, adunit, bidRequest, and bid) based on a bidId
+ * @param {string} bidId
+ * @returns {Array<*>}
+ */
+function getPathToBidResponseByBidId(bidId) {
+  let auction;
+  let adUnit;
+  let bidResponse;
+
+  if (!bidId) {
+    return [];
   }
 
-  const { fetchStart, domContentLoadedEventEnd, loadEventEnd } = timing;
-  const domContentLoadTime = domContentLoadedEventEnd - fetchStart;
-  const pageLoadTime = loadEventEnd - fetchStart;
-  const timeToAuction = auctionStart - fetchStart;
-  const timeToRender = Date.now() - fetchStart;
+  utils._each(auctionMap, currentAuction => {
+    // skip completed auctions
+    if (currentAuction.state === AUCTION_STATES.COMPLETED) {
+      return;
+    }
 
-  return {
-    'hb.dcl': domContentLoadTime,
-    'hb.dl': pageLoadTime,
-    'hb.tta': timeToAuction,
-    'hb.ttr': timeToRender
-  };
+    utils._each(currentAuction.adUnitCodeToAdUnitMap, (currentAdunit) => {
+      utils._each(currentAdunit.bidRequestsMap, currentBiddRequest => {
+        utils._each(currentBiddRequest.bids, (currentBidResponse, bidResponseId) => {
+          if (bidId === bidResponseId) {
+            auction = currentAuction;
+            adUnit = currentAdunit;
+            bidResponse = currentBidResponse;
+          }
+        });
+      });
+    });
+  });
+  return [auction, adUnit, bidResponse];
 }
 
-function sendEvent(data) {
-  utils._map(data, (value, key) => [key, value]).forEach(([key, value]) => {
-    if (
-      value === undefined ||
-      value === null ||
-      (typeof value === 'number' && isNaN(value))
-    ) {
-      delete data[key];
+function getAuctionByGoogleTagSLot(slot) {
+  let slotAdunitCodes = [slot.getSlotElementId(), slot.getAdUnitPath()];
+  let slotAuction;
+
+  utils._each(auctionMap, auction => {
+    if (auction.state === AUCTION_STATES.COMPLETED) {
+      return;
     }
+
+    utils._each(auction.adUnitCodeToAdUnitMap, (bidderRequestIdMap, adUnitCode) => {
+      if (includes(slotAdunitCodes, adUnitCode)) {
+        slotAuction = auction;
+      }
+    });
   });
-  ajax(ENDPOINT, null, data, { method: 'GET' });
+
+  return slotAuction;
 }
 
-let googletag = window.googletag || {};
-googletag.cmd = googletag.cmd || [];
-googletag.cmd.push(function() {
-  googletag.pubads().addEventListener(SLOT_LOADED, args => {
-    openxAdapter.track({ eventType: SLOT_LOADED, args });
-  });
-});
+function buildAuctionPayload(auction) {
+  let {startTime, endTime, state, timeout, auctionOrder, userIds, adUnitCodeToAdUnitMap} = auction;
+  let {orgId, publisherPlatformId, publisherAccountId, campaign} = analyticsConfig;
 
-const openxAdapter = Object.assign(
-  adapter({ url: ENDPOINT, analyticsType: 'endpoint' }),
-  {
-    track({ eventType, args }) {
-      utils.logMessage(eventType, Object.assign({}, args));
-      switch (eventType) {
-        case AUCTION_INIT:
-          onAuctionInit(args);
-          break;
-        case BID_REQUESTED:
-          onBidRequested(args);
-          break;
-        case BID_RESPONSE:
-          onBidResponse(args);
-          break;
-        case BID_TIMEOUT:
-          onBidTimeout(args);
-          break;
-        case BID_WON:
-          onBidWon(args);
-          break;
-        case SLOT_LOADED:
-          onSlotLoaded(args);
-          break;
+  return {
+    adapterVersion: ADAPTER_VERSION,
+    schemaVersion: SCHEMA_VERSION,
+    orgId,
+    publisherPlatformId,
+    publisherAccountId,
+    campaign,
+    state,
+    startTime,
+    endTime,
+    timeLimit: timeout,
+    auctionOrder,
+    deviceType: detectMob() ? 'Mobile' : 'Desktop',
+    deviceOSType: detectOS(),
+    browser: detectBrowser(),
+    testCode: analyticsConfig.testCode,
+    // return an array of module name that have user data
+    userIdProviders: buildUserIdProviders(userIds),
+    adUnits: buildAdUnitsPayload(adUnitCodeToAdUnitMap),
+  };
+
+  function buildAdUnitsPayload(adUnitCodeToAdUnitMap) {
+    return utils._map(adUnitCodeToAdUnitMap, (adUnit) => {
+      let {code, adPosition} = adUnit;
+
+      return {
+        code,
+        adPosition,
+        bidRequests: buildBidRequestPayload(adUnit.bidRequestsMap)
+      };
+
+      function buildBidRequestPayload(bidRequestsMap) {
+        return utils._map(bidRequestsMap, (bidRequest) => {
+          let {bidder, source, bids, mediaTypes, timeLimit, timedOut} = bidRequest;
+          return {
+            bidder,
+            source,
+            hasBidderResponded: Object.keys(bids).length > 0,
+            availableAdSizes: getMediaTypeSizes(mediaTypes),
+            availableMediaTypes: getMediaTypes(mediaTypes),
+            timeLimit,
+            timedOut,
+            bidResponses: utils._map(bidRequest.bids, (bidderBidResponse) => {
+              let {
+                cpm,
+                creativeId,
+                ts,
+                meta,
+                mediaType,
+                dealId,
+                ttl,
+                netRevenue,
+                currency,
+                width,
+                height,
+                latency,
+                winner,
+                rendered,
+                renderTime
+              } = bidderBidResponse;
+
+              return {
+                microCpm: cpm * 1000000,
+                netRevenue,
+                currency,
+                mediaType,
+                height,
+                width,
+                size: `${width}x${height}`,
+                dealId,
+                latency,
+                ttl,
+                winner,
+                creativeId,
+                ts,
+                rendered,
+                renderTime,
+                meta
+              }
+            })
+          }
+        });
       }
-    }
+    });
   }
-);
-
-// save the base class function
-openxAdapter.originEnableAnalytics = openxAdapter.enableAnalytics;
 
-// override enableAnalytics so we can get access to the config passed in from the page
-openxAdapter.enableAnalytics = function(config) {
-  if (!config || !config.options || !config.options.publisherId) {
-    utils.logError('OpenX analytics adapter: publisherId is required.');
-    return;
+  function buildUserIdProviders(userIds) {
+    return utils._map(userIds, (userId) => {
+      return utils._map(userId, (id, module) => {
+        return hasUserData(module, id) ? module : false
+      }).filter(module => module);
+    }).reduce(utils.flatten, []).filter(utils.uniques).sort();
   }
-  initOptions = config.options;
-  openxAdapter.originEnableAnalytics(config); // call the base class function
-};
 
-// reset the cache for unit tests
-openxAdapter.reset = function() {
-  auctionMap = {};
-};
+  function hasUserData(module, idOrIdObject) {
+    let normalizedId;
+
+    switch (module) {
+      case 'digitrustid':
+        normalizedId = utils.deepAccess(idOrIdObject, 'data.id');
+        break;
+      case 'lipb':
+        normalizedId = idOrIdObject.lipbid;
+        break;
+      default:
+        normalizedId = idOrIdObject;
+    }
 
-adapterManager.registerAnalyticsAdapter({
-  adapter: openxAdapter,
-  code: 'openx'
-});
+    return !utils.isEmpty(normalizedId);
+  }
 
-export default openxAdapter;
+  function getMediaTypeSizes(mediaTypes) {
+    return utils._map(mediaTypes, (mediaTypeConfig, mediaType) => {
+      return utils.parseSizesInput(mediaTypeConfig.sizes)
+        .map(size => `${mediaType}_${size}`);
+    }).reduce(utils.flatten, []);
+  }
+
+  function getMediaTypes(mediaTypes) {
+    return utils._map(mediaTypes, (mediaTypeConfig, mediaType) => mediaType);
+  }
+}
diff --git a/modules/openxAnalyticsAdapter.md b/modules/openxAnalyticsAdapter.md
index ac739f36c76..af40486f2a4 100644
--- a/modules/openxAnalyticsAdapter.md
+++ b/modules/openxAnalyticsAdapter.md
@@ -102,11 +102,13 @@ Configuration options are a follows:
 
 | Property | Type | Required? | Description | Example |
 |:---|:---|:---|:---|:---|
-| `publisherPlatformId` | `string` | Yes | Used to determine ownership of data. | `a3aece0c-9e80-4316-8deb-faf804779bd1` |
-| `publisherAccountId` | `number` | Yes | Used to determine ownership of data. | `1537143056` |
+| `orgId` | `string` | Yes | Used to determine ownership of data. | `aa1bb2cc-3dd4-4316-8deb-faf804779bd1` |
+| `publisherPlatformId` | `string` | No 
 **__Deprecated.  Please use orgId__** | Used to determine ownership of data. | `a3aece0c-9e80-4316-8deb-faf804779bd1` |
+| `publisherAccountId` | `number` | No 
 **__Deprecated.  Please use orgId__** | Used to determine ownership of data. | `1537143056` |
 | `sampling` | `number` | Yes | Sampling rate | Undefined or `1.00` - No sampling. Analytics is sent all the time.
0.5 - 50% of users will send analytics data. |
 | `testCode` | `string` | No | Used to label analytics data for the purposes of tests.
This label is treated as a dimension and can be compared against other labels. | `timeout_config_1`
`timeout_config_2`
`timeout_default` |
-
+| `campaign` | `Object` | No | Object with 5 parameters: 
  • content
  • medium
  • name
  • source
  • term
 Each parameter is a free-form string. Refer to metrics doc on when to use these fields.  By setting a value to one of these properties, you override the associated url utm query parameter. | |
+| `payloadWaitTime` | `number` | No | Delay after all slots of an auction renders before the payload is sent. 
 Defaults to 100ms | 1000 |
 ---
 
 # Viewing Data
@@ -114,7 +116,7 @@ The Prebid Report available in the Reporting in the Cloud tool, allows you to vi
 
 **To view your data:**
 
-1. Log in to Reporting in the Cloud.
+1. Log in to [OpenX Reporting](https://openx.sigmoid.io/app).
 
 2. In the top right, click on the **View** list and then select **Prebidreport**.
 
diff --git a/modules/openxBidAdapter.js b/modules/openxBidAdapter.js
index d5630c2fad4..a398a20a5c5 100644
--- a/modules/openxBidAdapter.js
+++ b/modules/openxBidAdapter.js
@@ -2,23 +2,39 @@ import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import includes from 'core-js-pure/features/array/includes.js'
 
 const SUPPORTED_AD_TYPES = [BANNER, VIDEO];
+const VIDEO_TARGETING = ['startdelay', 'mimes', 'minduration', 'maxduration',
+  'startdelay', 'skippable', 'playbackmethod', 'api', 'protocols', 'boxingallowed',
+  'linearity', 'delivery', 'protocol', 'placement', 'minbitrate', 'maxbitrate'];
 const BIDDER_CODE = 'openx';
 const BIDDER_CONFIG = 'hb_pb';
-const BIDDER_VERSION = '3.0.2';
+const BIDDER_VERSION = '3.0.3';
+
+const DEFAULT_CURRENCY = 'USD';
 
 export const USER_ID_CODE_TO_QUERY_ARG = {
   britepoolid: 'britepoolid', // BritePool ID
   criteoId: 'criteoid', // CriteoID
-  digitrustid: 'digitrustid', // DigiTrust
+  fabrickId: 'nuestarid', // Fabrick ID by Nuestar
+  haloId: 'audigentid', // Halo ID from Audigent
   id5id: 'id5id', // ID5 ID
   idl_env: 'lre', // LiveRamp IdentityLink
+  IDP: 'zeotapid', // zeotapIdPlus ID+
+  idxId: 'idxid', // idIDx,
+  intentIqId: 'intentiqid', // IntentIQ ID
   lipb: 'lipbid', // LiveIntent ID
+  lotamePanoramaId: 'lotameid', // Lotame Panorama ID
+  merkleId: 'merkleid', // Merkle ID
   netId: 'netid', // netID
-  parrableid: 'parrableid', // Parrable ID
+  parrableId: 'parrableid', // Parrable ID
   pubcid: 'pubcid', // PubCommon ID
+  quantcastId: 'quantcastid', // Quantcast ID
+  sharedId: 'sharedid', // Shared ID User ID
+  tapadId: 'tapadid', // Tapad Id
   tdid: 'ttduuid', // The Trade Desk Unified ID
+  verizonMediaId: 'verizonmediaid', // Verizon Media ConnectID
 };
 
 export const spec = {
@@ -145,6 +161,12 @@ function createBannerBidResponses(oxResponseObj, {bids, startTime}) {
       bidResponse.meta.brandId = adUnit.brand_id;
     }
 
+    if (adUnit.adomain && length(adUnit.adomain) > 0) {
+      bidResponse.meta.advertiserDomains = adUnit.adomain;
+    } else {
+      bidResponse.meta.advertiserDomains = [];
+    }
+
     if (adUnit.adv_id) {
       bidResponse.meta.dspid = adUnit.adv_id;
     }
@@ -270,12 +292,15 @@ function appendUserIdsToQueryParams(queryParams, userIds) {
 
     if (USER_ID_CODE_TO_QUERY_ARG.hasOwnProperty(userIdProviderKey)) {
       switch (userIdProviderKey) {
-        case 'digitrustid':
-          queryParams[key] = utils.deepAccess(userIdObjectOrValue, 'data.id');
-          break;
         case 'lipb':
           queryParams[key] = userIdObjectOrValue.lipbid;
           break;
+        case 'parrableId':
+          queryParams[key] = userIdObjectOrValue.eid;
+          break;
+        case 'id5id':
+          queryParams[key] = userIdObjectOrValue.uid;
+          break;
         default:
           queryParams[key] = userIdObjectOrValue;
       }
@@ -305,7 +330,12 @@ function buildOXBannerRequest(bids, bidderRequest) {
   let auids = utils._map(bids, bid => bid.params.unit);
 
   queryParams.aus = utils._map(bids, bid => utils.parseSizesInput(bid.mediaTypes.banner.sizes).join(',')).join('|');
-  queryParams.divIds = utils._map(bids, bid => encodeURIComponent(bid.adUnitCode)).join(',');
+  queryParams.divids = utils._map(bids, bid => encodeURIComponent(bid.adUnitCode)).join(',');
+  // gpid
+  queryParams.aucs = utils._map(bids, function (bid) {
+    let gpid = utils.deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+    return encodeURIComponent(gpid || '')
+  }).join(',');
 
   if (auids.some(auid => auid)) {
     queryParams.auid = auids.join(',');
@@ -333,19 +363,7 @@ function buildOXBannerRequest(bids, bidderRequest) {
     queryParams.tps = customParamsForAllBids.join(',');
   }
 
-  let customFloorsForAllBids = [];
-  let hasCustomFloor = false;
-  bids.forEach(function (bid) {
-    if (bid.params.customFloor) {
-      customFloorsForAllBids.push((Math.round(bid.params.customFloor * 100) / 100) * 1000);
-      hasCustomFloor = true;
-    } else {
-      customFloorsForAllBids.push(0);
-    }
-  });
-  if (hasCustomFloor) {
-    queryParams.aumfs = customFloorsForAllBids.join(',');
-  }
+  enrichQueryWithFloors(queryParams, BANNER, bids);
 
   let url = queryParams.ph
     ? `https://u.openx.net/w/1.0/arj`
@@ -373,6 +391,7 @@ function buildOXVideoRequest(bid, bidderRequest) {
 }
 
 function generateVideoParameters(bid, bidderRequest) {
+  const videoMediaType = utils.deepAccess(bid, `mediaTypes.video`);
   let queryParams = buildCommonQueryParamsFromBids([bid], bidderRequest);
   let oxVideoConfig = utils.deepAccess(bid, 'params.video') || {};
   let context = utils.deepAccess(bid, 'mediaTypes.video.context');
@@ -392,16 +411,35 @@ function generateVideoParameters(bid, bidderRequest) {
     height = parseInt(playerSize[1], 10);
   }
 
-  Object.keys(oxVideoConfig).forEach(function (key) {
-    if (key === 'openrtb') {
-      oxVideoConfig[key].w = width || oxVideoConfig[key].w;
-      oxVideoConfig[key].v = height || oxVideoConfig[key].v;
-      queryParams[key] = JSON.stringify(oxVideoConfig[key]);
-    } else if (!(key in queryParams) && key !== 'url') {
-      // only allow video-related attributes
-      queryParams[key] = oxVideoConfig[key];
-    }
-  });
+  let openRtbParams = {w: width, h: height};
+
+  // legacy openrtb params could be in video, openrtb, or video.openrtb
+  let legacyParams = bid.params.video || bid.params.openrtb || {};
+  if (legacyParams.openrtb) {
+    legacyParams = legacyParams.openrtb;
+  }
+  // support for video object or full openrtb object
+  if (utils.isArray(legacyParams.imp)) {
+    legacyParams = legacyParams.imp[0].video;
+  }
+  Object.keys(legacyParams)
+    .filter(param => includes(VIDEO_TARGETING, param))
+    .forEach(param => openRtbParams[param] = legacyParams[param]);
+
+  // 5.0 openrtb video params
+  Object.keys(videoMediaType)
+    .filter(param => includes(VIDEO_TARGETING, param))
+    .forEach(param => openRtbParams[param] = videoMediaType[param]);
+
+  let openRtbReq = {
+    imp: [
+      {
+        video: openRtbParams
+      }
+    ]
+  }
+
+  queryParams['openrtb'] = JSON.stringify(openRtbReq);
 
   queryParams.auid = bid.params.unit;
   // override prebid config with openx config if available
@@ -416,6 +454,18 @@ function generateVideoParameters(bid, bidderRequest) {
     queryParams.vmimes = oxVideoConfig.mimes;
   }
 
+  if (bid.params.test) {
+    queryParams.vtest = 1;
+  }
+
+  let gpid = utils.deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
+  if (gpid) {
+    queryParams.aucs = encodeURIComponent(gpid)
+  }
+
+  // each video bid makes a separate request
+  enrichQueryWithFloors(queryParams, VIDEO, [bid]);
+
   return queryParams;
 }
 
@@ -426,6 +476,9 @@ function createVideoBidResponses(response, {bid, startTime}) {
     let vastQueryParams = utils.parseUrl(response.vastUrl).search || {};
     let bidResponse = {};
     bidResponse.requestId = bid.bidId;
+    if (response.deal_id) {
+      bidResponse.dealId = response.deal_id;
+    }
     // default 5 mins
     bidResponse.ttl = 300;
     // true is net, false is gross
@@ -449,4 +502,38 @@ function createVideoBidResponses(response, {bid, startTime}) {
   return bidResponses;
 }
 
+function enrichQueryWithFloors(queryParams, mediaType, bids) {
+  let customFloorsForAllBids = [];
+  let hasCustomFloor = false;
+  bids.forEach(function (bid) {
+    let floor = getBidFloor(bid, mediaType);
+
+    if (floor) {
+      customFloorsForAllBids.push(floor);
+      hasCustomFloor = true;
+    } else {
+      customFloorsForAllBids.push(0);
+    }
+  });
+  if (hasCustomFloor) {
+    queryParams.aumfs = customFloorsForAllBids.join(',');
+  }
+}
+
+function getBidFloor(bidRequest, mediaType) {
+  let floorInfo = {};
+  const currency = config.getConfig('currency.adServerCurrency') || DEFAULT_CURRENCY;
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({
+      currency: currency,
+      mediaType: mediaType,
+      size: '*'
+    });
+  }
+  let floor = floorInfo.floor || bidRequest.params.customFloor || 0;
+
+  return Math.round(floor * 1000); // normalize to micro currency
+}
+
 registerBidder(spec);
diff --git a/modules/openxBidAdapter.md b/modules/openxBidAdapter.md
index 965b8ee1948..68e41a93b18 100644
--- a/modules/openxBidAdapter.md
+++ b/modules/openxBidAdapter.md
@@ -98,7 +98,7 @@ pbjs.setConfig({
 ```
 
 # Additional Details
-[Banner Ads](https://docs.openx.com/Content/developers/containers/prebid-adapter.html)
+[Banner Ads](https://docs.openx.com/publishers/prebid-adapter-web/)
 
-[Video Ads](https://docs.openx.com/Content/developers/containers/prebid-video-adapter.html)
+[Video Ads](https://docs.openx.com/publishers/prebid-adapter-video/)
 
diff --git a/modules/optimeraRtdProvider.js b/modules/optimeraRtdProvider.js
new file mode 100644
index 00000000000..fadbd099368
--- /dev/null
+++ b/modules/optimeraRtdProvider.js
@@ -0,0 +1,188 @@
+/**
+ * This module adds optimera provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ *
+ * The module will fetch targeting values from the Optimera server
+ * and apply the tageting to each ad request. These values are created
+ * from the Optimera Mesaurement script which is installed on the
+ * Publisher's site.
+ *
+ * @module modules/optimeraRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} clientID
+ * @property {string} optimeraKeyName
+ * @property {string} device
+ */
+
+import * as utils from '../src/utils.js';
+import { submodule } from '../src/hook.js';
+import { ajaxBuilder } from '../src/ajax.js';
+
+/** @type {ModuleParams} */
+let _moduleParams = {};
+
+/**
+ * Default Optimera Key Name
+ * This can default to hb_deal_optimera for publishers
+ * who used the previous Optimera Bidder Adapter.
+ * @type {string} */
+export let optimeraKeyName = 'hb_deal_optimera';
+
+/**
+ * Optimera Score File Base URL.
+ * This is the base URL for the data endpoint request to fetch
+ * the targeting values.
+ * @type {string}
+ */
+export const scoresBaseURL = 'https://dyv1bugovvq1g.cloudfront.net/';
+
+/**
+ * Optimera Score File URL.
+ * @type {string}
+ */
+export let scoresURL;
+
+/**
+ * Optimera Client ID.
+ * @type {string}
+ */
+export let clientID;
+
+/**
+ * Optional device parameter.
+ * @type {string}
+ */
+export let device = 'default';
+
+/**
+ * Targeting object for all ad positions.
+ * @type {string}
+ */
+export let optimeraTargeting = {};
+
+/**
+ * Make the request for the Score File.
+ */
+export function scoreFileRequest() {
+  utils.logInfo('Fetch Optimera score file.');
+  const ajax = ajaxBuilder();
+  ajax(scoresURL,
+    {
+      success: (res, req) => {
+        if (req.status === 200) {
+          try {
+            setScores(res);
+          } catch (err) {
+            utils.logError('Unable to parse Optimera Score File.', err);
+          }
+        } else if (req.status === 403) {
+          utils.logError('Unable to fetch the Optimera Score File - 403');
+        }
+      },
+      error: () => {
+        utils.logError('Unable to fetch the Optimera Score File.');
+      }
+    });
+}
+
+/**
+ * Apply the Optimera targeting to the ad slots.
+ */
+export function returnTargetingData(adUnits, config) {
+  const targeting = {};
+  try {
+    adUnits.forEach(function(adUnit) {
+      if (optimeraTargeting[adUnit]) {
+        targeting[adUnit] = {};
+        targeting[adUnit][optimeraKeyName] = optimeraTargeting[adUnit];
+      }
+    });
+  } catch (err) {
+    utils.logError('error', err);
+  }
+  utils.logInfo('Apply Optimera targeting');
+  return targeting;
+}
+
+/**
+ * Initialize the Module.
+ */
+export function init(moduleConfig) {
+  _moduleParams = moduleConfig.params;
+  if (_moduleParams && _moduleParams.clientID) {
+    clientID = _moduleParams.clientID;
+    if (_moduleParams.optimeraKeyName) {
+      optimeraKeyName = (_moduleParams.optimeraKeyName);
+    }
+    if (_moduleParams.device) {
+      device = _moduleParams.device;
+    }
+    setScoresURL();
+    scoreFileRequest();
+    return true;
+  } else {
+    if (!_moduleParams.clientID) {
+      utils.logError('Optimera clientID is missing in the Optimera RTD configuration.');
+    }
+    return false;
+  }
+}
+
+/**
+ * Set the score file url.
+ * This fully-formed URL for the data endpoint request to fetch
+ * the targeting values. This is not a js library, rather JSON
+ * which has the targeting values for the page.
+ */
+export function setScoresURL() {
+  const optimeraHost = window.location.host;
+  const optimeraPathName = window.location.pathname;
+  scoresURL = `${scoresBaseURL}${clientID}/${optimeraHost}${optimeraPathName}.js`;
+}
+
+/**
+ * Set the scores for the divice if given.
+ * @param {*} result
+ * @returns {string} JSON string of Optimera Scores.
+ */
+export function setScores(result) {
+  let scores = {};
+  try {
+    scores = JSON.parse(result);
+    if (device !== 'default' && scores.device[device]) {
+      scores = scores.device[device];
+    }
+  } catch (e) {
+    utils.logError('Optimera score file could not be parsed.');
+  }
+  optimeraTargeting = scores;
+}
+
+/** @type {RtdSubmodule} */
+export const optimeraSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'optimeraRTD',
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   * @param {string[]} adUnitsCodes
+   */
+  getTargetingData: returnTargetingData,
+  init,
+};
+
+/**
+ * Register the Sub Module.
+ */
+function registerSubModule() {
+  submodule('realTimeData', optimeraSubmodule);
+}
+
+registerSubModule();
diff --git a/modules/optimeraRtdProvider.md b/modules/optimeraRtdProvider.md
new file mode 100644
index 00000000000..610dec537e0
--- /dev/null
+++ b/modules/optimeraRtdProvider.md
@@ -0,0 +1,44 @@
+# Overview
+```
+Module Name: Optimera Real Time Date Module
+Module Type: RTD Module
+Maintainer: mcallari@optimera.nyc
+```
+
+# Description
+
+Optimera Real Time Data Module. Provides targeting for ad requests from data collected by the Optimera Measurement script on your site. Please contact [Optimera](http://optimera.nyc/) for information. This is a port of the Optimera Bidder Adapter.
+
+# Configurations
+
+Compile the Optimera RTD Provider into your Prebid build:
+
+`gulp build --modules=optimeraRtdProvider`
+
+Configuration example for using RTD module with `optimera` provider
+```javascript
+  pbjs.setConfig({
+    realTimeData: {
+      dataProviders: [
+        {
+          name: 'optimeraRTD',
+          waitForIt: true,
+          params: {
+            clientID: '9999',
+            optimeraKeyName: 'optimera',
+            device: 'de'
+          }
+        }
+      ]
+    }
+```  
+
+#Params
+
+Contact Optimera to get assistance with the params.
+
+|  param name | type  |Scope | Description |
+| :------------ | :------------ | :------- | :------- |
+| clientID  | string  | required | Optimera Client ID |
+| optimeraKeyName  | string  | optional |  GAM key name for Optimera. If migrating from the Optimera bidder adapter this will default to hb_deal_optimera and can be ommitted from the configuration. |
+| device  | string  | optional | Device type code for mobile, tablet, or desktop. Either mo, tb, de |
diff --git a/modules/optimonAnalyticsAdapter.js b/modules/optimonAnalyticsAdapter.js
new file mode 100644
index 00000000000..34b2778afc9
--- /dev/null
+++ b/modules/optimonAnalyticsAdapter.js
@@ -0,0 +1,25 @@
+/**
+*
+*********************************************************
+*
+* Optimon.io Prebid Analytics Adapter
+*
+*********************************************************
+*
+*/
+
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const optimonAnalyticsAdapter = adapter({
+  global: 'OptimonAnalyticsAdapter',
+  handler: 'on',
+  analyticsType: 'bundle'
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: optimonAnalyticsAdapter,
+  code: 'optimon',
+});
+
+export default optimonAnalyticsAdapter;
diff --git a/modules/optimonAnalyticsAdapter.md b/modules/optimonAnalyticsAdapter.md
new file mode 100644
index 00000000000..4e2c00dfcab
--- /dev/null
+++ b/modules/optimonAnalyticsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Optimon.io Prebid Analytics Adapter  
+Module Type: Analytics Adapter  
+Maintainer: hello@optimon.io  
+
+# Description
+
+Start analyzing your Prebid performance by visiting our website [Optimon.io](https://optimon.io/?utm_source=prebid-org&utm_medium=analytics-adapter) or contact us directly by email: [hello@optimon.io](mailto:hello@optimon.io) to get started.
+
+# Platform Details
+
+[Optimon.io](https://optimon.io/?utm_source=prebid-org&utm_medium=analytics-adapter) is a Robust Alerting & Reporting Platform for Prebid and GAM that helps publishers make the right decisions by collecting data from your Google Ad Manager, Prebid, and other SSPs and providing smart insights and suggestions to optimize and maximize their overall yield and save manual work.
diff --git a/modules/orbidderBidAdapter.js b/modules/orbidderBidAdapter.js
index d14e2bebd72..4a7d686a7bc 100644
--- a/modules/orbidderBidAdapter.js
+++ b/modules/orbidderBidAdapter.js
@@ -1,18 +1,21 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { getStorageManager } from '../src/storageManager.js';
+import * as utils from '../src/utils.js';
 
-const storage = getStorageManager();
+const storageManager = getStorageManager();
 
 export const spec = {
   code: 'orbidder',
-  orbidderHost: (() => {
-    let ret = 'https://orbidder.otto.de';
+  hostname: 'https://orbidder.otto.de',
+
+  getHostname() {
+    let ret = this.hostname;
     try {
-      ret = storage.getDataFromLocalStorage('ov_orbidder_host') || ret;
+      ret = storageManager.getDataFromLocalStorage('ov_orbidder_host') || ret;
     } catch (e) {
     }
     return ret;
-  })(),
+  },
 
   isBidRequestValid(bid) {
     return !!(bid.sizes && bid.bidId && bid.params &&
@@ -23,14 +26,17 @@ export const spec = {
   },
 
   buildRequests(validBidRequests, bidderRequest) {
+    const hostname = this.getHostname();
     return validBidRequests.map((bidRequest) => {
       let referer = '';
       if (bidderRequest && bidderRequest.refererInfo) {
         referer = bidderRequest.refererInfo.referer || '';
       }
 
+      bidRequest.params.bidfloor = getBidFloor(bidRequest);
+
       const ret = {
-        url: `${spec.orbidderHost}/bid`,
+        url: `${hostname}/bid`,
         method: 'POST',
         options: { withCredentials: true },
         data: {
@@ -67,6 +73,13 @@ export const spec = {
           }
           bidResponse[requiredKey] = bid[requiredKey];
         }
+
+        if (Array.isArray(bid.advertiserDomains)) {
+          bidResponse.meta = {
+            advertiserDomains: bid.advertiserDomains
+          }
+        }
+
         bidResponses.push(bidResponse);
       });
     }
@@ -74,4 +87,25 @@ export const spec = {
   },
 };
 
+/**
+ * Get bid floor from Price Floors Module
+ * @param {Object} bid
+ * @returns {float||undefined}
+ */
+function getBidFloor(bid) {
+  if (!utils.isFn(bid.getFloor)) {
+    return bid.params.bidfloor;
+  }
+
+  const floor = bid.getFloor({
+    currency: 'EUR',
+    mediaType: '*',
+    size: '*'
+  });
+  if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'EUR') {
+    return floor.floor;
+  }
+  return undefined;
+}
+
 registerBidder(spec);
diff --git a/modules/outbrainBidAdapter.js b/modules/outbrainBidAdapter.js
new file mode 100644
index 00000000000..052122e95f1
--- /dev/null
+++ b/modules/outbrainBidAdapter.js
@@ -0,0 +1,288 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'outbrain';
+const GVLID = 164;
+const CURRENCY = 'USD';
+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' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [ NATIVE, BANNER ],
+  isBidRequestValid: (bid) => {
+    return (
+      !!config.getConfig('outbrain.bidderUrl') &&
+      !!utils.deepAccess(bid, 'params.publisher.id') &&
+      !!(bid.nativeParams || bid.sizes)
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const page = bidderRequest.refererInfo.referer;
+    const ua = navigator.userAgent;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const publisher = setOnAny(validBidRequests, 'params.publisher');
+    const bcat = setOnAny(validBidRequests, 'params.bcat');
+    const badv = setOnAny(validBidRequests, 'params.badv');
+    const cur = CURRENCY;
+    const endpointUrl = config.getConfig('outbrain.bidderUrl');
+    const timeout = bidderRequest.timeout;
+
+    const imps = validBidRequests.map((bid, id) => {
+      bid.netRevenue = 'net';
+      const imp = {
+        id: id + 1 + ''
+      }
+
+      if (bid.params.tagid) {
+        imp.tagid = bid.params.tagid
+      }
+
+      if (bid.nativeParams) {
+        imp.native = {
+          request: JSON.stringify({
+            assets: getNativeAssets(bid)
+          })
+        }
+      } else {
+        imp.banner = {
+          format: transformSizes(bid.sizes)
+        }
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: { page, publisher },
+      device: { ua },
+      source: { fd: 1 },
+      cur: [cur],
+      tmax: timeout,
+      imp: imps,
+      bcat: bcat,
+      badv: badv,
+      ext: {
+        prebid: {
+          channel: {
+            name: 'pbjs',
+            version: '$prebid.version$'
+          }
+        }
+      }
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
+    }
+
+    if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
+      utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1)
+    }
+    if (bidderRequest.uspConsent) {
+      utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent)
+    }
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(request, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
+    return {
+      method: 'POST',
+      url: endpointUrl,
+      data: JSON.stringify(request),
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: (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 type = bid.nativeParams ? NATIVE : BANNER;
+        const bidObject = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          mediaType: type,
+          nurl: bidResponse.nurl,
+        };
+        if (type === NATIVE) {
+          bidObject.native = parseNative(bidResponse);
+        } else {
+          bidObject.ad = bidResponse.adm;
+          bidObject.width = bidResponse.w;
+          bidObject.height = bidResponse.h;
+        }
+        bidObject.meta = {};
+        if (bidResponse.adomain && bidResponse.adomain.length > 0) {
+          bidObject.meta.advertiserDomains = bidResponse.adomain;
+        }
+        return bidObject;
+      }
+    }).filter(Boolean);
+  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    const syncs = [];
+    let syncUrl = config.getConfig('outbrain.usersyncUrl');
+
+    let query = [];
+    if (syncOptions.pixelEnabled && syncUrl) {
+      if (gdprConsent) {
+        query.push('gdpr=' + (gdprConsent.gdprApplies & 1));
+        query.push('gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || ''));
+      }
+      if (uspConsent) {
+        query.push('us_privacy=' + encodeURIComponent(uspConsent));
+      }
+
+      syncs.push({
+        type: 'image',
+        url: syncUrl + (query.length ? '?' + query.join('&') : '')
+      });
+    }
+    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
+    if (bid.nurl) {
+      ajax(utils.replaceAuctionPrice(bid.nurl, bid.originalCpm))
+    }
+  }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, eventtrackers } = JSON.parse(bid.adm);
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || 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 };
+    }
+  });
+  if (eventtrackers) {
+    result.impressionTrackers = [];
+    eventtrackers.forEach(tracker => {
+      if (tracker.event !== 1) return;
+      switch (tracker.method) {
+        case 1: // img
+          result.impressionTrackers.push(tracker.url);
+          break;
+        case 2: // js
+          result.javascriptTrackers = ``;
+          break;
+      }
+    });
+  }
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = utils.deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function getNativeAssets(bid) {
+  return utils._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);
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  if (!utils.isArray(requestSizes)) {
+    return [];
+  }
+
+  if (requestSizes.length === 2 && !utils.isArray(requestSizes[0])) {
+    return [{
+      w: parseInt(requestSizes[0], 10),
+      h: parseInt(requestSizes[1], 10)
+    }];
+  } else if (utils.isArray(requestSizes[0])) {
+    return requestSizes.map(item =>
+      ({
+        w: parseInt(item[0], 10),
+        h: parseInt(item[1], 10)
+      })
+    );
+  }
+
+  return [];
+}
diff --git a/modules/outbrainBidAdapter.md b/modules/outbrainBidAdapter.md
new file mode 100644
index 00000000000..32df22ddad8
--- /dev/null
+++ b/modules/outbrainBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: Outbrain Adapter
+Module Type: Bidder Adapter
+Maintainer: prog-ops-team@outbrain.com
+```
+
+# Description
+
+Module that connects to Outbrain bidder to fetch bids.
+Both native and display formats are supported but not at the same time. Using OpenRTB standard.
+
+# Configuration
+
+## Bidder and usersync URLs
+
+The Outbrain adapter does not work without setting the correct bidder and usersync URLs.
+You will receive the URLs when contacting us.
+
+```
+pbjs.setConfig({
+    outbrain: {
+      bidderUrl: 'https://bidder-url.com',
+      usersyncUrl: 'https://usersync-url.com'
+    }
+});
+```
+
+
+# Test Native Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'outbrain',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            }
+        }]
+    ];
+
+    pbjs.setConfig({
+        outbrain: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
+
+# Test Display Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_display_example_1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [{
+            bidder: 'outbrain',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            },
+        }]
+    ];
+
+    pbjs.setConfig({
+        outbrain: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
diff --git a/modules/ozoneBidAdapter.js b/modules/ozoneBidAdapter.js
index 87f140556d0..928344be74f 100644
--- a/modules/ozoneBidAdapter.js
+++ b/modules/ozoneBidAdapter.js
@@ -5,108 +5,157 @@ import {config} from '../src/config.js';
 import {getPriceBucketString} from '../src/cpmBucketManager.js';
 import { Renderer } from '../src/Renderer.js';
 const BIDDER_CODE = 'ozone';
-const ALLOWED_LOTAME_PARAMS = ['oz_lotameid', 'oz_lotamepid', 'oz_lotametpid'];
 
 // *** PROD ***
-const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
-const OZONECOOKIESYNC = 'https://elb.the-ozone-project.com/static/load-cookie.html';
+const ORIGIN = 'https://elb.the-ozone-project.com' // applies only to auction & cookie
+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.4.0';
+const OZONEVERSION = '2.6.0';
 export const spec = {
+  gvlid: 524,
+  aliases: [{code: 'lmc', gvlid: 524}, {code: 'newspassid', gvlid: 524}],
+  version: OZONEVERSION,
   code: BIDDER_CODE,
   supportedMediaTypes: [VIDEO, BANNER],
-  cookieSyncBag: {'publisherId': null, 'siteId': null, 'userIdObject': {}}, // variables we want to make available to cookie sync
-  propertyBag: {'lotameWasOverridden': 0, 'pageId': null, 'buildRequestsStart': 0, 'buildRequestsEnd': 0}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
-
+  cookieSyncBag: {publisherId: null, siteId: null, userIdObject: {}}, // variables we want to make available to cookie sync
+  propertyBag: {pageId: null, buildRequestsStart: 0, buildRequestsEnd: 0, endpointOverride: null}, /* allow us to store vars in instance scope - needs to be an object to be mutable */
+  whitelabel_defaults: {
+    'logId': 'OZONE',
+    'bidder': 'ozone',
+    'keyPrefix': 'oz',
+    'auctionUrl': ORIGIN + AUCTIONURI,
+    'cookieSyncUrl': ORIGIN + OZONECOOKIESYNC,
+    'rendererUrl': OZONE_RENDERER_URL
+  },
+  /**
+   * make sure that the whitelabel/default values are available in the propertyBag
+   * @param bid Object : the bid
+   */
+  loadWhitelabelData(bid) {
+    if (this.propertyBag.whitelabel) { return; }
+    this.propertyBag.whitelabel = JSON.parse(JSON.stringify(this.whitelabel_defaults));
+    let bidder = bid.bidder || 'ozone'; // eg. ozone
+    this.propertyBag.whitelabel.logId = bidder.toUpperCase();
+    this.propertyBag.whitelabel.bidder = bidder;
+    let bidderConfig = config.getConfig(bidder) || {};
+    utils.logInfo('got bidderConfig: ', JSON.parse(JSON.stringify(bidderConfig)));
+    if (bidderConfig.kvpPrefix) {
+      this.propertyBag.whitelabel.keyPrefix = bidderConfig.kvpPrefix;
+    }
+    let arr = this.getGetParametersAsObject();
+    if (bidderConfig.endpointOverride) {
+      if (bidderConfig.endpointOverride.origin) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.origin;
+        this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.origin + AUCTIONURI;
+        this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.origin + OZONECOOKIESYNC;
+      }
+      if (arr.hasOwnProperty('renderer')) {
+        if (arr.renderer.match('%3A%2F%2F')) {
+          this.propertyBag.whitelabel.rendererUrl = decodeURIComponent(arr['renderer']);
+        } else {
+          this.propertyBag.whitelabel.rendererUrl = arr['renderer'];
+        }
+      } else if (bidderConfig.endpointOverride.rendererUrl) {
+        this.propertyBag.whitelabel.rendererUrl = bidderConfig.endpointOverride.rendererUrl;
+      }
+      if (bidderConfig.endpointOverride.cookieSyncUrl) {
+        this.propertyBag.whitelabel.cookieSyncUrl = bidderConfig.endpointOverride.cookieSyncUrl;
+      }
+      if (bidderConfig.endpointOverride.auctionUrl) {
+        this.propertyBag.endpointOverride = bidderConfig.endpointOverride.auctionUrl;
+        this.propertyBag.whitelabel.auctionUrl = bidderConfig.endpointOverride.auctionUrl;
+      }
+    }
+    try {
+      if (arr.hasOwnProperty('auction') && arr.auction === 'dev') {
+        utils.logInfo('GET: auction=dev');
+        this.propertyBag.whitelabel.auctionUrl = ORIGIN_DEV + AUCTIONURI;
+      }
+      if (arr.hasOwnProperty('cookiesync') && arr.cookiesync === 'dev') {
+        utils.logInfo('GET: cookiesync=dev');
+        this.propertyBag.whitelabel.cookieSyncUrl = ORIGIN_DEV + OZONECOOKIESYNC;
+      }
+    } catch (e) {}
+    utils.logInfo('set propertyBag.whitelabel to', this.propertyBag.whitelabel);
+  },
+  getAuctionUrl() {
+    return this.propertyBag.whitelabel.auctionUrl;
+  },
+  getCookieSyncUrl() {
+    return this.propertyBag.whitelabel.cookieSyncUrl;
+  },
+  getRendererUrl() {
+    return this.propertyBag.whitelabel.rendererUrl;
+  },
   /**
    * Basic check to see whether required parameters are in the request.
    * @param bid
    * @returns {boolean}
    */
   isBidRequestValid(bid) {
-    utils.logInfo('OZONE: isBidRequestValid : ', config.getConfig(), bid);
+    this.loadWhitelabelData(bid);
+    utils.logInfo('isBidRequestValid : ', config.getConfig(), bid);
     let adUnitCode = bid.adUnitCode; // adunit[n].code
 
     if (!(bid.params.hasOwnProperty('placementId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing placementId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      utils.logError('VALIDATION FAILED : missing placementId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!this.isValidPlacementId(bid.params.placementId)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
+      utils.logError('VALIDATION FAILED : placementId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('publisherId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing publisherId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      utils.logError('VALIDATION FAILED : missing publisherId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!(bid.params.publisherId).toString().match(/^[a-zA-Z0-9\-]{12}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
+      utils.logError('VALIDATION FAILED : publisherId must be exactly 12 alphanumieric characters including hyphens', adUnitCode);
       return false;
     }
     if (!(bid.params.hasOwnProperty('siteId'))) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : missing siteId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
+      utils.logError('VALIDATION FAILED : missing siteId : siteId, placementId and publisherId are REQUIRED', adUnitCode);
       return false;
     }
     if (!(bid.params.siteId).toString().match(/^[0-9]{10}$/)) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
+      utils.logError('VALIDATION FAILED : siteId must be exactly 10 numeric characters', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customParams')) {
-      utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
+      utils.logError('VALIDATION FAILED : customParams should be renamed to customData', adUnitCode);
       return false;
     }
     if (bid.params.hasOwnProperty('customData')) {
       if (!Array.isArray(bid.params.customData)) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is not an Array', adUnitCode);
+        utils.logError('VALIDATION FAILED : customData is not an Array', adUnitCode);
         return false;
       }
       if (bid.params.customData.length < 1) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
+        utils.logError('VALIDATION FAILED : customData is an array but does not contain any elements', adUnitCode);
         return false;
       }
       if (!(bid.params.customData[0]).hasOwnProperty('targeting')) {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
+        utils.logError('VALIDATION FAILED : customData[0] does not contain "targeting"', adUnitCode);
         return false;
       }
       if (typeof bid.params.customData[0]['targeting'] != 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
-        return false;
-      }
-    }
-    if (bid.params.hasOwnProperty('lotameData')) {
-      if (typeof bid.params.lotameData !== 'object') {
-        utils.logError('OZONE: OZONE BID ADAPTER VALIDATION FAILED : lotameData is not an object', adUnitCode);
+        utils.logError('VALIDATION FAILED : customData[0] targeting is not an object', adUnitCode);
         return false;
       }
     }
     if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
       if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-        utils.logError('OZONE: No video context key/value in bid. Rejecting bid: ', bid);
+        utils.logError('No video context key/value in bid. Rejecting bid: ', bid);
         return false;
       }
       if (bid.mediaTypes[VIDEO].context !== 'instream' && bid.mediaTypes[VIDEO].context !== 'outstream') {
-        utils.logError('OZONE: video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
+        utils.logError('video.context is invalid. Only instream/outstream video is supported. Rejecting bid: ', bid);
         return false;
       }
     }
-    // guard against hacks in GET parameters that we might allow
-    const arrLotameOverride = this.getLotameOverrideParams();
-    // lotame override, test params. All 3 must be present, or none.
-    let lotameKeys = Object.keys(arrLotameOverride);
-    if (lotameKeys.length === ALLOWED_LOTAME_PARAMS.length) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      for (let i in lotameKeys) {
-        if (!arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString().match(/^[0-9a-zA-Z]+$/)) {
-          utils.logError('OZONE: Only letters & numbers allowed in lotame override: ' + i.toString() + ': ' + arrLotameOverride[ALLOWED_LOTAME_PARAMS[i]].toString() + '. Rejecting bid: ', bid);
-          return false;
-        }
-      }
-    } else if (lotameKeys.length > 0) {
-      utils.logInfo('OZONE: VALIDATION : arrLotameOverride', arrLotameOverride);
-      utils.logError('OZONE: lotame override params are incomplete. You must set all ' + ALLOWED_LOTAME_PARAMS.length + ': ' + JSON.stringify(ALLOWED_LOTAME_PARAMS) + ', . Rejecting bid: ', bid);
-      return false;
-    }
     return true;
   },
 
@@ -119,8 +168,11 @@ export const spec = {
   },
 
   buildRequests(validBidRequests, bidderRequest) {
+    this.loadWhitelabelData(validBidRequests[0]);
     this.propertyBag.buildRequestsStart = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests time: ${this.propertyBag.buildRequestsStart} ozone v ${OZONEVERSION} validBidRequests`, validBidRequests, 'bidderRequest', bidderRequest);
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    utils.logInfo(`buildRequests time: ${this.propertyBag.buildRequestsStart} v ${OZONEVERSION} validBidRequests`, JSON.parse(JSON.stringify(validBidRequests)), 'bidderRequest', JSON.parse(JSON.stringify(bidderRequest)));
     // First check - is there any config to block this request?
     if (this.blockTheRequest()) {
       return [];
@@ -132,31 +184,25 @@ export const spec = {
       this.cookieSyncBag.publisherId = utils.deepAccess(validBidRequests[0], 'params.publisherId');
       htmlParams = validBidRequests[0].params;
     }
-    utils.logInfo('OZONE: cookie sync bag', this.cookieSyncBag);
-    let singleRequest = config.getConfig('ozone.singleRequest');
+    utils.logInfo('cookie sync bag', this.cookieSyncBag);
+    let singleRequest = this.getWhitelabelConfigItem('ozone.singleRequest');
     singleRequest = singleRequest !== false; // undefined & true will be true
-    utils.logInfo('OZONE: config ozone.singleRequest : ', singleRequest);
+    utils.logInfo(`config ${whitelabelBidder}.singleRequest : `, singleRequest);
     let ozoneRequest = {}; // we only want to set specific properties on this, not validBidRequests[0].params
     delete ozoneRequest.test; // don't allow test to be set in the config - ONLY use $_GET['pbjs_debug']
 
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      utils.logInfo('OZONE: ADDING GDPR info');
-      let apiVersion = utils.deepAccess(bidderRequest.gdprConsent, 'apiVersion', '1');
-      ozoneRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0, apiVersion: apiVersion}};
-      if (ozoneRequest.regs.ext.gdpr) {
-        ozoneRequest.user = ozoneRequest.user || {};
-        ozoneRequest.user.ext = {'consent': bidderRequest.gdprConsent.consentString};
-      } else {
-        utils.logInfo('OZONE: **** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
-      }
-    } else {
-      utils.logInfo('OZONE: WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object was present.');
+    // First party data module : look for ortb2 in setconfig & set the User object. NOTE THAT this should happen before we set the consentString
+    let fpd = config.getConfig('ortb2');
+    if (fpd && utils.deepAccess(fpd, 'user')) {
+      utils.logInfo('added FPD user object');
+      ozoneRequest.user = fpd.user;
     }
+
     const getParams = this.getGetParametersAsObject();
-    const ozTestMode = getParams.hasOwnProperty('oztestmode') ? getParams.oztestmode : null; // this can be any string, it's used for testing ads
+    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};
     let placementIdOverrideFromGetParam = this.getPlacementIdOverrideFromGetParam(); // null or string
-    let lotameDataSingle = {}; // we will capture lotame data once & send it to the server as ext.ozone.lotameData
     // build the array of params to attach to `imp`
     let tosendtags = validBidRequests.map(ozoneBidRequest => {
       var obj = {};
@@ -168,18 +214,18 @@ export const spec = {
       let arrBannerSizes = [];
       if (!ozoneBidRequest.hasOwnProperty('mediaTypes')) {
         if (ozoneBidRequest.hasOwnProperty('sizes')) {
-          utils.logInfo('OZONE: no mediaTypes detected - will use the sizes array in the config root');
+          utils.logInfo('no mediaTypes detected - will use the sizes array in the config root');
           arrBannerSizes = ozoneBidRequest.sizes;
         } else {
-          utils.logInfo('OZONE: no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
+          utils.logInfo('no mediaTypes detected, no sizes array in the config root either. Cannot set sizes for banner type');
         }
       } else {
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(BANNER)) {
           arrBannerSizes = ozoneBidRequest.mediaTypes[BANNER].sizes; /* Note - if there is a sizes element in the config root it will be pushed into here */
-          utils.logInfo('OZONE: setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
+          utils.logInfo('setting banner size from the mediaTypes.banner element for bidId ' + obj.id + ': ', arrBannerSizes);
         }
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(VIDEO)) {
-          utils.logInfo('OZONE: openrtb 2.5 compliant video');
+          utils.logInfo('openrtb 2.5 compliant video');
           // examine all the video attributes in the config, and either put them into obj.video if allowed by IAB2.5 or else in to obj.video.ext
           if (typeof ozoneBidRequest.mediaTypes[VIDEO] == 'object') {
             let childConfig = utils.deepAccess(ozoneBidRequest, 'params.video', {});
@@ -188,25 +234,33 @@ export const spec = {
           }
           // we need to duplicate some of the video values
           let wh = getWidthAndHeightFromVideoObject(obj.video);
-          utils.logInfo('OZONE: setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
+          utils.logInfo('setting video object from the mediaTypes.video element: ' + obj.id + ':', obj.video, 'wh=', wh);
           if (wh && typeof wh === 'object') {
             obj.video.w = wh['w'];
             obj.video.h = wh['h'];
             if (playerSizeIsNestedArray(obj.video)) { // this should never happen; it was in the original spec for this change though.
-              utils.logInfo('OZONE: setting obj.video.format to be an array of objects');
+              utils.logInfo('setting obj.video.format to be an array of objects');
               obj.video.ext.format = [wh];
             } else {
-              utils.logInfo('OZONE: setting obj.video.format to be an object');
+              utils.logInfo('setting obj.video.format to be an object');
               obj.video.ext.format = wh;
             }
           } else {
-            utils.logWarn('OZONE: cannot set w, h & format values for video; the config is not right');
+            utils.logWarn('cannot set w, h & format values for video; the config is not right');
           }
         }
         // Native integration is not complete yet
         if (ozoneBidRequest.mediaTypes.hasOwnProperty(NATIVE)) {
           obj.native = ozoneBidRequest.mediaTypes[NATIVE];
-          utils.logInfo('OZONE: setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+          utils.logInfo('setting native object from the mediaTypes.native element: ' + obj.id + ':', obj.native);
+        }
+        // is the publisher specifying floors, and is the floors module enabled?
+        if (ozoneBidRequest.hasOwnProperty('getFloor')) {
+          utils.logInfo('This bidRequest object has property: getFloor');
+          obj.floor = this.getFloorObjectForAuction(ozoneBidRequest);
+          utils.logInfo('obj.floor is : ', obj.floor);
+        } else {
+          utils.logInfo('This bidRequest object DOES NOT have property: getFloor');
         }
       }
       if (arrBannerSizes.length > 0) {
@@ -222,54 +276,78 @@ export const spec = {
       }
       // these 3 MUST exist - we check them in the validation method
       obj.placementId = placementId;
-      // build the imp['ext'] object
-      obj.ext = {'prebid': {'storedrequest': {'id': placementId}}, 'ozone': {}};
-      obj.ext.ozone.adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
-      obj.ext.ozone.transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
+      // build the imp['ext'] object - NOTE - Dont obliterate anything that' already in obj.ext
+      utils.deepSetValue(obj, 'ext.prebid', {'storedrequest': {'id': placementId}});
+      // obj.ext = {'prebid': {'storedrequest': {'id': placementId}}};
+      obj.ext[whitelabelBidder] = {};
+      obj.ext[whitelabelBidder].adUnitCode = ozoneBidRequest.adUnitCode; // eg. 'mpu'
+      obj.ext[whitelabelBidder].transactionId = ozoneBidRequest.transactionId; // this is the transactionId PER adUnit, common across bidders for this unit
       if (ozoneBidRequest.params.hasOwnProperty('customData')) {
-        obj.ext.ozone.customData = ozoneBidRequest.params.customData;
+        obj.ext[whitelabelBidder].customData = ozoneBidRequest.params.customData;
       }
-      utils.logInfo('OZONE: obj.ext.ozone is ', obj.ext.ozone);
-      if (ozTestMode != null) {
-        utils.logInfo('OZONE: setting ozTestMode to ', ozTestMode);
-        if (obj.ext.ozone.hasOwnProperty('customData')) {
-          for (let i = 0; i < obj.ext.ozone.customData.length; i++) {
-            obj.ext.ozone.customData[i]['targeting']['oztestmode'] = ozTestMode;
+      utils.logInfo(`obj.ext.${whitelabelBidder} is `, obj.ext[whitelabelBidder]);
+      if (isTestMode != null) {
+        utils.logInfo('setting isTestMode to ', isTestMode);
+        if (obj.ext[whitelabelBidder].hasOwnProperty('customData')) {
+          for (let i = 0; i < obj.ext[whitelabelBidder].customData.length; i++) {
+            obj.ext[whitelabelBidder].customData[i]['targeting'][wlOztestmodeKey] = isTestMode;
           }
         } else {
-          obj.ext.ozone.customData = [{'settings': {}, 'targeting': {'oztestmode': ozTestMode}}];
+          obj.ext[whitelabelBidder].customData = [{'settings': {}, 'targeting': {}}];
+          obj.ext[whitelabelBidder].customData[0].targeting[wlOztestmodeKey] = isTestMode;
         }
-      } else {
-        utils.logInfo('OZONE: no ozTestMode ');
       }
-      // now deal with lotame, including the optional override parameters
-      if (Object.keys(lotameDataSingle).length === 0) { // we've not yet found lotameData, see if we can get it from this bid request object
-        lotameDataSingle = this.tryGetLotameData(ozoneBidRequest);
+      if (fpd && utils.deepAccess(fpd, 'site')) {
+        // attach the site fpd into exactly : imp[n].ext.[whitelabel].customData.0.targeting
+        utils.logInfo('added FPD site object');
+        if (utils.deepAccess(obj, 'ext.' + whitelabelBidder + '.customData.0.targeting', false)) {
+          obj.ext[whitelabelBidder].customData[0].targeting = Object.assign(obj.ext[whitelabelBidder].customData[0].targeting, fpd.site);
+          // let keys = utils.getKeys(fpd.site);
+          // for (let i = 0; i < keys.length; i++) {
+          //   obj.ext[whitelabelBidder].customData[0].targeting[keys[i]] = fpd.site[keys[i]];
+          // }
+        } else {
+          utils.deepSetValue(obj, 'ext.' + whitelabelBidder + '.customData.0.targeting', fpd.site);
+        }
       }
       return obj;
     });
 
     // in v 2.0.0 we moved these outside of the individual ad slots
-    let extObj = {'ozone': {'oz_pb_v': OZONEVERSION, 'oz_rw': placementIdOverrideFromGetParam ? 1 : 0, 'oz_lot_rw': this.propertyBag.lotameWasOverridden}};
+    let extObj = {};
+    extObj[whitelabelBidder] = {};
+    extObj[whitelabelBidder][whitelabelPrefix + '_pb_v'] = OZONEVERSION;
+    extObj[whitelabelBidder][whitelabelPrefix + '_rw'] = placementIdOverrideFromGetParam ? 1 : 0;
     if (validBidRequests.length > 0) {
-      let userIds = this.findAllUserIds(validBidRequests[0]);
+      let userIds = this.cookieSyncBag.userIdObject; // 2021-01-06 - slight optimisation - we've already found this info
+      // let userIds = this.findAllUserIds(validBidRequests[0]);
       if (userIds.hasOwnProperty('pubcid')) {
-        extObj.ozone.pubcid = userIds.pubcid;
+        extObj[whitelabelBidder].pubcid = userIds.pubcid;
       }
     }
-    extObj.ozone.pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
-    extObj.ozone.lotameData = lotameDataSingle; // 2.4.0 moved lotameData out of bid objects into the single ext.ozone area to remove duplication
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
-    utils.logInfo('OZONE: oz_omp_floor dollar value = ', ozOmpFloorDollars);
+    extObj[whitelabelBidder].pv = this.getPageId(); // attach the page ID that will be common to all auciton calls for this page if refresh() is called
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    utils.logInfo(`${whitelabelPrefix}_omp_floor dollar value = `, ozOmpFloorDollars);
     if (typeof ozOmpFloorDollars === 'number') {
-      extObj.ozone.oz_omp_floor = ozOmpFloorDollars;
+      extObj[whitelabelBidder][whitelabelPrefix + '_omp_floor'] = ozOmpFloorDollars;
     } else if (typeof ozOmpFloorDollars !== 'undefined') {
-      utils.logError('OZONE: oz_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. oz_omp_floor: 1.55. You have it set as a ' + (typeof ozOmpFloorDollars));
+      utils.logError(`${whitelabelPrefix}_omp_floor is invalid - IF SET then this must be a number, representing dollar value eg. ${whitelabelPrefix}_omp_floor: 1.55. You have it set as a ` + (typeof ozOmpFloorDollars));
     }
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
-    extObj.ozone.oz_kvp_rw = useOzWhitelistAdserverKeys ? 1 : 0;
+    extObj[whitelabelBidder][whitelabelPrefix + '_kvp_rw'] = useOzWhitelistAdserverKeys ? 1 : 0;
+    if (whitelabelBidder != 'ozone') {
+      utils.logInfo('setting aliases object');
+      extObj.prebid = {aliases: {'ozone': whitelabelBidder}};
+    }
+    // 20210413 - adding a set of GET params to pass to auction
+    if (getParams.hasOwnProperty('ozf')) { extObj[whitelabelBidder]['ozf'] = getParams.ozf == 'true' || getParams.ozf == 1 ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozpf')) { extObj[whitelabelBidder]['ozpf'] = getParams.ozpf == 'true' || getParams.ozpf == 1 ? 1 : 0; }
+    if (getParams.hasOwnProperty('ozrp') && getParams.ozrp.match(/^[0-3]$/)) { extObj[whitelabelBidder]['ozrp'] = parseInt(getParams.ozrp); }
+    if (getParams.hasOwnProperty('ozip') && getParams.ozip.match(/^\d+$/)) { extObj[whitelabelBidder]['ozip'] = parseInt(getParams.ozip); }
+    if (this.propertyBag.endpointOverride != null) { extObj[whitelabelBidder]['origin'] = this.propertyBag.endpointOverride; }
 
+    // extObj.ortb2 = config.getConfig('ortb2'); // original test location
     var userExtEids = this.generateEids(validBidRequests); // generate the UserIDs in the correct format for UserId module
 
     ozoneRequest.site = {
@@ -277,7 +355,27 @@ export const spec = {
       'page': document.location.href,
       'id': htmlParams.siteId
     };
-    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] == 'true') ? 1 : 0;
+    ozoneRequest.test = (getParams.hasOwnProperty('pbjs_debug') && getParams['pbjs_debug'] === 'true') ? 1 : 0;
+
+    // this should come as late as possible so it overrides any user.ext.consent value
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.logInfo('ADDING GDPR info');
+      let apiVersion = utils.deepAccess(bidderRequest, 'gdprConsent.apiVersion', 1);
+      ozoneRequest.regs = {ext: {gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0, apiVersion: apiVersion}};
+      if (utils.deepAccess(ozoneRequest, 'regs.ext.gdpr')) {
+        utils.deepSetValue(ozoneRequest, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      } else {
+        utils.logInfo('**** Strange CMP info: bidderRequest.gdprConsent exists BUT bidderRequest.gdprConsent.gdprApplies is false. See bidderRequest logged above. ****');
+      }
+    } else {
+      utils.logInfo('WILL NOT ADD GDPR info; no bidderRequest.gdprConsent object');
+    }
+    if (bidderRequest && bidderRequest.uspConsent) {
+      utils.logInfo('ADDING CCPA info');
+      utils.deepSetValue(ozoneRequest, 'user.ext.uspConsent', bidderRequest.uspConsent);
+    } else {
+      utils.logInfo('WILL NOT ADD CCPA info; no bidderRequest.uspConsent.');
+    }
 
     // this is for 2.2.1
     // coppa compliance
@@ -287,7 +385,7 @@ export const spec = {
 
     // return the single request object OR the array:
     if (singleRequest) {
-      utils.logInfo('OZONE: buildRequests starting to generate response for a single request');
+      utils.logInfo('buildRequests starting to generate response for a single request');
       ozoneRequest.id = bidderRequest.auctionId; // Unique ID of the bid request, provided by the exchange.
       ozoneRequest.auctionId = bidderRequest.auctionId; // not sure if this should be here?
       ozoneRequest.imp = tosendtags;
@@ -296,38 +394,71 @@ export const spec = {
       utils.deepSetValue(ozoneRequest, 'user.ext.eids', userExtEids);
       var ret = {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequest),
         bidderRequest: bidderRequest
       };
-      utils.logInfo('OZONE: buildRequests ozoneRequest for single = ', ozoneRequest);
+      utils.logInfo('buildRequests request data for single = ', JSON.parse(JSON.stringify(ozoneRequest)));
       this.propertyBag.buildRequestsEnd = new Date().getTime();
-      utils.logInfo(`OZONE: buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
+      utils.logInfo(`buildRequests going to return for single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, ret);
       return ret;
     }
     // not single request - pull apart the tosendtags array & return an array of objects each containing one element in the imp array.
     let arrRet = tosendtags.map(imp => {
-      utils.logInfo('OZONE: buildRequests starting to generate non-single response, working on imp : ', imp);
+      utils.logInfo('buildRequests starting to generate non-single response, working on imp : ', imp);
       let ozoneRequestSingle = Object.assign({}, ozoneRequest);
-      imp.ext.ozone.pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
-      ozoneRequestSingle.id = imp.ext.ozone.transactionId; // Unique ID of the bid request, provided by the exchange.
-      ozoneRequestSingle.auctionId = imp.ext.ozone.transactionId; // not sure if this should be here?
+      imp.ext[whitelabelBidder].pageAuctionId = bidderRequest['auctionId']; // make a note in the ext object of what the original auctionId was, in the bidderRequest object
+      ozoneRequestSingle.id = imp.ext[whitelabelBidder].transactionId; // Unique ID of the bid request, provided by the exchange.
+      ozoneRequestSingle.auctionId = imp.ext[whitelabelBidder].transactionId; // not sure if this should be here?
       ozoneRequestSingle.imp = [imp];
       ozoneRequestSingle.ext = extObj;
-      ozoneRequestSingle.source = {'tid': imp.ext.ozone.transactionId};
+      ozoneRequestSingle.source = {'tid': imp.ext[whitelabelBidder].transactionId};
       utils.deepSetValue(ozoneRequestSingle, 'user.ext.eids', userExtEids);
-      utils.logInfo('OZONE: buildRequests ozoneRequestSingle (for non-single) = ', ozoneRequestSingle);
+      utils.logInfo('buildRequests RequestSingle (for non-single) = ', ozoneRequestSingle);
       return {
         method: 'POST',
-        url: OZONEURI,
+        url: this.getAuctionUrl(),
         data: JSON.stringify(ozoneRequestSingle),
         bidderRequest: bidderRequest
       };
     });
     this.propertyBag.buildRequestsEnd = new Date().getTime();
-    utils.logInfo(`OZONE: buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
+    utils.logInfo(`buildRequests going to return for non-single at time ${this.propertyBag.buildRequestsEnd} (took ${this.propertyBag.buildRequestsEnd - this.propertyBag.buildRequestsStart}ms): `, arrRet);
     return arrRet;
   },
+  /**
+   * parse a bidRequestRef that contains getFloor(), get all the data from it for the sizes & media requested for this bid & return an object containing floor data you can send to auciton endpoint
+   * @param bidRequestRef object = a valid bid request object reference
+   * @return object
+   *
+   * call:
+   * bidObj.getFloor({
+      currency: 'USD', <- currency to return the value in
+      mediaType: ‘banner’,
+      size: ‘*’ <- or [300,250] or [[300,250],[640,480]]
+   * });
+   *
+   */
+  getFloorObjectForAuction(bidRequestRef) {
+    const mediaTypesSizes = {
+      banner: utils.deepAccess(bidRequestRef, 'mediaTypes.banner.sizes', null),
+      video: utils.deepAccess(bidRequestRef, 'mediaTypes.video.playerSize', null),
+      native: utils.deepAccess(bidRequestRef, 'mediaTypes.native.image.sizes', null)
+    }
+    utils.logInfo('getFloorObjectForAuction mediaTypesSizes : ', mediaTypesSizes);
+    let ret = {};
+    if (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});
+    }
+    if (mediaTypesSizes.native) {
+      ret.native = bidRequestRef.getFloor({mediaType: 'native', currency: 'USD', size: mediaTypesSizes.native});
+    }
+    utils.logInfo('getFloorObjectForAuction returning : ', JSON.parse(JSON.stringify(ret)));
+    return ret;
+  },
   /**
    * Interpret the response if the array contains BIDDER elements, in the format: [ [bidder1 bid 1, bidder1 bid 2], [bidder2 bid 1, bidder2 bid 2] ]
    * NOte that in singleRequest mode this will be called once, else it will be called for each adSlot's response
@@ -339,9 +470,12 @@ export const spec = {
    * @returns {*}
    */
   interpretResponse(serverResponse, request) {
+    if (request && request.bidderRequest && request.bidderRequest.bids) { this.loadWhitelabelData(request.bidderRequest.bids[0]); }
     let startTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
-    utils.logInfo(`OZONE: serverResponse, request`, serverResponse, request);
+    let whitelabelBidder = this.propertyBag.whitelabel.bidder; // by default = ozone
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
+    utils.logInfo(`interpretResponse time: ${startTime} . Time between buildRequests done and interpretResponse start was ${startTime - this.propertyBag.buildRequestsEnd}ms`);
+    utils.logInfo(`serverResponse, request`, JSON.parse(JSON.stringify(serverResponse)), JSON.parse(JSON.stringify(request)));
     serverResponse = serverResponse.body || {};
     // note that serverResponse.id value is the auction_id we might want to use for reporting reasons.
     if (!serverResponse.hasOwnProperty('seatbid')) {
@@ -351,91 +485,102 @@ export const spec = {
       return [];
     }
     let arrAllBids = [];
-    let enhancedAdserverTargeting = config.getConfig('ozone.enhancedAdserverTargeting');
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    let enhancedAdserverTargeting = this.getWhitelabelConfigItem('ozone.enhancedAdserverTargeting');
+    utils.logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
     if (typeof enhancedAdserverTargeting == 'undefined') {
       enhancedAdserverTargeting = true;
     }
-    utils.logInfo('OZONE: enhancedAdserverTargeting', enhancedAdserverTargeting);
+    utils.logInfo('enhancedAdserverTargeting', enhancedAdserverTargeting);
+
+    // 2021-03-05 - comment this out for a build without adding adid to the response
     serverResponse.seatbid = injectAdIdsIntoAllBidResponses(serverResponse.seatbid); // we now make sure that each bid in the bidresponse has a unique (within page) adId attribute.
+
     serverResponse.seatbid = this.removeSingleBidderMultipleBids(serverResponse.seatbid);
-    let ozOmpFloorDollars = config.getConfig('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
+    let ozOmpFloorDollars = this.getWhitelabelConfigItem('ozone.oz_omp_floor'); // valid only if a dollar value (typeof == 'number')
     let addOzOmpFloorDollars = typeof ozOmpFloorDollars === 'number';
-    let ozWhitelistAdserverKeys = config.getConfig('ozone.oz_whitelist_adserver_keys');
+    let ozWhitelistAdserverKeys = this.getWhitelabelConfigItem('ozone.oz_whitelist_adserver_keys');
     let useOzWhitelistAdserverKeys = utils.isArray(ozWhitelistAdserverKeys) && ozWhitelistAdserverKeys.length > 0;
 
     for (let i = 0; i < serverResponse.seatbid.length; i++) {
       let sb = serverResponse.seatbid[i];
       for (let j = 0; j < sb.bid.length; j++) {
         let thisRequestBid = this.getBidRequestForBidId(sb.bid[j].impid, request.bidderRequest.bids);
-        utils.logInfo(`OZONE seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
+        utils.logInfo(`seatbid:${i}, bid:${j} Going to set default w h for seatbid/bidRequest`, sb.bid[j], thisRequestBid);
         const {defaultWidth, defaultHeight} = defaultSize(thisRequestBid);
         let thisBid = ozoneAddStandardProperties(sb.bid[j], defaultWidth, defaultHeight);
+        // prebid 4.0 compliance
+        thisBid.meta = {advertiserDomains: thisBid.adomain || []};
         let videoContext = null;
         let isVideo = false;
         let bidType = utils.deepAccess(thisBid, 'ext.prebid.type');
-        utils.logInfo(`OZONE: this bid type is : ${bidType}`, j);
+        utils.logInfo(`this bid type is : ${bidType}`, j);
         if (bidType === VIDEO) {
           isVideo = true;
           videoContext = this.getVideoContextForBidId(thisBid.bidId, request.bidderRequest.bids); // should be instream or outstream (or null if error)
           if (videoContext === 'outstream') {
-            utils.logInfo('OZONE: going to attach a renderer to OUTSTREAM video : ', j);
+            utils.logInfo('going to attach a renderer to OUTSTREAM video : ', j);
             thisBid.renderer = newRenderer(thisBid.bidId);
           } else {
-            utils.logInfo('OZONE: bid is not an outstream video, will not attach a renderer: ', j);
+            utils.logInfo('bid is not an outstream video, will not attach a renderer: ', j);
           }
         }
         let adserverTargeting = {};
         if (enhancedAdserverTargeting) {
           let allBidsForThisBidid = ozoneGetAllBidsForBidId(thisBid.bidId, serverResponse.seatbid);
           // add all the winning & non-winning bids for this bidId:
-          utils.logInfo('OZONE: Going to iterate allBidsForThisBidId', allBidsForThisBidid);
-          Object.keys(allBidsForThisBidid).forEach(function (bidderName, index, ar2) {
-            utils.logInfo(`OZONE: adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
+          utils.logInfo('Going to iterate allBidsForThisBidId', allBidsForThisBidid);
+          Object.keys(allBidsForThisBidid).forEach((bidderName, index, ar2) => {
+            utils.logInfo(`adding adserverTargeting for ${bidderName} for bidId ${thisBid.bidId}`);
             // let bidderName = bidderNameWH.split('_')[0];
-            adserverTargeting['oz_' + bidderName] = bidderName;
-            adserverTargeting['oz_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
-            adserverTargeting['oz_' + bidderName + '_adv'] = String(allBidsForThisBidid[bidderName].adomain);
-            adserverTargeting['oz_' + bidderName + '_adId'] = String(allBidsForThisBidid[bidderName].adId);
-            adserverTargeting['oz_' + bidderName + '_pb_r'] = getRoundedBid(allBidsForThisBidid[bidderName].price, allBidsForThisBidid[bidderName].ext.prebid.type);
+            adserverTargeting[whitelabelPrefix + '_' + bidderName] = bidderName;
+            adserverTargeting[whitelabelPrefix + '_' + bidderName + '_crid'] = String(allBidsForThisBidid[bidderName].crid);
+            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);
             if (allBidsForThisBidid[bidderName].hasOwnProperty('dealid')) {
-              adserverTargeting['oz_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_dealid'] = String(allBidsForThisBidid[bidderName].dealid);
             }
             if (addOzOmpFloorDollars) {
-              adserverTargeting['oz_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_omp'] = allBidsForThisBidid[bidderName].price >= ozOmpFloorDollars ? '1' : '0';
             }
             if (isVideo) {
-              adserverTargeting['oz_' + bidderName + '_vid'] = videoContext; // outstream or instream
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_vid'] = videoContext; // outstream or instream
             }
-            let flr = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.floor', null);
+            let flr = utils.deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.floor`, null);
             if (flr != null) {
-              adserverTargeting['oz_' + bidderName + '_flr'] = flr;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_flr'] = flr;
             }
-            let rid = utils.deepAccess(allBidsForThisBidid[bidderName], 'ext.bidder.ozone.ruleId', null);
+            let rid = utils.deepAccess(allBidsForThisBidid[bidderName], `ext.bidder.${whitelabelBidder}.ruleId`, null);
             if (rid != null) {
-              adserverTargeting['oz_' + bidderName + '_rid'] = rid;
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_rid'] = rid;
             }
             if (bidderName.match(/^ozappnexus/)) {
-              adserverTargeting['oz_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
+              adserverTargeting[whitelabelPrefix + '_' + bidderName + '_sid'] = String(allBidsForThisBidid[bidderName].cid);
             }
           });
         } else {
           if (useOzWhitelistAdserverKeys) {
-            utils.logWarn('OZONE: You have set a whitelist of adserver keys but this will be ignored because ozone.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.');
+            utils.logWarn(`You have set a whitelist of adserver keys but this will be ignored because ${whitelabelBidder}.enhancedAdserverTargeting is set to false. No per-bid keys will be sent to adserver.`);
           } else {
-            utils.logInfo('OZONE: ozone.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.');
+            utils.logInfo(`${whitelabelBidder}.enhancedAdserverTargeting is set to false, so no per-bid keys will be sent to adserver.`);
           }
         }
         // also add in the winning bid, to be sent to dfp
         let {seat: winningSeat, bid: winningBid} = ozoneGetWinnerForRequestBid(thisBid.bidId, serverResponse.seatbid);
-        adserverTargeting['oz_auc_id'] = String(request.bidderRequest.auctionId);
-        adserverTargeting['oz_winner'] = String(winningSeat);
+        adserverTargeting[whitelabelPrefix + '_auc_id'] = String(request.bidderRequest.auctionId);
+        adserverTargeting[whitelabelPrefix + '_winner'] = String(winningSeat);
+        adserverTargeting[whitelabelPrefix + '_bid'] = 'true';
+
         if (enhancedAdserverTargeting) {
-          adserverTargeting['oz_imp_id'] = String(winningBid.impid);
-          adserverTargeting['oz_pb_v'] = OZONEVERSION;
+          adserverTargeting[whitelabelPrefix + '_imp_id'] = String(winningBid.impid);
+          adserverTargeting[whitelabelPrefix + '_pb_v'] = OZONEVERSION;
+          adserverTargeting[whitelabelPrefix + '_pb'] = winningBid.price;
+          adserverTargeting[whitelabelPrefix + '_pb_r'] = getRoundedBid(winningBid.price, bidType);
+          adserverTargeting[whitelabelPrefix + '_adId'] = String(winningBid.adId);
+          adserverTargeting[whitelabelPrefix + '_size'] = `${winningBid.width}x${winningBid.height}`;
         }
         if (useOzWhitelistAdserverKeys) { // delete any un-whitelisted keys
-          utils.logInfo('OZONE: Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
+          utils.logInfo('Going to filter out adserver targeting keys not in the whitelist: ', ozWhitelistAdserverKeys);
           Object.keys(adserverTargeting).forEach(function(key) { if (ozWhitelistAdserverKeys.indexOf(key) === -1) { delete adserverTargeting[key]; } });
         }
         thisBid.adserverTargeting = adserverTargeting;
@@ -443,9 +588,22 @@ export const spec = {
       }
     }
     let endTime = new Date().getTime();
-    utils.logInfo(`OZONE: interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
+    utils.logInfo(`interpretResponse going to return at time ${endTime} (took ${endTime - startTime}ms) Time from buildRequests Start -> interpretRequests End = ${endTime - this.propertyBag.buildRequestsStart}ms`, arrAllBids);
     return arrAllBids;
   },
+  /**
+   * Use this to get all config values
+   * Now it's getting complicated with whitelabeling, this simplifies the code for getting config values.
+   * eg. to get ozone.oz_omp_floor you just send '_omp_floor'
+   * @param ozoneVersion string like 'ozone.oz_omp_floor'
+   * @return {string|object}
+   */
+  getWhitelabelConfigItem(ozoneVersion) {
+    if (this.propertyBag.whitelabel.bidder == 'ozone') { return config.getConfig(ozoneVersion); }
+    let whitelabelledSearch = ozoneVersion.replace('ozone', this.propertyBag.whitelabel.bidder);
+    whitelabelledSearch = ozoneVersion.replace('oz_', this.propertyBag.whitelabel.keyPrefix + '_');
+    return config.getConfig(whitelabelledSearch);
+  },
   /**
    * If a bidder bids for > 1 size for an adslot, allow only the highest bid
    * @param seatbid object (serverResponse.seatbid)
@@ -474,8 +632,9 @@ export const spec = {
     return ret;
   },
   // see http://prebid.org/dev-docs/bidder-adaptor.html#registering-user-syncs
-  getUserSyncs(optionsType, serverResponse, gdprConsent) {
-    utils.logInfo('OZONE: getUserSyncs optionsType, serverResponse, gdprConsent, cookieSyncBag', optionsType, serverResponse, gdprConsent, this.cookieSyncBag);
+  // us privacy: https://docs.prebid.org/dev-docs/modules/consentManagementUsp.html
+  getUserSyncs(optionsType, serverResponse, gdprConsent, usPrivacy) {
+    utils.logInfo('getUserSyncs optionsType', optionsType, 'serverResponse', serverResponse, 'gdprConsent', gdprConsent, 'usPrivacy', usPrivacy, 'cookieSyncBag', this.cookieSyncBag);
     if (!serverResponse || serverResponse.length === 0) {
       return [];
     }
@@ -486,23 +645,28 @@ export const spec = {
       }
       arrQueryString.push('gdpr=' + (utils.deepAccess(gdprConsent, 'gdprApplies', false) ? '1' : '0'));
       arrQueryString.push('gdpr_consent=' + utils.deepAccess(gdprConsent, 'consentString', ''));
-      var objKeys = Object.getOwnPropertyNames(this.cookieSyncBag.userIdObject);
-      for (let idx in objKeys) {
-        let keyname = objKeys[idx];
+      arrQueryString.push('usp_consent=' + (usPrivacy || ''));
+      // var objKeys = Object.getOwnPropertyNames(this.cookieSyncBag.userIdObject);
+      // for (let idx in objKeys) {
+      //   let keyname = objKeys[idx];
+      //   arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
+      // }
+      for (let keyname in this.cookieSyncBag.userIdObject) {
         arrQueryString.push(keyname + '=' + this.cookieSyncBag.userIdObject[keyname]);
       }
       arrQueryString.push('publisherId=' + this.cookieSyncBag.publisherId);
       arrQueryString.push('siteId=' + this.cookieSyncBag.siteId);
       arrQueryString.push('cb=' + Date.now());
+      arrQueryString.push('bidder=' + this.propertyBag.whitelabel.bidder);
 
       var strQueryString = arrQueryString.join('&');
       if (strQueryString.length > 0) {
         strQueryString = '?' + strQueryString;
       }
-      utils.logInfo('OZONE: getUserSyncs going to return cookie sync url : ' + OZONECOOKIESYNC + strQueryString);
+      utils.logInfo('getUserSyncs going to return cookie sync url : ' + this.getCookieSyncUrl() + strQueryString);
       return [{
         type: 'iframe',
-        url: OZONECOOKIESYNC + strQueryString
+        url: this.getCookieSyncUrl() + strQueryString
       }];
     }
   },
@@ -534,95 +698,59 @@ export const spec = {
     return null;
   },
   /**
+   * This is used for cookie sync, not auction call
    *  Look for pubcid & all the other IDs according to http://prebid.org/dev-docs/modules/userId.html
    *  @return map
    */
   findAllUserIds(bidRequest) {
     var ret = {};
-    let searchKeysSingle = ['pubcid', 'tdid', 'id5id', 'parrableid', 'idl_env', 'digitrustid', 'criteortus'];
+    // @todo - what is Neustar fabrick called & where to look for it? If it's a simple value then it will automatically be ok
+    // it is not in the table 'Bidder Adapter Implementation' on https://docs.prebid.org/dev-docs/modules/userId.html#prebidjs-adapters
+    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)) {
-          ret[key] = bidRequest.userId[key];
+          if (typeof (bidRequest.userId[key]) == 'string') {
+            ret[key] = bidRequest.userId[key];
+          } else if (typeof (bidRequest.userId[key]) == 'object') {
+            utils.logError(`WARNING: findAllUserIds had to use first key in user object to get value for bid.userId key: ${key}. Prebid adapter should be updated.`);
+            // fallback - get the value of the first key in the object; this is NOT desirable behaviour
+            ret[key] = bidRequest.userId[key][Object.keys(bidRequest.userId[key])[0]]; // cannot use Object.values
+          } else {
+            utils.logError(`failed to get string key value for userId : ${key}`);
+          }
         }
       }
-      var lipbid = utils.deepAccess(bidRequest.userId, 'lipb.lipbid');
+      let lipbid = utils.deepAccess(bidRequest.userId, 'lipb.lipbid');
       if (lipbid) {
         ret['lipb'] = {'lipbid': lipbid};
       }
+      let id5id = utils.deepAccess(bidRequest.userId, 'id5id.uid');
+      if (id5id) {
+        ret['id5id'] = id5id;
+      }
+      let parrableId = utils.deepAccess(bidRequest.userId, 'parrableId.eid');
+      if (parrableId) {
+        ret['parrableId'] = parrableId;
+      }
+      let sharedid = utils.deepAccess(bidRequest.userId, 'sharedid.id');
+      if (sharedid) {
+        ret['sharedid'] = sharedid;
+      }
+      let sharedidthird = utils.deepAccess(bidRequest.userId, 'sharedid.third');
+      if (sharedidthird) {
+        ret['sharedidthird'] = sharedidthird;
+      }
     }
     if (!ret.hasOwnProperty('pubcid')) {
-      var pubcid = utils.deepAccess(bidRequest, 'crumbs.pubcid');
+      let pubcid = utils.deepAccess(bidRequest, 'crumbs.pubcid');
       if (pubcid) {
         ret['pubcid'] = pubcid; // if built with old pubCommonId module
       }
     }
     return ret;
   },
-  /**
-   * get all the lotame override keys/values from the querystring.
-   * @return object containing zero or more keys/values
-   */
-  getLotameOverrideParams() {
-    const arrGet = this.getGetParametersAsObject();
-    utils.logInfo('OZONE: getLotameOverrideParams - arrGet=', arrGet);
-    let arrRet = {};
-    for (let i in ALLOWED_LOTAME_PARAMS) {
-      if (arrGet.hasOwnProperty(ALLOWED_LOTAME_PARAMS[i])) {
-        arrRet[ALLOWED_LOTAME_PARAMS[i]] = arrGet[ALLOWED_LOTAME_PARAMS[i]];
-      }
-    }
-    return arrRet;
-  },
-  /**
-   * Boolean function to check that this lotame data is valid (check Audience.id)
-   */
-  isLotameDataValid(lotameObj) {
-    if (!lotameObj.hasOwnProperty('Profile')) return false;
-    let prof = lotameObj.Profile;
-    if (!prof.hasOwnProperty('tpid')) return false;
-    if (!prof.hasOwnProperty('pid')) return false;
-    let audiences = utils.deepAccess(prof, 'Audiences.Audience');
-    if (typeof audiences != 'object') {
-      return false;
-    }
-    for (var i = 0; i < audiences.length; i++) {
-      let aud = audiences[i];
-      if (!aud.hasOwnProperty('id')) {
-        return false;
-      }
-    }
-    return true; // All Audiences objects have an 'id' key
-  },
-  /**
-   * Use the arrOverride keys/vals to update the arrExisting lotame object.
-   * Ideally we will only be using the oz_lotameid value to update the audiences id, but in the event of bad/missing
-   * pid & tpid we will also have to use substitute values for those too.
-   *
-   * @param objOverride object will contain all the ALLOWED_LOTAME_PARAMS parameters
-   * @param lotameData object might be {} or contain the lotame data
-   */
-  makeLotameObjectFromOverride(objOverride, lotameData) {
-    if ((lotameData.hasOwnProperty('Profile') && Object.keys(lotameData.Profile).length < 3) ||
-      (!lotameData.hasOwnProperty('Profile'))) { // bad or empty lotame object (should contain pid, tpid & Audiences object) - build a total replacement
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return a full default lotame object');
-      return {
-        'Profile': {
-          'tpid': objOverride['oz_lotametpid'],
-          'pid': objOverride['oz_lotamepid'],
-          'Audiences': {'Audience': [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}]}
-        }
-      };
-    }
-    if (utils.deepAccess(lotameData, 'Profile.Audiences.Audience')) {
-      utils.logInfo('OZONE: makeLotameObjectFromOverride will return the existing lotame object with updated Audience by oz_lotameid');
-      lotameData.Profile.Audiences.Audience = [{'id': objOverride['oz_lotameid'], 'abbr': objOverride['oz_lotameid']}];
-      return lotameData;
-    }
-    utils.logInfo('OZONE: makeLotameObjectFromOverride Weird error - failed to find Profile.Audiences.Audience in lotame object. Will return the object as-is');
-    return lotameData;
-  },
   /**
    * Convenient method to get the value we need for the placementId - ONLY from the bidRequest - NOT taking into account any GET override ID
    * @param bidRequest
@@ -638,48 +766,30 @@ export const spec = {
    * @returns null|string
    */
   getPlacementIdOverrideFromGetParam() {
+    let whitelabelPrefix = this.propertyBag.whitelabel.keyPrefix;
     let arr = this.getGetParametersAsObject();
-    if (arr.hasOwnProperty('ozstoredrequest')) {
-      if (this.isValidPlacementId(arr.ozstoredrequest)) {
-        utils.logInfo('OZONE: using GET ozstoredrequest ' + arr.ozstoredrequest + ' to replace placementId');
-        return arr.ozstoredrequest;
+    if (arr.hasOwnProperty(whitelabelPrefix + 'storedrequest')) {
+      if (this.isValidPlacementId(arr[whitelabelPrefix + 'storedrequest'])) {
+        utils.logInfo(`using GET ${whitelabelPrefix}storedrequest ` + arr[whitelabelPrefix + 'storedrequest'] + ' to replace placementId');
+        return arr[whitelabelPrefix + 'storedrequest'];
       } else {
-        utils.logError('OZONE: GET ozstoredrequest FAILED VALIDATION - will not use it');
+        utils.logError(`GET ${whitelabelPrefix}storedrequest FAILED VALIDATION - will not use it`);
       }
     }
     return null;
   },
-  /**
-   * Produces external userid object
-   */
-  addExternalUserId(eids, value, source, atype) {
-    if (utils.isStr(value)) {
-      eids.push({
-        source,
-        uids: [{
-          id: value,
-          atype
-        }]
-      });
-    }
-  },
   /**
    * Generate an object we can append to the auction request, containing user data formatted correctly for different ssps
+   * http://prebid.org/dev-docs/modules/userId.html
    * @param validBidRequests
    * @return {Array}
    */
   generateEids(validBidRequests) {
-    let eids = [];
-    this.handleTTDId(eids, validBidRequests);
+    let eids;
     const bidRequest = validBidRequests[0];
     if (bidRequest && bidRequest.userId) {
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcid', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.pubcid`), 'pubcommon', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.id5id`), 'id5-sync.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.criteortus.${BIDDER_CODE}.userid`), 'criteortus', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.idl_env`), 'liveramp.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.lipb.lipbid`), 'liveintent.com', 1);
-      this.addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.parrableid`), 'parrable.com', 1);
+      eids = bidRequest.userIdAsEids;
+      this.handleTTDId(eids, validBidRequests);
     }
     return eids;
   },
@@ -721,9 +831,9 @@ export const spec = {
    */
   blockTheRequest() {
     // if there is an ozone.oz_request = false then quit now.
-    let ozRequest = config.getConfig('ozone.oz_request');
+    let ozRequest = this.getWhitelabelConfigItem('ozone.oz_request');
     if (typeof ozRequest == 'boolean' && !ozRequest) {
-      utils.logWarn('OZONE: Will not allow auction : ozone.oz_request is set to false');
+      utils.logWarn(`Will not allow auction : ${this.propertyBag.whitelabel.keyPrefix}one.${this.propertyBag.whitelabel.keyPrefix}_request is set to false`);
       return true;
     }
     return false;
@@ -743,34 +853,6 @@ export const spec = {
     }
     return this.propertyBag.pageId;
   },
-  /**
-   * handle the complexity of there possibly being lotameData override (may be valid/invalid) & there may or may not be lotameData present in the bidRequest
-   * NOTE THAT this will also set this.propertyBag.lotameWasOverridden=1 if we use lotame override
-   * @param ozoneBidRequest
-   * @return object representing the absolute lotameData we need to use.
-   */
-  tryGetLotameData: function(ozoneBidRequest) {
-    const arrLotameOverride = this.getLotameOverrideParams();
-    let ret = {};
-    if (Object.keys(arrLotameOverride).length === ALLOWED_LOTAME_PARAMS.length) {
-      // all override params are present, override lotame object:
-      if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, ozoneBidRequest.params.lotameData);
-      } else {
-        ret = this.makeLotameObjectFromOverride(arrLotameOverride, {});
-      }
-      this.propertyBag.lotameWasOverridden = 1;
-    } else if (ozoneBidRequest.params.hasOwnProperty('lotameData')) {
-      // no lotame override, use it as-is
-      if (this.isLotameDataValid(ozoneBidRequest.params.lotameData)) {
-        ret = ozoneBidRequest.params.lotameData;
-      } else {
-        utils.logError('OZONE: INVALID LOTAME DATA FOUND - WILL NOT USE THIS AT ALL ELSE IT MIGHT BREAK THE AUCTION CALL!', ozoneBidRequest.params.lotameData);
-        ret = {};
-      }
-    }
-    return ret;
-  },
   unpackVideoConfigIntoIABformat(videoConfig, childConfig) {
     let ret = {'ext': {}};
     ret = this._unpackVideoConfigIntoIABformat(ret, videoConfig);
@@ -849,13 +931,13 @@ export const spec = {
  * @returns seatbid object
  */
 export function injectAdIdsIntoAllBidResponses(seatbid) {
-  utils.logInfo('OZONE: injectAdIdsIntoAllBidResponses', seatbid);
+  utils.logInfo('injectAdIdsIntoAllBidResponses', seatbid);
   for (let i = 0; i < seatbid.length; i++) {
     let sb = seatbid[i];
     for (let j = 0; j < sb.bid.length; j++) {
       // modify the bidId per-bid, so each bid has a unique adId within this response, and dfp can select one.
       // 2020-06 we now need a second level of ID because there might be multiple identical impid's within a seatbid!
-      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-${j}`;
+      sb.bid[j]['adId'] = `${sb.bid[j]['impid']}-${i}-${spec.propertyBag.whitelabel.keyPrefix}-${j}`;
     }
   }
   return seatbid;
@@ -875,7 +957,7 @@ export function checkDeepArray(Arr) {
 
 export function defaultSize(thebidObj) {
   if (!thebidObj) {
-    utils.logInfo('OZONE: defaultSize received empty bid obj! going to return fixed default size');
+    utils.logInfo('defaultSize received empty bid obj! going to return fixed default size');
     return {
       'defaultHeight': 250,
       'defaultWidth': 300
@@ -928,7 +1010,7 @@ export function ozoneGetAllBidsForBidId(matchBidId, serverResponseSeatBid) {
     for (let k = 0; k < theseBids.length; k++) {
       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
-        //   objBids[`${thisSeat}${theseBids[k].w}x${theseBids[k].h}`] = theseBids[k];
+          //   objBids[`${thisSeat}${theseBids[k].w}x${theseBids[k].h}`] = theseBids[k];
           if (objBids[thisSeat]['price'] < theseBids[k].price) {
             objBids[thisSeat] = theseBids[k];
           }
@@ -953,14 +1035,14 @@ export function getRoundedBid(price, mediaType) {
   let theConfigObject = getGranularityObject(mediaType, mediaTypeGranularity, strBuckets, objBuckets);
   let theConfigKey = getGranularityKeyName(mediaType, mediaTypeGranularity, strBuckets);
 
-  utils.logInfo('OZONE: getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
+  utils.logInfo('getRoundedBid. price:', price, 'mediaType:', mediaType, 'configkey:', theConfigKey, 'configObject:', theConfigObject, 'mediaTypeGranularity:', mediaTypeGranularity, 'strBuckets:', strBuckets);
 
   let priceStringsObj = getPriceBucketString(
     price,
     theConfigObject,
     config.getConfig('currency.granularityMultiplier')
   );
-  utils.logInfo('OZONE: priceStringsObj', priceStringsObj);
+  utils.logInfo('priceStringsObj', priceStringsObj);
   // by default, without any custom granularity set, you get granularity name : 'medium'
   let granularityNamePriceStringsKeyMapping = {
     'medium': 'med',
@@ -971,7 +1053,7 @@ export function getRoundedBid(price, mediaType) {
   };
   if (granularityNamePriceStringsKeyMapping.hasOwnProperty(theConfigKey)) {
     let priceStringsKey = granularityNamePriceStringsKeyMapping[theConfigKey];
-    utils.logInfo('OZONE: getRoundedBid: looking for priceStringsKey:', priceStringsKey);
+    utils.logInfo('getRoundedBid: looking for priceStringsKey:', priceStringsKey);
     return priceStringsObj[priceStringsKey];
   }
   return priceStringsObj['auto'];
@@ -1040,15 +1122,15 @@ export function getWidthAndHeightFromVideoObject(objVideo) {
     return null;
   }
   if (playerSize[0] && typeof playerSize[0] === 'object') {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
+    utils.logInfo('getWidthAndHeightFromVideoObject found nested array inside playerSize.', playerSize[0]);
     playerSize = playerSize[0];
     if (typeof playerSize[0] !== 'number' && typeof playerSize[0] !== 'string') {
-      utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
+      utils.logInfo('getWidthAndHeightFromVideoObject found non-number/string type inside the INNER array in playerSize. This is totally wrong - cannot continue.', playerSize[0]);
       return null;
     }
   }
   if (playerSize.length !== 2) {
-    utils.logInfo('OZONE: getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
+    utils.logInfo('getWidthAndHeightFromVideoObject found playerSize with length of ' + playerSize.length + '. This is totally wrong - cannot continue.');
     return null;
   }
   return ({'w': playerSize[0], 'h': playerSize[1]});
@@ -1075,17 +1157,17 @@ export function playerSizeIsNestedArray(objVideo) {
  * @returns {*}
  */
 function getPlayerSizeFromObject(objVideo) {
-  utils.logInfo('OZONE: getPlayerSizeFromObject received object', objVideo);
+  utils.logInfo('getPlayerSizeFromObject received object', objVideo);
   let playerSize = utils.deepAccess(objVideo, 'playerSize');
   if (!playerSize) {
     playerSize = utils.deepAccess(objVideo, 'ext.playerSize');
   }
   if (!playerSize) {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
+    utils.logError('getPlayerSizeFromObject FAILED: no playerSize in video object or ext', objVideo);
     return null;
   }
   if (typeof playerSize !== 'object') {
-    utils.logError('OZONE: getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
+    utils.logError('getPlayerSizeFromObject FAILED: playerSize is not an object/array', objVideo);
     return null;
   }
   return playerSize;
@@ -1095,21 +1177,23 @@ function getPlayerSizeFromObject(objVideo) {
   The renderer function will not assume that the renderer script is loaded - it will push() the ultimate render function call
  */
 function newRenderer(adUnitCode, rendererOptions = {}) {
+  let isLoaded = window.ozoneVideo;
+  utils.logInfo(`newRenderer going to set loaded to ${isLoaded ? 'true' : 'false'}`);
   const renderer = Renderer.install({
-    url: OZONE_RENDERER_URL,
+    url: spec.getRendererUrl(),
     config: rendererOptions,
-    loaded: false,
+    loaded: isLoaded,
     adUnitCode
   });
   try {
     renderer.setRender(outstreamRender);
   } catch (err) {
-    utils.logWarn('OZONE Prebid Error calling setRender on renderer', err);
+    utils.logError('Prebid Error when calling setRender on renderer', JSON.parse(JSON.stringify(renderer)), err);
   }
   return renderer;
 }
 function outstreamRender(bid) {
-  utils.logInfo('OZONE: outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', bid);
+  utils.logInfo('outstreamRender called. Going to push the call to window.ozoneVideo.outstreamRender(bid) bid =', JSON.parse(JSON.stringify(bid)));
   // push to render queue because ozoneVideo may not be loaded yet
   bid.renderer.push(() => {
     window.ozoneVideo.outstreamRender(bid);
@@ -1117,4 +1201,4 @@ function outstreamRender(bid) {
 }
 
 registerBidder(spec);
-utils.logInfo('OZONE: ozoneBidAdapter was loaded');
+utils.logInfo(`*BidAdapter ${OZONEVERSION} was loaded`);
diff --git a/modules/ozoneBidAdapter.md b/modules/ozoneBidAdapter.md
index bc8cb6a6102..ca18c962219 100644
--- a/modules/ozoneBidAdapter.md
+++ b/modules/ozoneBidAdapter.md
@@ -37,7 +37,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
                             placementId: '0420420421', /* an ID used to identify the piece of inventory - required - for appnexus test use 13144370. */
 							customData: [{"settings": {}, "targeting": {"key": "value", "key2": ["value1", "value2"]}}],/* optional array with 'targeting' placeholder for passing publisher specific key-values for targeting. */                            
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
                         }
                     }]
                 }];
@@ -52,7 +51,7 @@ adUnits = [{
                     code: 'id-of-your-video-div',
                     mediaTypes: {
                         video: {
-                            playerSize: [640, 480],
+                            playerSize: [640, 360],
                             mimes: ['video/mp4'],
                             context: 'outstream',
                         }
@@ -64,7 +63,6 @@ adUnits = [{
                             siteId: '4204204201', /* An ID used to identify a site within a publisher account - required */
 							customData: [{"settings": {}, "targeting": { "key": "value", "key2": ["value1", "value2"]}}]
                             placementId: '0440440442', /* an ID used to identify the piece of inventory - required - for unruly test use 0440440442. */
-                            lotameData: {"Profile": {"tpid":"value","pid":"value","Audiences": {"Audience":[{"id":"value"},{"id":"value2"}]}}}, /* optional JSON placeholder for passing Lotame DMP data */
 							video: {
                                 skippable: true, /* optional */
                                 playback_method: ['auto_play_sound_off'], /* optional */
diff --git a/modules/parrableIdSystem.js b/modules/parrableIdSystem.js
index ec033e62983..36ac7070ec1 100644
--- a/modules/parrableIdSystem.js
+++ b/modules/parrableIdSystem.js
@@ -6,6 +6,7 @@
  */
 
 import * as utils from '../src/utils.js'
+import find from 'core-js-pure/features/array/find.js';
 import { ajax } from '../src/ajax.js';
 import { submodule } from '../src/hook.js';
 import { getRefererInfo } from '../src/refererDetection.js';
@@ -14,12 +15,13 @@ import { getStorageManager } from '../src/storageManager.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 storage = getStorageManager();
+const storage = getStorageManager(PARRABLE_GVLID);
 
 function getExpirationDate() {
   const oneYearFromNow = new Date(utils.timestamp() + ONE_YEAR_MS);
@@ -32,25 +34,36 @@ function deserializeParrableId(parrableIdStr) {
 
   values.forEach(function(value) {
     const pair = value.split(':');
-    // unpack a value of 1 as true
-    parrableId[pair[0]] = +pair[1] === 1 ? true : pair[1];
+    if (+pair[1] === 1 || (pair[1] !== null && +pair[1] === 0)) { // 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(parrableId) {
+function serializeParrableId(parrableIdAndParams) {
   let components = [];
 
-  if (parrableId.eid) {
-    components.push('eid:' + parrableId.eid);
+  if (parrableIdAndParams.eid) {
+    components.push('eid:' + parrableIdAndParams.eid);
   }
-  if (parrableId.ibaOptout) {
+  if (parrableIdAndParams.ibaOptout) {
     components.push('ibaOptout:1');
   }
-  if (parrableId.ccpaOptout) {
+  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);
+  }
 
   return components.join(',');
 }
@@ -60,7 +73,7 @@ function isValidConfig(configParams) {
     utils.logError('User ID - parrableId submodule requires configParams');
     return false;
   }
-  if (!configParams.partner) {
+  if (!configParams.partners && !configParams.partner) {
     utils.logError('User ID - parrableId submodule requires partner list');
     return false;
   }
@@ -70,17 +83,33 @@ function isValidConfig(configParams) {
   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) {
-    return deserializeParrableId(decodeURIComponent(parrableIdStr));
+    const parsedCookie = deserializeParrableId(decodeURIComponent(parrableIdStr));
+    const { tpc, tpcUntil, ...parrableId } = parsedCookie;
+    let { eid, ibaOptout, ccpaOptout, ...params } = parsedCookie;
+
+    if ((Date.now() / 1000) >= tpcUntil) {
+      params.tpc = undefined;
+    }
+    return { parrableId, params };
   }
   return null;
 }
 
-function writeCookie(parrableId) {
-  if (parrableId) {
-    const parrableIdStr = encodeURIComponent(serializeParrableId(parrableId));
+function writeCookie(parrableIdAndParams) {
+  if (parrableIdAndParams) {
+    const parrableIdStr = encodeURIComponent(serializeParrableId(parrableIdAndParams));
     storage.setCookie(PARRABLE_COOKIE_NAME, parrableIdStr, getExpirationDate(), 'lax');
   }
 }
@@ -113,27 +142,97 @@ function migrateLegacyCookies(parrableId) {
   }
 }
 
-function fetchId(configParams) {
+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 (utils.isEmpty(config.allowedZones) &&
+      utils.isEmpty(config.allowedOffsets)) {
+      return true;
+    }
+    if (isZoneListed(config.allowedZones, zone)) {
+      return true;
+    }
+    if (utils.contains(config.allowedOffsets, offset)) {
+      return true;
+    }
+    return false;
+  }
+
+  function isBlocked() {
+    if (utils.isEmpty(config.blockedZones) &&
+      utils.isEmpty(config.blockedOffsets)) {
+      return false;
+    }
+    if (isZoneListed(config.blockedZones, zone)) {
+      return true;
+    }
+    if (utils.contains(config.blockedOffsets, offset)) {
+      return true;
+    }
+    return false;
+  }
+
+  return isBlocked() || !isAllowed();
+}
+
+function epochFromTtl(ttl) {
+  return Math.floor((Date.now() / 1000) + ttl);
+}
+
+function fetchId(configParams, gdprConsentData) {
   if (!isValidConfig(configParams)) return;
 
-  let parrableId = readCookie();
+  let { parrableId, params } = readCookie() || {};
   if (!parrableId) {
     parrableId = readLegacyCookies();
     migrateLegacyCookies(parrableId);
   }
 
-  const eid = (parrableId) ? parrableId.eid : null;
+  if (shouldFilterImpression(configParams, parrableId)) {
+    return null;
+  }
+
+  const eid = parrableId ? parrableId.eid : null;
   const refererInfo = getRefererInfo();
+  const tpcSupport = params ? params.tpc : 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: configParams.partner.split(','),
-    url: refererInfo.referer
+    trackers,
+    url: refererInfo.referer,
+    prebidVersion: '$prebid.version$',
+    isIframe: utils.inIframe(),
+    tpcSupport
   };
 
   const searchParams = {
-    data: btoa(JSON.stringify(data)),
+    data: encodeBase64UrlSafe(btoa(JSON.stringify(data))),
+    gdpr: gdprApplies ? 1 : 0,
     _rand: Math.random()
   };
 
@@ -141,6 +240,10 @@ function fetchId(configParams) {
     searchParams.us_privacy = uspString;
   }
 
+  if (gdprApplies) {
+    searchParams.gdpr_consent = gdprConsentString;
+  }
+
   const options = {
     method: 'GET',
     withCredentials: true
@@ -150,6 +253,7 @@ function fetchId(configParams) {
     const callbacks = {
       success: response => {
         let newParrableId = parrableId ? utils.deepClone(parrableId) : {};
+        let newParams = {};
         if (response) {
           try {
             let responseObj = JSON.parse(response);
@@ -163,12 +267,16 @@ function fetchId(configParams) {
               if (responseObj.ibaOptout === true) {
                 newParrableId.ibaOptout = true;
               }
+              if (responseObj.tpcSupport !== undefined) {
+                newParams.tpcSupport = responseObj.tpcSupport;
+                newParams.tpcUntil = epochFromTtl(responseObj.tpcSupportTtl);
+              }
             }
           } catch (error) {
             utils.logError(error);
             cb();
           }
-          writeCookie(newParrableId);
+          writeCookie({ ...newParrableId, ...newParams });
           cb(newParrableId);
         } else {
           utils.logError('parrableId: ID fetch returned an empty result');
@@ -187,7 +295,7 @@ function fetchId(configParams) {
     callback,
     id: parrableId
   };
-};
+}
 
 /** @type {Submodule} */
 export const parrableIdSubmodule = {
@@ -196,6 +304,12 @@ export const parrableIdSubmodule = {
    * @type {string}
    */
   name: 'parrableId',
+  /**
+   * Global Vendor List ID
+   * @type {number}
+   */
+  gvlid: PARRABLE_GVLID,
+
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -204,7 +318,7 @@ export const parrableIdSubmodule = {
    */
   decode(parrableId) {
     if (parrableId && utils.isPlainObject(parrableId)) {
-      return { 'parrableid': parrableId.eid };
+      return { parrableId };
     }
     return undefined;
   },
@@ -212,12 +326,13 @@ export const parrableIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @param {ConsentData} [consentData]
    * @returns {function(callback:function), id:ParrableId}
    */
-  getId(configParams, gdprConsentData, currentStoredId) {
-    return fetchId(configParams);
+  getId(config, gdprConsentData, currentStoredId) {
+    const configParams = (config && config.params) || {};
+    return fetchId(configParams, gdprConsentData);
   }
 };
 
diff --git a/modules/performaxBidAdapter.js b/modules/performaxBidAdapter.js
new file mode 100644
index 00000000000..8e22a0b2da9
--- /dev/null
+++ b/modules/performaxBidAdapter.js
@@ -0,0 +1,56 @@
+import {logWarn} from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+
+const CLIENT = 'hellboy:v0.0.1'
+const BIDDER_CODE = 'performax';
+const BIDDER_SHORT_CODE = 'px';
+const ENDPOINT = 'https://dale.performax.cz/hb';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: [BIDDER_SHORT_CODE],
+
+  isBidRequestValid: function (bid) {
+    return !!bid.params.slotId;
+  },
+
+  buildUrl: function (validBidRequests, bidderRequest) {
+    const slotIds = validBidRequests.map(request => request.params.slotId);
+    let url = [`${ENDPOINT}?slotId[]=${slotIds.join()}`];
+    url.push('client=' + CLIENT);
+    url.push('auctionId=' + bidderRequest.auctionId);
+    return url.join('&');
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return {
+      method: 'POST',
+      url: this.buildUrl(validBidRequests, bidderRequest),
+      data: {'validBidRequests': validBidRequests, 'bidderRequest': bidderRequest},
+      options: {contentType: 'application/json'},
+    }
+  },
+
+  buildHtml: function (ad) {
+    const keys = Object.keys(ad.data || {});
+    return ad.code.replace(
+      new RegExp('\\$(' + keys.join('|') + ')\\$', 'g'),
+      (matched, key) => ad.data[key] || matched
+    );
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    let bidResponses = [];
+    for (let i = 0; i < serverResponse.body.length; i++) {
+      const ad = serverResponse.body[i].ad;
+      if (ad.type === 'empty') {
+        logWarn(`One of ads is empty (reason=${ad.reason})`);
+        continue;
+      }
+      serverResponse.body[i].ad = this.buildHtml(ad);
+      bidResponses.push(serverResponse.body[i]);
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec);
diff --git a/modules/performaxBidAdapter.md b/modules/performaxBidAdapter.md
new file mode 100644
index 00000000000..4cf2984a79d
--- /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',
+            sizes: [[300, 300]],
+            bids: [
+                {
+                    bidder: "performax",
+                    params: {
+                        slotId: 28   // required
+                    }
+                }
+            ]
+        }
+    ];
+```
+
+Where:
+* slotId - id of slot in PX system
diff --git a/modules/permutiveRtdProvider.js b/modules/permutiveRtdProvider.js
new file mode 100644
index 00000000000..91e88d3e4e1
--- /dev/null
+++ b/modules/permutiveRtdProvider.js
@@ -0,0 +1,189 @@
+/**
+ * This module adds permutive provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will add custom segment targeting to ad units of specific bidders
+ * @module modules/permutiveRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import { getGlobal } from '../src/prebidGlobal.js'
+import { submodule } from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js'
+import { deepSetValue, deepAccess, isFn, mergeDeep, logError } from '../src/utils.js'
+import includes from 'core-js-pure/features/array/includes.js'
+const MODULE_NAME = 'permutive'
+
+export const storage = getStorageManager(null, MODULE_NAME)
+
+function init (config, userConsent) {
+  return true
+}
+
+/**
+* Set segment targeting from cache and then try to wait for Permutive
+* to initialise to get realtime segment targeting
+*/
+export function initSegments (reqBidsConfigObj, callback, customConfig) {
+  const permutiveOnPage = isPermutiveOnPage()
+  const config = mergeDeep({
+    waitForIt: false,
+    params: {
+      maxSegs: 500,
+      acBidders: [],
+      overwrites: {}
+    }
+  }, customConfig)
+
+  setSegments(reqBidsConfigObj, config)
+
+  if (config.waitForIt && permutiveOnPage) {
+    window.permutive.ready(function () {
+      setSegments(reqBidsConfigObj, config)
+      callback()
+    }, 'realtime')
+  } else {
+    callback()
+  }
+}
+
+function setSegments (reqBidsConfigObj, config) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits
+  const data = getSegments(config.params.maxSegs)
+  const utils = { deepSetValue, deepAccess, isFn, mergeDeep }
+
+  adUnits.forEach(adUnit => {
+    adUnit.bids.forEach(bid => {
+      const { bidder } = bid
+      const acEnabled = isAcEnabled(config, bidder)
+      const customFn = getCustomBidderFn(config, bidder)
+      const defaultFn = getDefaultBidderFn(bidder)
+
+      if (customFn) {
+        customFn(bid, data, acEnabled, utils, defaultFn)
+      } else if (defaultFn) {
+        defaultFn(bid, data, acEnabled)
+      }
+    })
+  })
+}
+
+function makeSafe (fn) {
+  try {
+    fn()
+  } catch (e) {
+    logError(e)
+  }
+}
+
+function getCustomBidderFn (config, bidder) {
+  const overwriteFn = deepAccess(config, `params.overwrites.${bidder}`)
+
+  if (overwriteFn && isFn(overwriteFn)) {
+    return overwriteFn
+  } else {
+    return null
+  }
+}
+
+/**
+* Returns a function that receives a `bid` object, a `data` object and a `acEnabled` boolean
+* and which will set the right segment targeting keys for `bid` based on `data` and `acEnabled`
+* @param {string} bidder
+* @param {object} data
+*/
+function getDefaultBidderFn (bidder) {
+  const bidderMapper = {
+    appnexus: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.keywords.p_standard', data.ac)
+      }
+      if (data.appnexus && data.appnexus.length) {
+        deepSetValue(bid, 'params.keywords.permutive', data.appnexus)
+      }
+
+      return bid
+    },
+    rubicon: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.visitor.p_standard', data.ac)
+      }
+      if (data.rubicon && data.rubicon.length) {
+        deepSetValue(bid, 'params.visitor.permutive', data.rubicon)
+      }
+
+      return bid
+    },
+    ozone: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.customData.0.targeting.p_standard', data.ac)
+      }
+
+      return bid
+    },
+    trustx: function (bid, data, acEnabled) {
+      if (acEnabled && data.ac && data.ac.length) {
+        deepSetValue(bid, 'params.keywords.p_standard', data.ac)
+      }
+
+      return bid
+    }
+  }
+
+  return bidderMapper[bidder]
+}
+
+export function isAcEnabled (config, bidder) {
+  const acBidders = deepAccess(config, 'params.acBidders') || []
+  return includes(acBidders, bidder)
+}
+
+export function isPermutiveOnPage () {
+  return typeof window.permutive !== 'undefined' && typeof window.permutive.ready === 'function'
+}
+
+/**
+* Returns all relevant segment IDs in an 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')
+
+  const segments = {
+    ac: [..._pcrprs, ..._ppam, ...legacySegs],
+    rubicon: readSegments('_prubicons'),
+    appnexus: readSegments('_papns'),
+    gam: readSegments('_pdfps')
+  }
+
+  for (const type in segments) {
+    segments[type] = segments[type].slice(0, maxSegs)
+  }
+
+  return segments
+}
+
+/**
+ * Gets an array of segment IDs from LocalStorage
+ * or returns an empty array
+ * @param {string} key
+ */
+function readSegments (key) {
+  try {
+    return JSON.parse(storage.getDataFromLocalStorage(key) || '[]')
+  } catch (e) {
+    return []
+  }
+}
+
+/** @type {RtdSubmodule} */
+export const permutiveSubmodule = {
+  name: MODULE_NAME,
+  getBidRequestData: function (reqBidsConfigObj, callback, customConfig) {
+    makeSafe(function () {
+      initSegments(reqBidsConfigObj, callback, customConfig)
+    })
+  },
+  init: init
+}
+
+submodule('realTimeData', permutiveSubmodule)
diff --git a/modules/permutiveRtdProvider.md b/modules/permutiveRtdProvider.md
new file mode 100644
index 00000000000..39f9a2aaaa5
--- /dev/null
+++ b/modules/permutiveRtdProvider.md
@@ -0,0 +1,103 @@
+# Permutive Real-time Data Submodule
+This submodule reads segments from Permutive and attaches them as targeting keys to bid requests. Using this module will deliver best targeting results, leveraging Permutive's real-time segmentation and modelling capabilities.
+
+## Usage
+Compile the Permutive RTD module into your Prebid build:
+```
+gulp build --modules=rtdModule,permutiveRtdProvider
+```
+
+> Note that the global RTD module, `rtdModule`, is a prerequisite of the Permutive RTD module.
+
+You then need to enable the Permutive RTD in your Prebid configuration, using the below format:
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 50, // optional auction delay
+    dataProviders: [{
+      name: 'permutive',
+      waitForIt: true, // should be true if there's an `auctionDelay`
+      params: {
+        acBidders: ['appnexus']
+      }
+    }]
+  },
+  ...
+})
+```
+
+## Supported Bidders
+The below bidders are currently support by the Permutive RTD module. Please reach out to your Permutive Account Manager to request support for any additional bidders.
+
+| Bidder      | ID         | Custom First-Party Segments | Audience Connector ("acBidders") |
+| ----------- | ---------- | -------------------- | ------------------ |
+| Xandr       | `appnexus` | Yes                  | Yes                |
+| Magnite     | `rubicon`  | Yes                  | No                |
+| Ozone       | `ozone`    | No                   | Yes                |
+| TrustX      | `trustx`   | No                   | Yes                |
+
+* **First-party segments:** When enabling the respective Activation for a segment in Permutive, this module will automatically attach that segment to the bid request. There is no need to enable individual bidders in the module configuration, it will automatically reflect which SSP integrations you have enabled in Permutive. Permutive segments will be sent in the `permutive` key-value.
+
+* **Audience Connector:** You'll need to define which bidder should receive Audience Connector segments. You need to include the `ID` of any bidder in the `acBidders` array. Audience Connector segments will be sent in the `p_standard` key-value. The segments produced by Audience Connector are not supported for PMPs at this time.
+
+
+## Parameters
+| Name              | Type                 | Description        | Default        |
+| ----------------- | -------------------- | ------------------ | ------------------ |
+| name              | String               | This should always be `permutive` | - |
+| waitForIt         | Boolean              | Should be `true` if there's an `auctionDelay` defined (optional) | `false` |
+| params            | Object               |                 | - |
+| params.acBidders  | String[]             | An array of bidders which should receive AC segments. Pleasee see `Supported Bidders` for bidder support and possible values. | `[]` |
+| params.maxSegs    | Integer              | Maximum number of segments to be included in either the `permutive` or `p_standard` key-value. | `500` |
+| params.overwrites | Object               | See `Custom Bidder Setup` for details on how to define custom bidder functions.      | `{}` |
+
+
+## Custom Bidder Setup
+You can overwrite the default bidder function, for example to include a different set of segments or to support additional bidders. The below example modifies what first-party segments Magnite receives (segments from `gam` instead of `rubicon`). As best practise we recommend to first call `defaultFn` and then only overwrite specific key-values. The below example only overwrites `permutive` while `p_standard` are still set by `defaultFn` (if `rubicon` is an enabled `acBidder`).
+
+```javascript
+pbjs.setConfig({
+  ...,
+  realTimeData: {
+    auctionDelay: 50,
+    dataProviders: [{
+      name: 'permutive',
+      waitForIt: true,
+      params: {
+        acBidders: ['appnexus'],
+        maxSegs: 450,
+        overwrites: {
+          rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+            if (defaultFn){
+              bid = defaultFn(bid, data, acEnabled)
+            }
+            if (data.gam && data.gam.length) {
+              utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+            }
+          }
+        }
+      }
+    }]
+  },
+  ...
+})
+```
+Any custom bidder function will receive the following parameters:
+
+| Name          | Type          | Description                             |
+| ------------- |-------------- | --------------------------------------- |
+| bid           | Object        | The bidder specific bidder object. You will mutate this object to set the appropriate targeting keys.       |
+| data          | Object        | An object containing Permutive segments |
+| data.appnexus | string[]      | Segments exposed by the Xandr SSP integration |
+| data.rubicon  | string[]      | Segments exposed by the Magnite SSP integration  |
+| data.gam      | string[]      | Segments exposed by the Google Ad Manager integration |
+| data.ac       | string[]      | Segments exposed by the Audience Connector |
+| acEnabled     | Boolean       | `true` if the current bidder in included in `params.acBidders` |
+| utils         | {}            | An object containing references to various util functions used by `permutiveRtdProvider.js`. Please make sure not to overwrite any of these. |
+| defaultFn     | Function      | The default function for this bidder. Please note that this can be `undefined` if there is no default function for this bidder (see `Supported Bidders`). The function expect the following parameters: `bid`, `data`, `acEnabled` and will return `bid`. |
+
+**Warning**
+
+The custom bidder function will mutate the `bid` object. Please be aware that this could break your bid request if you accidentally overwrite any fields other than the `permutive` or `p_standard` key-values or if you change the structure of the `bid` object in any way.
diff --git a/modules/prebidJSDebugUI.js b/modules/prebidJSDebugUI.js
new file mode 100644
index 00000000000..12046cd7e76
--- /dev/null
+++ b/modules/prebidJSDebugUI.js
@@ -0,0 +1,161 @@
+import { config } from '../src/config.js';
+import events from '../src/events.js';
+import { EVENTS } from '../src/constants.json';
+import {isPlainObject, isArray} from '../src/utils.js';
+import { loadExternalScript } from '../src/adloader.js'
+
+// const MODULE_NAME = 'Prebid JS Debug UI';
+const UI_LIBRARY_END_POINT = 'https://pm-harshad-mane.github.io/pbjs-debug-ui/bundle.js';
+const UI_LIBRARY_LOAD_DELAY = 3000;
+// UI library depends on these keys, so do not make changes to keys
+const DEBUG_OBJECT_KEY_NAME = '_pbjsDebugUI';
+const AUCTIONS_KEY = '_auctions';
+const AUCTION_INIT_KEY = '_init';
+const AUCTION_END_KEY = '_end';
+const AUCTIONS_BIDS_WON_KEY = '_bidsWon';
+const DEBUG_KEY = '_debug';
+const AUCTION_TAEGETING_KEY = '_targeting';
+const TCF2_KEY = '_tcf2Enforcement';
+
+// Do not load the lib if already loaded
+let uiLibraryLoaded = false;
+
+/*
+ToDo:
+*/
+
+function loadUILibIfNotAlreadyLoaded() {
+  if (uiLibraryLoaded === false) {
+    uiLibraryLoaded = true;
+    loadExternalScript(UI_LIBRARY_END_POINT, 'pbjs-debug-ui');
+  }
+}
+
+function loadUILibrary() {
+  // the js library needs this variable to be defined to know which is the primary prebid-js code on page in case tehre are multiple instances of prebid-js on page
+  window.PBJS_NAMESPACE = '$$PREBID_GLOBAL$$';
+  // Load the UI library after page-load / some delay
+  // Load lib on DOMContentLoaded
+  window.document.addEventListener('DOMContentLoaded', function() {
+    loadUILibIfNotAlreadyLoaded();
+  });
+  // Load lib after some timeout
+  setTimeout(function() {
+    loadUILibIfNotAlreadyLoaded()
+  }, UI_LIBRARY_LOAD_DELAY)
+}
+
+function createDebugObjectIfNotPresent() {
+  if (isPlainObject($$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME]) === false) {
+    $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME] = {};
+  }
+}
+
+function createDebugObjectAuctionIfNotPresent() {
+  if (isArray($$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY]) === false) {
+    $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY] = [];
+  }
+}
+
+function getAuctionIdEntry(auctionId) {
+  // create one if not present
+  let auctionEntry = $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY].find(
+    auctionEntry => auctionEntry.auctionId === auctionId
+  );
+  if (isPlainObject(auctionEntry) === false) {
+    auctionEntry = { auctionId };
+    $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY].push(auctionEntry);
+  }
+  return auctionEntry;
+}
+
+// TODO: improve the latest auction logic;
+//       current logic fails when multiple auctions are initiated simultaneously
+//       better if pbjs passes respective auctionId with each event
+function getLatestAuctionEntry() {
+  return $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY][ $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][AUCTIONS_KEY].length - 1 ];
+}
+
+function auctionInitHandler(auctionInitData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectAuctionIfNotPresent();
+  let auctionEntry = getAuctionIdEntry(auctionInitData.auctionId)
+  auctionEntry[AUCTION_INIT_KEY] = auctionInitData;
+}
+
+function auctionEndHandler(auctionEndData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectAuctionIfNotPresent();
+  // auctionEndData.timestamp is auctionStart
+  auctionEndData.auctionStart = auctionEndData.timestamp;
+  let auctionEntry = getAuctionIdEntry(auctionEndData.auctionId)
+  auctionEntry[AUCTION_END_KEY] = auctionEndData;
+}
+
+function createDebugObjectAuctionDebugIfNotPresent() {
+  if (isArray($$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][DEBUG_KEY]) === false) {
+    $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][DEBUG_KEY] = [];
+  }
+}
+
+function saveAuctionDebugData(auctionDebugData) {
+  $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][DEBUG_KEY].push(auctionDebugData);
+}
+
+function auctionDebugHandler(auctionDebugData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectAuctionDebugIfNotPresent();
+  saveAuctionDebugData(auctionDebugData);
+  // this data can't be put inside auction as error might be thrown before init of the auction
+}
+
+function createDebugObjectTcf2IfNotPresent() {
+  if (isPlainObject($$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][TCF2_KEY]) === false) {
+    $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][TCF2_KEY] = {};
+  }
+}
+
+function saveTcf2EnforcementData(tcf2EnforcementData) {
+  $$PREBID_GLOBAL$$[DEBUG_OBJECT_KEY_NAME][TCF2_KEY] = tcf2EnforcementData;
+}
+
+function tcf2EnforcementHandler(tcf2EnforcementData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectTcf2IfNotPresent();
+  saveTcf2EnforcementData(tcf2EnforcementData);
+}
+
+// putting this data in last auction to keep it safe
+//    otherwise the old data will be lost after a new auction takes place
+function setTargetingHandler(targetingData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectAuctionIfNotPresent();
+  let auctionEntry = getLatestAuctionEntry();
+  auctionEntry[AUCTION_TAEGETING_KEY] = targetingData;
+}
+
+function bidWonHandler(bidWonData) {
+  createDebugObjectIfNotPresent();
+  createDebugObjectAuctionIfNotPresent();
+  let auctionEntry = getAuctionIdEntry(bidWonData.auctionId);
+  if (!isPlainObject(auctionEntry[AUCTIONS_BIDS_WON_KEY])) {
+    auctionEntry[AUCTIONS_BIDS_WON_KEY] = {};
+  }
+  auctionEntry[AUCTIONS_BIDS_WON_KEY][bidWonData.adId] = bidWonData;
+}
+
+function init() {
+  // this module should work only if pbjs_debug is set to true in page-URL or debug mode is on thru config
+  if (config.getConfig('debug') !== true) {
+    return;
+  }
+  events.on(EVENTS.AUCTION_INIT, auctionInitHandler);
+  events.on(EVENTS.AUCTION_END, auctionEndHandler);
+  events.on(EVENTS.AUCTION_DEBUG, auctionDebugHandler);
+  events.on(EVENTS.SET_TARGETING, setTargetingHandler);
+  events.on(EVENTS.TCF2_ENFORCEMENT, tcf2EnforcementHandler);
+  events.on(EVENTS.BID_WON, bidWonHandler);
+  loadUILibrary();
+}
+
+init();
diff --git a/modules/prebidServerBidAdapter/config.js b/modules/prebidServerBidAdapter/config.js
index 56e4fdfbfef..92a8f5deaa5 100644
--- a/modules/prebidServerBidAdapter/config.js
+++ b/modules/prebidServerBidAdapter/config.js
@@ -3,15 +3,40 @@ export const S2S_VENDORS = {
   'appnexus': {
     adapter: 'prebidServer',
     enabled: true,
-    endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
-    syncEndpoint: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+    endpoint: {
+      p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+      noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/openrtb2/auction'
+    },
+    syncEndpoint: {
+      p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync',
+      noP1Consent: 'https://prebid.adnxs-simple.com/pbs/v1/cookie_sync'
+    },
     timeout: 1000
   },
   'rubicon': {
     adapter: 'prebidServer',
     enabled: true,
-    endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-    syncEndpoint: 'https://prebid-server.rubiconproject.com/cookie_sync',
+    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: 500
+  },
+  'openx': {
+    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'
+    },
+    timeout: 1000
   }
 }
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index 7536851f5e1..ad5cb70cc23 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -1,7 +1,7 @@
 import Adapter from '../../src/adapter.js';
 import { createBid } from '../../src/bidfactory.js';
 import * as utils from '../../src/utils.js';
-import { STATUS, S2S, EVENTS } from '../../src/constants.json';
+import CONSTANTS from '../../src/constants.json';
 import adapterManager from '../../src/adapterManager.js';
 import { config } from '../../src/config.js';
 import { VIDEO, NATIVE } from '../../src/mediaTypes.js';
@@ -12,20 +12,28 @@ import includes from 'core-js-pure/features/array/includes.js';
 import { S2S_VENDORS } from './config.js';
 import { ajax } from '../../src/ajax.js';
 import find from 'core-js-pure/features/array/find.js';
+import { getPrebidInternal } from '../../src/utils.js';
 
 const getConfig = config.getConfig;
 
-const TYPE = S2S.SRC;
-let _synced = false;
+const TYPE = CONSTANTS.S2S.SRC;
+let _syncCount = 0;
 const DEFAULT_S2S_TTL = 60;
 const DEFAULT_S2S_CURRENCY = 'USD';
 const DEFAULT_S2S_NETREVENUE = true;
 
-let _s2sConfig;
+let _s2sConfigs;
+
+let eidPermissions;
 
 /**
  * @typedef {Object} AdapterOptions
  * @summary s2sConfig parameter that adds arguments to resulting OpenRTB payload that goes to Prebid Server
+ * @property {string} adapter
+ * @property {boolean} enabled
+ * @property {string} endpoint
+ * @property {string} syncEndpoint
+ * @property {number} timeout
  * @example
  * // example of multiple bidder configuration
  * pbjs.setConfig({
@@ -40,18 +48,30 @@ let _s2sConfig;
 
 /**
  * @typedef {Object} S2SDefaultConfig
- * @property {boolean} enabled
- * @property {number} timeout
- * @property {number} maxBids
- * @property {string} adapter
- * @property {AdapterOptions} adapterOptions
+ * @summary Base config properties for server to server header bidding
+ * @property {string} [adapter='prebidServer'] adapter code to use for S2S
+ * @property {boolean} [enabled=false] enables S2S bidding
+ * @property {number} [timeout=1000] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
+ * @property {number} [maxBids=1]
+ * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @property {Object} [syncUrlModifier]
+ */
+
+/**
+ * @typedef {S2SDefaultConfig} S2SConfig
+ * @summary Configuration for server to server header bidding
+ * @property {string[]} bidders bidders to request S2S
+ * @property {string} endpoint endpoint to contact
+ * @property {string} [defaultVendor] used as key to select the bidder's default config from ßprebidServer/config.js
+ * @property {boolean} [cacheMarkup] whether to cache the adm result
+ * @property {string} [syncEndpoint] endpoint URL for syncing cookies
+ * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
  */
 
 /**
  * @type {S2SDefaultConfig}
  */
 const s2sDefaultConfig = {
-  enabled: false,
   timeout: 1000,
   maxBids: 1,
   adapter: 'prebidServer',
@@ -64,30 +84,19 @@ config.setDefaults({
 });
 
 /**
- * Set config for server to server header bidding
- * @typedef {Object} options - required
- * @property {boolean} enabled enables S2S bidding
- * @property {string[]} bidders bidders to request S2S
- * @property {string} endpoint endpoint to contact
- *  === optional params below ===
- * @property {number} [timeout] timeout for S2S bidders - should be lower than `pbjs.requestBids({timeout})`
- * @property {number} [defaultTtl] ttl for S2S bidders when pbs does not return a ttl on the response - defaults to 60`
- * @property {boolean} [cacheMarkup] whether to cache the adm result
- * @property {string} [adapter] adapter code to use for S2S
- * @property {string} [syncEndpoint] endpoint URL for syncing cookies
- * @property {Object} [extPrebid] properties will be merged into request.ext.prebid
- * @property {AdapterOptions} [adapterOptions] adds arguments to resulting OpenRTB payload to Prebid Server
+ * @param {S2SConfig} option
+ * @return {boolean}
  */
-function setS2sConfig(options) {
-  if (options.defaultVendor) {
-    let vendor = options.defaultVendor;
-    let optionKeys = Object.keys(options);
+function updateConfigDefaultVendor(option) {
+  if (option.defaultVendor) {
+    let vendor = option.defaultVendor;
+    let optionKeys = Object.keys(option);
     if (S2S_VENDORS[vendor]) {
       // vendor keys will be set if either: the key was not specified by user
       // or if the user did not set their own distinct value (ie using the system default) to override the vendor
       Object.keys(S2S_VENDORS[vendor]).forEach((vendorKey) => {
-        if (s2sDefaultConfig[vendorKey] === options[vendorKey] || !includes(optionKeys, vendorKey)) {
-          options[vendorKey] = S2S_VENDORS[vendor][vendorKey];
+        if (s2sDefaultConfig[vendorKey] === option[vendorKey] || !includes(optionKeys, vendorKey)) {
+          option[vendorKey] = S2S_VENDORS[vendor][vendorKey];
         }
       });
     } else {
@@ -95,9 +104,16 @@ function setS2sConfig(options) {
       return false;
     }
   }
+  // this is how we can know if user / defaultVendor has set it, or if we should default to false
+  return option.enabled = typeof option.enabled === 'boolean' ? option.enabled : false;
+}
 
-  let keys = Object.keys(options);
-
+/**
+ * @param {S2SConfig} option
+ * @return {boolean}
+ */
+function validateConfigRequiredProps(option) {
+  const keys = Object.keys(option);
   if (['accountId', 'bidders', 'endpoint'].filter(key => {
     if (!includes(keys, key)) {
       utils.logError(key + ' missing in server to server config');
@@ -105,10 +121,56 @@ function setS2sConfig(options) {
     }
     return false;
   }).length > 0) {
+    return false;
+  }
+}
+
+// temporary change to modify the s2sConfig for new format used for endpoint URLs;
+// could be removed later as part of a major release, if we decide to not support the old format
+function formatUrlParams(option) {
+  ['endpoint', 'syncEndpoint'].forEach((prop) => {
+    if (utils.isStr(option[prop])) {
+      let temp = option[prop];
+      option[prop] = { p1Consent: temp, noP1Consent: temp };
+    }
+  });
+}
+
+/**
+ * @param {(S2SConfig[]|S2SConfig)} options
+ */
+function setS2sConfig(options) {
+  if (!options) {
     return;
   }
+  const normalizedOptions = Array.isArray(options) ? options : [options];
+
+  const activeBidders = [];
+  const optionsValid = normalizedOptions.every((option, i, array) => {
+    formatUrlParams(options);
+    const updateSuccess = updateConfigDefaultVendor(option);
+    if (updateSuccess !== false) {
+      const valid = validateConfigRequiredProps(option);
+      if (valid !== false) {
+        if (Array.isArray(option['bidders'])) {
+          array[i]['bidders'] = option['bidders'].filter(bidder => {
+            if (activeBidders.indexOf(bidder) === -1) {
+              activeBidders.push(bidder);
+              return true;
+            }
+            return false;
+          });
+        }
+        return true;
+      }
+    }
+    utils.logWarn('prebidServer: s2s config is disabled');
+    return false;
+  });
 
-  _s2sConfig = options;
+  if (optionsValid) {
+    return _s2sConfigs = normalizedOptions;
+  }
 }
 getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
 
@@ -116,51 +178,52 @@ getConfig('s2sConfig', ({s2sConfig}) => setS2sConfig(s2sConfig));
  * resets the _synced variable back to false, primiarily used for testing purposes
 */
 export function resetSyncedStatus() {
-  _synced = false;
+  _syncCount = 0;
 }
 
 /**
  * @param  {Array} bidderCodes list of bidders to request user syncs for.
  */
-function queueSync(bidderCodes, gdprConsent, uspConsent) {
-  if (_synced) {
+function queueSync(bidderCodes, gdprConsent, uspConsent, s2sConfig) {
+  if (_s2sConfigs.length === _syncCount) {
     return;
   }
-  _synced = true;
+  _syncCount++;
 
   const payload = {
     uuid: utils.generateUUID(),
     bidders: bidderCodes,
-    account: _s2sConfig.accountId
+    account: s2sConfig.accountId
   };
 
-  let userSyncLimit = _s2sConfig.userSyncLimit;
+  let userSyncLimit = s2sConfig.userSyncLimit;
   if (utils.isNumber(userSyncLimit) && userSyncLimit > 0) {
     payload['limit'] = userSyncLimit;
   }
 
   if (gdprConsent) {
-    // only populate gdpr field if we know CMP returned consent information (ie didn't timeout or have an error)
-    if (typeof gdprConsent.consentString !== 'undefined') {
-      payload.gdpr = (gdprConsent.gdprApplies) ? 1 : 0;
-    }
+    payload.gdpr = (gdprConsent.gdprApplies) ? 1 : 0;
     // attempt to populate gdpr_consent if we know gdprApplies or it may apply
     if (gdprConsent.gdprApplies !== false) {
       payload.gdpr_consent = gdprConsent.consentString;
     }
   }
 
-  // US Privace (CCPA) support
+  // US Privacy (CCPA) support
   if (uspConsent) {
     payload.us_privacy = uspConsent;
   }
 
+  if (typeof s2sConfig.coopSync === 'boolean') {
+    payload.coopSync = s2sConfig.coopSync;
+  }
+
   const jsonPayload = JSON.stringify(payload);
-  ajax(_s2sConfig.syncEndpoint,
+  ajax(getMatchingConsentUrl(s2sConfig.syncEndpoint, gdprConsent),
     (response) => {
       try {
         response = JSON.parse(response);
-        doAllSyncs(response.bidder_status);
+        doAllSyncs(response.bidder_status, s2sConfig);
       } catch (e) {
         utils.logError(e);
       }
@@ -172,16 +235,20 @@ function queueSync(bidderCodes, gdprConsent, uspConsent) {
     });
 }
 
-function doAllSyncs(bidders) {
+function doAllSyncs(bidders, s2sConfig) {
   if (bidders.length === 0) {
     return;
   }
 
-  const thisSync = bidders.pop();
+  // pull the syncs off the list in the order that prebid server sends them
+  const thisSync = bidders.shift();
+
+  // if PBS reports this bidder doesn't have an ID, then call the sync and recurse to the next sync entry
   if (thisSync.no_cookie) {
-    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders));
+    doPreBidderSync(thisSync.usersync.type, thisSync.usersync.url, thisSync.bidder, utils.bind.call(doAllSyncs, null, bidders, s2sConfig), s2sConfig);
   } else {
-    doAllSyncs(bidders);
+    // bidder already has an ID, so just recurse to the next sync entry
+    doAllSyncs(bidders, s2sConfig);
   }
 }
 
@@ -192,10 +259,11 @@ function doAllSyncs(bidders) {
  * @param {string} url the url to sync
  * @param {string} bidder name of bidder doing sync for
  * @param {function} done an exit callback; to signify this pixel has either: finished rendering or something went wrong
+ * @param {S2SConfig} s2sConfig
  */
-function doPreBidderSync(type, url, bidder, done) {
-  if (_s2sConfig.syncUrlModifier && typeof _s2sConfig.syncUrlModifier[bidder] === 'function') {
-    const newSyncUrl = _s2sConfig.syncUrlModifier[bidder](type, url, bidder);
+function doPreBidderSync(type, url, bidder, done, s2sConfig) {
+  if (s2sConfig.syncUrlModifier && typeof s2sConfig.syncUrlModifier[bidder] === 'function') {
+    const newSyncUrl = s2sConfig.syncUrlModifier[bidder](type, url, bidder);
     doBidderSync(type, newSyncUrl, bidder, done)
   } else {
     doBidderSync(type, url, bidder, done)
@@ -231,43 +299,31 @@ function doBidderSync(type, url, bidder, done) {
  *
  * @param {Array} bidders a list of bidder names
  */
-function doClientSideSyncs(bidders) {
+function doClientSideSyncs(bidders, gdprConsent, uspConsent) {
   bidders.forEach(bidder => {
     let clientAdapter = adapterManager.getBidAdapter(bidder);
     if (clientAdapter && clientAdapter.registerSyncs) {
-      clientAdapter.registerSyncs([]);
+      config.runWithBidder(
+        bidder,
+        utils.bind.call(
+          clientAdapter.registerSyncs,
+          clientAdapter,
+          [],
+          gdprConsent,
+          uspConsent
+        )
+      );
     }
   });
 }
 
-function _getDigiTrustQueryParams(bidRequest = {}) {
-  function getDigiTrustId(bidRequest) {
-    const bidRequestDigitrust = utils.deepAccess(bidRequest, 'bids.0.userId.digitrustid.data');
-    if (bidRequestDigitrust) {
-      return bidRequestDigitrust;
-    }
-
-    const digiTrustUser = config.getConfig('digiTrustId');
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
-  }
-  let digiTrustId = getDigiTrustId(bidRequest);
-  // Verify there is an ID and this user has not opted out
-  if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) {
-    return null;
-  }
-  return {
-    id: digiTrustId.id,
-    keyv: digiTrustId.keyv
-  };
-}
-
-function _appendSiteAppDevice(request, pageUrl) {
+function _appendSiteAppDevice(request, pageUrl, accountId) {
   if (!request) return;
 
   // ORTB specifies app OR site
   if (typeof config.getConfig('app') === 'object') {
     request.app = config.getConfig('app');
-    request.app.publisher = {id: _s2sConfig.accountId}
+    request.app.publisher = {id: accountId}
   } else {
     request.site = {};
     if (utils.isPlainObject(config.getConfig('site'))) {
@@ -275,7 +331,7 @@ function _appendSiteAppDevice(request, pageUrl) {
     }
     // set publisher.id if not already defined
     if (!utils.deepAccess(request.site, 'publisher.id')) {
-      utils.deepSetValue(request.site, 'publisher.id', _s2sConfig.accountId);
+      utils.deepSetValue(request.site, 'publisher.id', accountId);
     }
     // set site.page if not already defined
     if (!request.site.page) {
@@ -300,18 +356,18 @@ function addBidderFirstPartyDataToRequest(request) {
   const bidderConfig = config.getBidderConfig();
   const fpdConfigs = Object.keys(bidderConfig).reduce((acc, bidder) => {
     const currBidderConfig = bidderConfig[bidder];
-    if (currBidderConfig.fpd) {
-      const fpd = {};
-      if (currBidderConfig.fpd.context) {
-        fpd.site = currBidderConfig.fpd.context;
+    if (currBidderConfig.ortb2) {
+      const ortb2 = {};
+      if (currBidderConfig.ortb2.site) {
+        ortb2.site = currBidderConfig.ortb2.site;
       }
-      if (currBidderConfig.fpd.user) {
-        fpd.user = currBidderConfig.fpd.user;
+      if (currBidderConfig.ortb2.user) {
+        ortb2.user = currBidderConfig.ortb2.user;
       }
 
       acc.push({
         bidders: [ bidder ],
-        config: { fpd }
+        config: { ortb2 }
       });
     }
     return acc;
@@ -390,6 +446,18 @@ function addWurl(auctionId, adId, wurl) {
   }
 }
 
+function getPbsResponseData(bidderRequests, response, pbsName, pbjsName) {
+  const bidderValues = utils.deepAccess(response, `ext.${pbsName}`);
+  if (bidderValues) {
+    Object.keys(bidderValues).forEach(bidder => {
+      let biddersReq = find(bidderRequests, bidderReq => bidderReq.bidderCode === bidder);
+      if (biddersReq) {
+        biddersReq[pbjsName] = bidderValues[bidder];
+      }
+    });
+  }
+}
+
 /**
  * @param {string} auctionId
  * @param {string} adId generated value set to bidObject.adId by bidderFactory Bid()
@@ -418,18 +486,30 @@ export function resetWurlMap() {
 }
 
 const OPEN_RTB_PROTOCOL = {
-  buildRequest(s2sBidRequest, bidRequests, adUnits) {
+  buildRequest(s2sBidRequest, bidRequests, adUnits, s2sConfig, requestedBidders) {
     let imps = [];
     let aliases = {};
     const firstBidRequest = bidRequests[0];
 
     // transform ad unit into array of OpenRTB impression objects
+    let impIds = new Set();
     adUnits.forEach(adUnit => {
+      // in case there is a duplicate imp.id, add '-2' suffix to the second imp.id.
+      // e.g. if there are 2 adUnits (case of twin adUnit codes) with code 'test',
+      // first imp will have id 'test' and second imp will have id 'test-2'
+      let impressionId = adUnit.code;
+      let i = 1;
+      while (impIds.has(impressionId)) {
+        i++;
+        impressionId = `${adUnit.code}-${i}`;
+      }
+      impIds.add(impressionId);
+
       const nativeParams = processNativeAdUnitParams(utils.deepAccess(adUnit, 'mediaTypes.native'));
       let nativeAssets;
       if (nativeParams) {
         try {
-          nativeAssets = nativeAssetCache[adUnit.code] = Object.keys(nativeParams).reduce((assets, type) => {
+          nativeAssets = nativeAssetCache[impressionId] = Object.keys(nativeParams).reduce((assets, type) => {
             let params = nativeParams[type];
 
             function newAsset(obj) {
@@ -495,13 +575,17 @@ const OPEN_RTB_PROTOCOL = {
       const bannerParams = utils.deepAccess(adUnit, 'mediaTypes.banner');
 
       adUnit.bids.forEach(bid => {
-        // OpenRTB response contains the adunit code and bidder name. These are
+        // OpenRTB response contains imp.id and bidder name. These are
         // combined to create a unique key for each bid since an id isn't returned
-        bidIdMap[`${adUnit.code}${bid.bidder}`] = bid.bid_id;
-
+        bidIdMap[`${impressionId}${bid.bidder}`] = bid.bid_id;
         // check for and store valid aliases to add to the request
         if (adapterManager.aliasRegistry[bid.bidder]) {
-          aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
+          const bidder = adapterManager.bidderRegistry[bid.bidder];
+          // adding alias only if alias source bidder exists and alias isn't configured to be standalone
+          // pbs adapter
+          if (bidder && !bidder.getSpec().skipPbsAliasing) {
+            aliases[bid.bidder] = adapterManager.aliasRegistry[bid.bidder];
+          }
         }
       });
 
@@ -521,11 +605,24 @@ const OPEN_RTB_PROTOCOL = {
       }
 
       if (!utils.isEmpty(videoParams)) {
-        if (videoParams.context === 'outstream' && !adUnit.renderer) {
+        if (videoParams.context === 'outstream' && (!videoParams.renderer || !adUnit.renderer)) {
           // Don't push oustream w/o renderer to request object.
           utils.logError('Outstream bid without renderer cannot be sent to Prebid Server.');
         } else {
-          mediaTypes['video'] = videoParams;
+          if (videoParams.context === 'instream' && !videoParams.hasOwnProperty('placement')) {
+            videoParams.placement = 1;
+          }
+
+          mediaTypes['video'] = Object.keys(videoParams).filter(param => param !== 'context')
+            .reduce((result, param) => {
+              if (param === 'playerSize') {
+                result.w = utils.deepAccess(videoParams, `${param}.0.0`);
+                result.h = utils.deepAccess(videoParams, `${param}.0.1`);
+              } else {
+                result[param] = videoParams[param];
+              }
+              return result;
+            }, {});
         }
       }
 
@@ -551,25 +648,46 @@ const OPEN_RTB_PROTOCOL = {
       }
 
       // get bidder params in form { : {...params} }
+      // initialize reduce function with the user defined `ext` properties on the ad unit
       const ext = adUnit.bids.reduce((acc, bid) => {
         const adapter = adapterManager.bidderRegistry[bid.bidder];
         if (adapter && adapter.getSpec().transformBidParams) {
           bid.params = adapter.getSpec().transformBidParams(bid.params, true);
         }
-        acc[bid.bidder] = (_s2sConfig.adapterOptions && _s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, _s2sConfig.adapterOptions[bid.bidder]) : bid.params;
+        acc[bid.bidder] = (s2sConfig.adapterOptions && s2sConfig.adapterOptions[bid.bidder]) ? Object.assign({}, bid.params, s2sConfig.adapterOptions[bid.bidder]) : bid.params;
         return acc;
-      }, {});
-
-      const imp = { id: adUnit.code, ext, secure: _s2sConfig.secure };
-
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(adUnit, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(imp, 'ext.context.data.adslot', pbAdSlot);
-      }
+      }, {...utils.deepAccess(adUnit, 'ortb2Imp.ext')});
+
+      const imp = { id: impressionId, ext, secure: s2sConfig.secure };
+
+      const ortb2 = {...utils.deepAccess(adUnit, 'ortb2Imp.ext.data')};
+      Object.keys(ortb2).forEach(prop => {
+        /**
+          * Prebid AdSlot
+          * @type {(string|undefined)}
+        */
+        if (prop === 'pbadslot') {
+          if (typeof ortb2[prop] === 'string' && ortb2[prop]) {
+            utils.deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
+          } else {
+            // remove pbadslot property if it doesn't meet the spec
+            delete imp.ext.data.pbadslot;
+          }
+        } else if (prop === 'adserver') {
+          /**
+           * Copy GAM AdUnit and Name to imp
+           */
+          ['name', 'adslot'].forEach(name => {
+            /** @type {(string|undefined)} */
+            const value = utils.deepAccess(ortb2, `adserver.${name}`);
+            if (typeof value === 'string' && value) {
+              utils.deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
+            }
+          });
+        } else {
+          utils.deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
+        }
+      });
 
       Object.assign(imp, mediaTypes);
 
@@ -579,6 +697,23 @@ const OPEN_RTB_PROTOCOL = {
         utils.deepSetValue(imp, 'ext.prebid.storedauctionresponse.id', storedAuctionResponseBid.storedAuctionResponse.toString());
       }
 
+      const getFloorBid = find(firstBidRequest.bids, bid => bid.adUnitCode === adUnit.code && typeof bid.getFloor === 'function');
+
+      if (getFloorBid) {
+        let floorInfo;
+        try {
+          floorInfo = getFloorBid.getFloor({
+            currency: config.getConfig('currency.adServerCurrency') || DEFAULT_S2S_CURRENCY,
+          });
+        } catch (e) {
+          utils.logError('PBS: getFloor threw an error: ', e);
+        }
+        if (floorInfo && floorInfo.currency && !isNaN(parseFloat(floorInfo.floor))) {
+          imp.bidfloor = parseFloat(floorInfo.floor);
+          imp.bidfloorcur = floorInfo.currency
+        }
+      }
+
       if (imp.banner || imp.video || imp.native) {
         imps.push(imp);
       }
@@ -591,7 +726,7 @@ const OPEN_RTB_PROTOCOL = {
     const request = {
       id: s2sBidRequest.tid,
       source: {tid: s2sBidRequest.tid},
-      tmax: _s2sConfig.timeout,
+      tmax: s2sConfig.timeout,
       imp: imps,
       test: getConfig('debug') ? 1 : 0,
       ext: {
@@ -608,9 +743,12 @@ const OPEN_RTB_PROTOCOL = {
       }
     };
 
+    // Sets pbjs version, can be overwritten below if channel exists in s2sConfig.extPrebid
+    request.ext.prebid = Object.assign(request.ext.prebid, {channel: {name: 'pbjs', version: $$PREBID_GLOBAL$$.version}})
+
     // s2sConfig video.ext.prebid is passed through openrtb to PBS
-    if (_s2sConfig.extPrebid && typeof _s2sConfig.extPrebid === 'object') {
-      request.ext.prebid = Object.assign(request.ext.prebid, _s2sConfig.extPrebid);
+    if (s2sConfig.extPrebid && typeof s2sConfig.extPrebid === 'object') {
+      request.ext.prebid = Object.assign(request.ext.prebid, s2sConfig.extPrebid);
     }
 
     /**
@@ -625,12 +763,7 @@ const OPEN_RTB_PROTOCOL = {
       request.cur = [adServerCur[0]];
     }
 
-    _appendSiteAppDevice(request, firstBidRequest.refererInfo.referer);
-
-    const digiTrust = _getDigiTrustQueryParams(firstBidRequest);
-    if (digiTrust) {
-      utils.deepSetValue(request, 'user.ext.digitrust', digiTrust);
-    }
+    _appendSiteAppDevice(request, bidRequests[0].refererInfo.referer, s2sConfig.accountId);
 
     // pass schain object if it is present
     const schain = utils.deepAccess(bidRequests, '0.bids.0.schain');
@@ -641,7 +774,7 @@ const OPEN_RTB_PROTOCOL = {
     }
 
     if (!utils.isEmpty(aliases)) {
-      request.ext.prebid.aliases = aliases;
+      request.ext.prebid.aliases = {...request.ext.prebid.aliases, ...aliases};
     }
 
     const bidUserIdAsEids = utils.deepAccess(bidRequests, '0.bids.0.userIdAsEids');
@@ -649,6 +782,32 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'user.ext.eids', bidUserIdAsEids);
     }
 
+    if (utils.isArray(eidPermissions) && eidPermissions.length > 0) {
+      if (requestedBidders && utils.isArray(requestedBidders)) {
+        eidPermissions.forEach(i => {
+          if (i.bidders) {
+            i.bidders = i.bidders.filter(bidder => requestedBidders.includes(bidder))
+          }
+        });
+      }
+      utils.deepSetValue(request, 'ext.prebid.data.eidpermissions', eidPermissions);
+    }
+
+    const multibid = config.getConfig('multibid');
+    if (multibid) {
+      utils.deepSetValue(request, 'ext.prebid.multibid', multibid.reduce((result, i) => {
+        let obj = {};
+
+        Object.keys(i).forEach(key => {
+          obj[key.toLowerCase()] = i[key];
+        });
+
+        result.push(obj);
+
+        return result;
+      }, []));
+    }
+
     if (bidRequests) {
       if (firstBidRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
@@ -658,6 +817,9 @@ const OPEN_RTB_PROTOCOL = {
         }
         utils.deepSetValue(request, 'regs.ext.gdpr', gdprApplies);
         utils.deepSetValue(request, 'user.ext.consent', firstBidRequest.gdprConsent.consentString);
+        if (firstBidRequest.gdprConsent.addtlConsent && typeof firstBidRequest.gdprConsent.addtlConsent === 'string') {
+          utils.deepSetValue(request, 'user.ext.ConsentedProvidersSettings.consented_providers', firstBidRequest.gdprConsent.addtlConsent);
+        }
       }
 
       // US Privacy (CCPA) support
@@ -670,21 +832,24 @@ const OPEN_RTB_PROTOCOL = {
       utils.deepSetValue(request, 'regs.coppa', 1);
     }
 
-    const commonFpd = getConfig('fpd') || {};
-    if (commonFpd.context) {
-      utils.deepSetValue(request, 'site.ext.data', commonFpd.context);
+    const commonFpd = getConfig('ortb2') || {};
+    if (commonFpd.site) {
+      utils.mergeDeep(request, {site: commonFpd.site});
     }
     if (commonFpd.user) {
-      utils.deepSetValue(request, 'user.ext.data', commonFpd.user);
+      utils.mergeDeep(request, {user: commonFpd.user});
     }
     addBidderFirstPartyDataToRequest(request);
 
     return request;
   },
 
-  interpretResponse(response, bidderRequests) {
+  interpretResponse(response, bidderRequests, s2sConfig) {
     const bids = [];
 
+    [['errors', 'serverErrors'], ['responsetimemillis', 'serverResponseTimeMs']]
+      .forEach(info => getPbsResponseData(bidderRequests, response, info[0], info[1]))
+
     if (response.seatbid) {
       // a seatbid object contains a `bid` array and a `seat` string
       response.seatbid.forEach(seatbid => {
@@ -699,7 +864,7 @@ const OPEN_RTB_PROTOCOL = {
           }
 
           const cpm = bid.price;
-          const status = cpm !== 0 ? STATUS.GOOD : STATUS.NO_BID;
+          const status = cpm !== 0 ? CONSTANTS.STATUS.GOOD : CONSTANTS.STATUS.NO_BID;
           let bidObject = createBid(status, bidRequest || {
             bidder: seatbid.seat,
             src: TYPE
@@ -707,6 +872,8 @@ const OPEN_RTB_PROTOCOL = {
 
           bidObject.cpm = cpm;
 
+          // temporarily leaving attaching it to each bidResponse so no breaking change
+          // BUT: this is a flat map, so it should be only attached to bidderRequest, a the change above does
           let serverResponseTimeMs = utils.deepAccess(response, ['ext', 'responsetimemillis', seatbid.seat].join('.'));
           if (bidRequest && serverResponseTimeMs) {
             bidRequest.serverResponseTimeMs = serverResponseTimeMs;
@@ -742,8 +909,8 @@ const OPEN_RTB_PROTOCOL = {
           if (utils.deepAccess(bid, 'ext.prebid.type') === VIDEO) {
             bidObject.mediaType = VIDEO;
             let sizes = bidRequest.sizes && bidRequest.sizes[0];
-            bidObject.playerHeight = sizes[0];
-            bidObject.playerWidth = sizes[1];
+            bidObject.playerWidth = sizes[0];
+            bidObject.playerHeight = sizes[1];
 
             // try to get cache values from 'response.ext.prebid.cache.js'
             // else try 'bid.ext.prebid.targeting' as fallback
@@ -785,7 +952,7 @@ const OPEN_RTB_PROTOCOL = {
             }
 
             if (utils.isPlainObject(adm) && Array.isArray(adm.assets)) {
-              let origAssets = nativeAssetCache[bidRequest.adUnitCode];
+              let origAssets = nativeAssetCache[bid.impid];
               bidObject.native = utils.cleanObj(adm.assets.reduce((native, asset) => {
                 let origAsset = origAssets[asset.id];
                 if (utils.isPlainObject(asset.img)) {
@@ -831,13 +998,17 @@ const OPEN_RTB_PROTOCOL = {
           bidObject.creativeId = bid.crid;
           if (bid.burl) { bidObject.burl = bid.burl; }
           bidObject.currency = (response.cur) ? response.cur : DEFAULT_S2S_CURRENCY;
-
-          // TODO: Remove when prebid-server returns ttl and netRevenue
-          const configTtl = _s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
-          bidObject.ttl = (bid.ttl) ? bid.ttl : configTtl;
+          bidObject.meta = {};
+          let extPrebidMeta = utils.deepAccess(bid, 'ext.prebid.meta');
+          if (extPrebidMeta && utils.isPlainObject(extPrebidMeta)) { bidObject.meta = utils.deepClone(extPrebidMeta); }
+          if (bid.adomain) { bidObject.meta.advertiserDomains = bid.adomain; }
+
+          // the OpenRTB location for "TTL" as understood by Prebid.js is "exp" (expiration).
+          const configTtl = s2sConfig.defaultTtl || DEFAULT_S2S_TTL;
+          bidObject.ttl = (bid.exp) ? bid.exp : configTtl;
           bidObject.netRevenue = (bid.netRevenue) ? bid.netRevenue : DEFAULT_S2S_NETREVENUE;
 
-          bids.push({ adUnit: bid.impid, bid: bidObject });
+          bids.push({ adUnit: bidRequest.adUnitCode, bid: bidObject });
         });
       });
     }
@@ -861,6 +1032,29 @@ function bidWonHandler(bid) {
   }
 }
 
+function hasPurpose1Consent(gdprConsent) {
+  let result = true;
+  if (gdprConsent) {
+    if (gdprConsent.gdprApplies && gdprConsent.apiVersion === 2) {
+      result = !!(utils.deepAccess(gdprConsent, 'vendorData.purpose.consents.1') === true);
+    }
+  }
+  return result;
+}
+
+function getMatchingConsentUrl(urlProp, gdprConsent) {
+  return hasPurpose1Consent(gdprConsent) ? urlProp.p1Consent : urlProp.noP1Consent;
+}
+
+function getConsentData(bidRequests) {
+  let gdprConsent, uspConsent;
+  if (Array.isArray(bidRequests) && bidRequests.length > 0) {
+    gdprConsent = bidRequests[0].gdprConsent;
+    uspConsent = bidRequests[0].uspConsent;
+  }
+  return { gdprConsent, uspConsent };
+}
+
 /**
  * Bidder adapter for Prebid Server
  */
@@ -870,6 +1064,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 adUnits = utils.deepClone(s2sBidRequest.ad_units);
+    let { gdprConsent, uspConsent } = getConsentData(bidRequests);
 
     // at this point ad units should have a size array either directly or mapped so filter for that
     const validAdUnits = adUnits.filter(unit =>
@@ -882,39 +1077,37 @@ export function PrebidServer() {
       .reduce(utils.flatten)
       .filter(utils.uniques);
 
-    if (_s2sConfig && _s2sConfig.syncEndpoint) {
-      let gdprConsent, uspConsent;
-      if (Array.isArray(bidRequests) && bidRequests.length > 0) {
-        gdprConsent = bidRequests[0].gdprConsent;
-        uspConsent = bidRequests[0].uspConsent;
-      }
-
-      let syncBidders = _s2sConfig.bidders
-        .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
-        .filter((bidder, index, array) => (array.indexOf(bidder) === index));
+    if (Array.isArray(_s2sConfigs)) {
+      if (s2sBidRequest.s2sConfig && s2sBidRequest.s2sConfig.syncEndpoint && getMatchingConsentUrl(s2sBidRequest.s2sConfig.syncEndpoint, gdprConsent)) {
+        let syncBidders = s2sBidRequest.s2sConfig.bidders
+          .map(bidder => adapterManager.aliasRegistry[bidder] || bidder)
+          .filter((bidder, index, array) => (array.indexOf(bidder) === index));
 
-      queueSync(syncBidders, gdprConsent, uspConsent);
-    }
+        queueSync(syncBidders, gdprConsent, uspConsent, s2sBidRequest.s2sConfig);
+      }
 
-    const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits);
-    const requestJson = request && JSON.stringify(request);
-    if (request && requestJson) {
-      ajax(
-        _s2sConfig.endpoint,
-        {
-          success: response => handleResponse(response, requestedBidders, bidRequests, addBidResponse, done),
-          error: done
-        },
-        requestJson,
-        { contentType: 'text/plain', withCredentials: true }
-      );
+      const request = OPEN_RTB_PROTOCOL.buildRequest(s2sBidRequest, bidRequests, validAdUnits, s2sBidRequest.s2sConfig, requestedBidders);
+      const requestJson = request && JSON.stringify(request);
+      utils.logInfo('BidRequest: ' + requestJson);
+      if (request && requestJson) {
+        ajax(
+          getMatchingConsentUrl(s2sBidRequest.s2sConfig.endpoint, gdprConsent),
+          {
+            success: response => handleResponse(response, requestedBidders, bidRequests, addBidResponse, done, s2sBidRequest.s2sConfig),
+            error: done
+          },
+          requestJson,
+          { contentType: 'text/plain', withCredentials: true }
+        );
+      }
     }
   };
 
   /* Notify Prebid of bid responses so bids can get in the auction */
-  function handleResponse(response, requestedBidders, bidderRequests, addBidResponse, done) {
+  function handleResponse(response, requestedBidders, bidderRequests, addBidResponse, done, s2sConfig) {
     let result;
     let bids = [];
+    let { gdprConsent, uspConsent } = getConsentData(bidderRequests);
 
     try {
       result = JSON.parse(response);
@@ -922,7 +1115,7 @@ export function PrebidServer() {
       bids = OPEN_RTB_PROTOCOL.interpretResponse(
         result,
         bidderRequests,
-        requestedBidders
+        s2sConfig
       );
 
       bids.forEach(({adUnit, bid}) => {
@@ -931,7 +1124,7 @@ export function PrebidServer() {
         }
       });
 
-      bidderRequests.forEach(bidderRequest => events.emit(EVENTS.BIDDER_DONE, bidderRequest));
+      bidderRequests.forEach(bidderRequest => events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest));
     } catch (error) {
       utils.logError(error);
     }
@@ -941,11 +1134,11 @@ export function PrebidServer() {
     }
 
     done();
-    doClientSideSyncs(requestedBidders);
+    doClientSideSyncs(requestedBidders, gdprConsent, uspConsent);
   }
 
   // Listen for bid won to call wurl
-  events.on(EVENTS.BID_WON, bidWonHandler);
+  events.on(CONSTANTS.EVENTS.BID_WON, bidWonHandler);
 
   return Object.assign(this, {
     callBids: baseAdapter.callBids,
@@ -954,4 +1147,14 @@ export function PrebidServer() {
   });
 }
 
+/**
+ * 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;
+}
+getPrebidInternal().setEidPermissions = setEidPermissions;
+
 adapterManager.registerBidAdapter(new PrebidServer(), 'prebidServer');
diff --git a/modules/prebidmanagerAnalyticsAdapter.js b/modules/prebidmanagerAnalyticsAdapter.js
index b98ca864cd5..b9a7d79f991 100644
--- a/modules/prebidmanagerAnalyticsAdapter.js
+++ b/modules/prebidmanagerAnalyticsAdapter.js
@@ -1,10 +1,12 @@
 import {ajaxBuilder} from '../src/ajax.js';
 import adapter from '../src/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
+import { getStorageManager } from '../src/storageManager.js';
 
 /**
  * prebidmanagerAnalyticsAdapter.js - analytics adapter for prebidmanager
  */
+export const storage = getStorageManager(undefined, 'prebidmanager');
 const DEFAULT_EVENT_URL = 'https://endpoint.prebidmanager.com/endpoint'
 const analyticsType = 'endpoint';
 const analyticsName = 'Prebid Manager Analytics: ';
@@ -82,14 +84,14 @@ function collectUtmTagData() {
     });
     if (newUtm === false) {
       utmTags.forEach(function (utmKey) {
-        let itemValue = localStorage.getItem(`pm_${utmKey}`);
-        if (itemValue.length !== 0) {
+        let itemValue = storage.getDataFromLocalStorage(`pm_${utmKey}`);
+        if (itemValue && itemValue.length !== 0) {
           pmUtmTags[utmKey] = itemValue;
         }
       });
     } else {
       utmTags.forEach(function (utmKey) {
-        localStorage.setItem(`pm_${utmKey}`, pmUtmTags[utmKey]);
+        storage.setDataInLocalStorage(`pm_${utmKey}`, pmUtmTags[utmKey]);
       });
     }
   } catch (e) {
@@ -99,6 +101,16 @@ function collectUtmTagData() {
   return pmUtmTags;
 }
 
+function collectPageInfo() {
+  const pageInfo = {
+    domain: window.location.hostname,
+  }
+  if (document.referrer) {
+    pageInfo.referrerDomain = utils.parseUrl(document.referrer).hostname;
+  }
+  return pageInfo;
+}
+
 function flush() {
   if (!pmAnalyticsEnabled) {
     return;
@@ -111,6 +123,7 @@ function flush() {
       bundleId: initOptions.bundleId,
       events: _eventQueue,
       utmTags: collectUtmTagData(),
+      pageInfo: collectPageInfo(),
     };
 
     ajax(
diff --git a/modules/priceFloors.js b/modules/priceFloors.js
index 6d35a0a74cc..0063c194554 100644
--- a/modules/priceFloors.js
+++ b/modules/priceFloors.js
@@ -55,7 +55,7 @@ export let _floorDataForAuction = {};
  * @summary Simple function to round up to a certain decimal degree
  */
 function roundUp(number, precision) {
-  return Math.ceil(parseFloat(number) * Math.pow(10, precision)) / Math.pow(10, precision);
+  return Math.ceil((parseFloat(number) * Math.pow(10, precision)).toFixed(1)) / Math.pow(10, precision);
 }
 
 let referrerHostname;
@@ -98,21 +98,23 @@ export function getFirstMatchingFloor(floorData, bidObject, responseObject = {})
   let fieldValues = enumeratePossibleFieldValues(utils.deepAccess(floorData, 'schema.fields') || [], bidObject, responseObject);
   if (!fieldValues.length) return { matchingFloor: floorData.default };
 
-  // look to see iof a request for this context was made already
+  // look to see if a request for this context was made already
   let matchingInput = fieldValues.map(field => field[0]).join('-');
   // if we already have gotten the matching rule from this matching input then use it! No need to look again
   let previousMatch = utils.deepAccess(floorData, `matchingInputs.${matchingInput}`);
   if (previousMatch) {
-    return previousMatch;
+    return {...previousMatch};
   }
   let allPossibleMatches = generatePossibleEnumerations(fieldValues, utils.deepAccess(floorData, 'schema.delimiter') || '|');
   let matchingRule = find(allPossibleMatches, hashValue => floorData.values.hasOwnProperty(hashValue));
 
   let matchingData = {
-    matchingFloor: floorData.values[matchingRule] || floorData.default,
+    floorMin: floorData.floorMin || 0,
+    floorRuleValue: floorData.values[matchingRule] || floorData.default,
     matchingData: allPossibleMatches[0], // the first possible match is an "exact" so contains all data relevant for anlaytics adapters
     matchingRule
   };
+  matchingData.matchingFloor = Math.max(matchingData.floorMin, matchingData.floorRuleValue);
   // save for later lookup if needed
   utils.deepSetValue(floorData, `matchingInputs.${matchingInput}`, {...matchingData});
   return matchingData;
@@ -138,10 +140,10 @@ function generatePossibleEnumerations(arrayOfFields, delimiter) {
 /**
  * @summary If a the input bidder has a registered cpmadjustment it returns the input CPM after being adjusted
  */
-export function getBiddersCpmAdjustment(bidderName, inputCpm) {
-  const adjustmentFunction = utils.deepAccess(getGlobal(), `bidderSettings.${bidderName}.bidCpmAdjustment`);
+export function getBiddersCpmAdjustment(bidderName, inputCpm, bid = {}) {
+  const adjustmentFunction = utils.deepAccess(getGlobal(), `bidderSettings.${bidderName}.bidCpmAdjustment`) || utils.deepAccess(getGlobal(), 'bidderSettings.standard.bidCpmAdjustment');
   if (adjustmentFunction) {
-    return parseFloat(adjustmentFunction(inputCpm));
+    return parseFloat(adjustmentFunction(inputCpm, {...bid, cpm: inputCpm}));
   }
   return parseFloat(inputCpm);
 }
@@ -286,11 +288,15 @@ export function updateAdUnitsForAuction(adUnits, floorData, auctionId) {
       bid.auctionId = auctionId;
       bid.floorData = {
         skipped: floorData.skipped,
-        modelVersion: utils.deepAccess(floorData, 'data.modelVersion'),
-        location: utils.deepAccess(floorData, 'data.location'),
         skipRate: floorData.skipRate,
+        floorMin: floorData.floorMin,
+        modelVersion: utils.deepAccess(floorData, 'data.modelVersion'),
+        modelWeight: utils.deepAccess(floorData, 'data.modelWeight'),
+        modelTimestamp: utils.deepAccess(floorData, 'data.modelTimestamp'),
+        location: utils.deepAccess(floorData, 'data.location', 'noData'),
+        floorProvider: floorData.floorProvider,
         fetchStatus: _floorsConfig.fetchStatus
-      }
+      };
     });
   });
 }
@@ -335,6 +341,8 @@ export function createFloorsDataForAuction(adUnits, auctionId) {
     const isSkipped = Math.random() * 100 < parseFloat(auctionSkipRate);
     resolvedFloorsData.skipped = isSkipped;
   }
+  // copy FloorMin to floorData.data
+  if (resolvedFloorsData.hasOwnProperty('floorMin')) resolvedFloorsData.data.floorMin = resolvedFloorsData.floorMin;
   // add floorData to bids
   updateAdUnitsForAuction(adUnits, resolvedFloorsData, auctionId);
   return resolvedFloorsData;
@@ -513,6 +521,7 @@ export function handleFetchResponse(fetchResponse) {
     _floorsConfig.data = fetchData;
     // set skipRate override if necessary
     _floorsConfig.skipRate = utils.isNumber(fetchData.skipRate) ? fetchData.skipRate : _floorsConfig.skipRate;
+    _floorsConfig.floorProvider = fetchData.floorProvider || _floorsConfig.floorProvider;
   }
 
   // if any auctions are waiting for fetch to finish, we need to continue them!
@@ -566,8 +575,10 @@ function addFieldOverrides(overrides) {
  */
 export function handleSetFloorsConfig(config) {
   _floorsConfig = utils.pick(config, [
+    'floorMin',
     'enabled', enabled => enabled !== false, // defaults to true
     'auctionDelay', auctionDelay => auctionDelay || 0,
+    'floorProvider', floorProvider => utils.deepAccess(config, 'data.floorProvider', floorProvider),
     'endpoint', endpoint => endpoint || {},
     'skipRate', () => !isNaN(utils.deepAccess(config, 'data.skipRate')) ? config.data.skipRate : config.skipRate || 0,
     'enforcement', enforcement => utils.pick(enforcement || {}, [
@@ -620,6 +631,7 @@ function addFloorDataToBid(floorData, floorInfo, bid, adjustedCpm) {
   bid.floorData = {
     floorValue: floorInfo.matchingFloor,
     floorRule: floorInfo.matchingRule,
+    floorRuleValue: floorInfo.floorRuleValue,
     floorCurrency: floorData.data.currency,
     cpmAfterAdjustments: adjustedCpm,
     enforcements: {...floorData.enforcement},
@@ -679,7 +691,12 @@ export function addBidResponseHook(fn, adUnitCode, bid) {
   }
 
   // ok we got the bid response cpm in our desired currency. Now we need to run the bidders CPMAdjustment function if it exists
-  adjustedCpm = getBiddersCpmAdjustment(bid.bidderCode, adjustedCpm);
+  adjustedCpm = getBiddersCpmAdjustment(bid.bidderCode, adjustedCpm, bid);
+
+  // The below condition is added to avoid floor on s2s calls
+  if (bid.bidderCode == 'pubmaticServer') {
+    return fn.call(this, adUnitCode, bid);
+  }
 
   // add necessary data information for analytics adapters / floor providers would possibly need
   addFloorDataToBid(floorData, floorInfo, bid, adjustedCpm);
diff --git a/modules/priceFloors.md b/modules/priceFloors.md
index d09be78c620..36ac07ee972 100644
--- a/modules/priceFloors.md
+++ b/modules/priceFloors.md
@@ -11,6 +11,7 @@ pbjs.setConfig({
       enforceJS: true //defaults to true
     },
     auctionDelay: 150, // in milliseconds defaults to 0
+    floorProvider: 'awesomeFloorProviderName', // name of the floor provider (optional)
     endpoint: {
       url: 'http://localhost:1500/floor-domains',
       method: 'GET' // Only get supported for now
@@ -40,6 +41,7 @@ pbjs.setConfig({
 | enabled                | Wether to turn off or on the floors module                                                                          |
 | enforcement            | object of booleans which control certain features of the module                                                     |
 | auctionDelay           | The time to suspend and auction while waiting for a real time price floors fetch to come back                       |
+| floorProvider          | A string identifying the floor provider.|
 | endpoint               | An object describing the endpoint to retrieve floor data from. GET only                                             |
 | data                   | The data to be used to select appropriate floors. See schema for more detail                                        |
 | additionalSchemaFields | An object of additional fields to be used in a floor data object. The schema is KEY: function to retrieve the match |
@@ -59,4 +61,4 @@ This function can takes in an object with the following optional parameters:
 
 If a bid adapter passes in `*` as an attribute, then the `priceFloors` module will attempt to select the best rule based on context.
 
-For example, if an adapter passes in a `*`, but the bidRequest only has a single size and a single mediaType, then the `getFloor` function will attempt to get a rule for that size before matching with the `*` catch-all. Similarily, if mediaType can be inferred on the bidRequest, it will use it.
\ No newline at end of file
+For example, if an adapter passes in a `*`, but the bidRequest only has a single size and a single mediaType, then the `getFloor` function will attempt to get a rule for that size before matching with the `*` catch-all. Similarily, if mediaType can be inferred on the bidRequest, it will use it.
diff --git a/modules/projectLimeLightBidAdapter.js b/modules/projectLimeLightBidAdapter.js
index f2ff77f6229..1beba906917 100644
--- a/modules/projectLimeLightBidAdapter.js
+++ b/modules/projectLimeLightBidAdapter.js
@@ -4,7 +4,6 @@ import {ajax} from '../src/ajax.js';
 import * as utils from '../src/utils.js';
 
 const BIDDER_CODE = 'project-limelight';
-const URL = 'https://ads.project-limelight.com/hb';
 
 /**
  * Determines whether or not the given bid response is valid.
@@ -25,19 +24,6 @@ function isBidResponseValid(bid) {
   return false;
 }
 
-function extractBidSizes(bid) {
-  const bidSizes = [];
-
-  bid.sizes.forEach(size => {
-    bidSizes.push({
-      width: size[0],
-      height: size[1]
-    });
-  });
-
-  return bidSizes;
-}
-
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -65,30 +51,10 @@ export const spec = {
     } catch (e) {
       utils.logMessage(e);
       winTop = window;
-    };
-    const placements = [];
-    const request = {
-      'secure': (location.protocol === 'https:'),
-      'deviceWidth': winTop.screen.width,
-      'deviceHeight': winTop.screen.height,
-      'adUnits': placements
-    };
-    for (let i = 0; i < validBidRequests.length; i++) {
-      const bid = validBidRequests[i];
-      const params = bid.params;
-      placements.push({
-        id: params.adUnitId,
-        bidId: bid.bidId,
-        transactionId: bid.transactionId,
-        sizes: extractBidSizes(bid),
-        type: params.adUnitType.toUpperCase()
-      });
     }
-    return {
-      method: 'POST',
-      url: URL,
-      data: request
-    };
+    const placements = utils.groupBy(validBidRequests.map(bidRequest => buildPlacement(bidRequest)), 'host')
+    return Object.keys(placements)
+      .map(host => buildRequest(winTop, host, placements[host].map(placement => placement.adUnit)));
   },
 
   onBidWon: (bid) => {
@@ -123,3 +89,34 @@ export const spec = {
 };
 
 registerBidder(spec);
+
+function buildRequest(winTop, host, adUnits) {
+  return {
+    method: 'POST',
+    url: `https://${host}/hb`,
+    data: {
+      secure: (location.protocol === 'https:'),
+      deviceWidth: winTop.screen.width,
+      deviceHeight: winTop.screen.height,
+      adUnits: adUnits
+    }
+  }
+}
+
+function buildPlacement(bidRequest) {
+  return {
+    host: bidRequest.params.host,
+    adUnit: {
+      id: bidRequest.params.adUnitId,
+      bidId: bidRequest.bidId,
+      transactionId: bidRequest.transactionId,
+      sizes: bidRequest.sizes.map(size => {
+        return {
+          width: size[0],
+          height: size[1]
+        }
+      }),
+      type: bidRequest.params.adUnitType.toUpperCase()
+    }
+  }
+}
diff --git a/modules/projectLimeLightBidAdapter.md b/modules/projectLimeLightBidAdapter.md
index 71621983b89..15aa170cd2e 100644
--- a/modules/projectLimeLightBidAdapter.md
+++ b/modules/projectLimeLightBidAdapter.md
@@ -18,6 +18,7 @@ Module that connects to Project Limelight SSP demand sources
                 bids: [{
                         bidder: 'project-limelight',
                         params: {
+                            host: 'ads.project-limelight.com',
                             adUnitId: 0,
                             adUnitType: 'banner'
                         }
@@ -34,6 +35,7 @@ var videoAdUnit = [{
                 bids: [{
                         bidder: 'project-limelight',
                         params: {
+                            host: 'ads.project-limelight.com',
                             adUnitId: 0,
                             adUnitType: 'video'
                         }
diff --git a/modules/proxistoreBidAdapter.js b/modules/proxistoreBidAdapter.js
index c546337c47f..ff07ee9ede9 100644
--- a/modules/proxistoreBidAdapter.js
+++ b/modules/proxistoreBidAdapter.js
@@ -1,62 +1,79 @@
-
 import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { getStorageManager } from '../src/storageManager.js';
 const BIDDER_CODE = 'proxistore';
-const storage = getStorageManager();
 const PROXISTORE_VENDOR_ID = 418;
 
 function _createServerRequest(bidRequests, bidderRequest) {
-  const sizeIds = [];
-
+  var sizeIds = [];
   bidRequests.forEach(function (bid) {
-    const sizeId = {
+    var sizeId = {
       id: bid.bidId,
       sizes: bid.sizes.map(function (size) {
         return {
           width: size[0],
-          height: size[1]
+          height: size[1],
         };
-      })
+      }),
+      floor: _assignFloor(bid),
+      segments: _assignSegments(bid),
     };
     sizeIds.push(sizeId);
   });
-  const payload = {
+  var payload = {
     auctionId: bidRequests[0].auctionId,
     transactionId: bidRequests[0].auctionId,
     bids: sizeIds,
     website: bidRequests[0].params.website,
     language: bidRequests[0].params.language,
     gdpr: {
-      applies: false
-    }
-  };
-  const options = {
-    contentType: 'application/json',
-    withCredentials: true
+      applies: false,
+      consentGiven: false
+    },
   };
 
   if (bidderRequest && bidderRequest.gdprConsent) {
-    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) {
+    const { gdprConsent } = bidderRequest;
+    if (typeof gdprConsent.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
       payload.gdpr.applies = true;
     }
 
-    if (typeof bidderRequest.gdprConsent.consentString === 'string' && bidderRequest.gdprConsent.consentString) {
+    if (typeof gdprConsent.consentString === 'string' && gdprConsent.consentString) {
       payload.gdpr.consentString = bidderRequest.gdprConsent.consentString;
     }
-
-    if (bidderRequest.gdprConsent.vendorData && bidderRequest.gdprConsent.vendorData.vendorConsents && typeof bidderRequest.gdprConsent.vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)] !== 'undefined') {
-      payload.gdpr.consentGiven = !!bidderRequest.gdprConsent.vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)];
+    if (gdprConsent.vendorData) {
+      const {vendorData} = gdprConsent;
+      const {apiVersion} = gdprConsent;
+      if (apiVersion === 2 && vendorData.vendor && vendorData.vendor.consents && typeof vendorData.vendor.consents[PROXISTORE_VENDOR_ID.toString(10)] !== 'undefined') {
+        payload.gdpr.consentGiven = !!vendorData.vendor.consents[PROXISTORE_VENDOR_ID.toString(10)];
+      } else if (apiVersion === 1 && vendorData.vendorConsents && typeof vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)] !== 'undefined') {
+        payload.gdpr.consentGiven = !!vendorData.vendorConsents[PROXISTORE_VENDOR_ID.toString(10)];
+      }
     }
   }
 
+  const options = {
+    contentType: 'application/json',
+    withCredentials: payload.gdpr.consentGiven,
+  };
+
+  const endPointUri = payload.gdpr.consentGiven || !payload.gdpr.applies
+    ? `https://abs.proxistore.com/${payload.language}/v3/rtb/prebid/multi`
+    : `https://abs.cookieless-proxistore.com/${payload.language}/v3/rtb/prebid/multi`;
+
   return {
     method: 'POST',
-    url: bidRequests[0].params.url || 'https://abs.proxistore.com/' + payload.language + '/v3/rtb/prebid/multi',
+    url: endPointUri,
     data: JSON.stringify(payload),
-    options: options
+    options: options,
   };
 }
 
+function _assignSegments(bid) {
+  if (bid.ortb2 && bid.ortb2.user && bid.ortb2.user.ext && bid.ortb2.user.ext.data) {
+    return bid.ortb2.user.ext.data || {segments: [], contextual_categories: {}};
+  }
+  return {segments: [], contextual_categories: {}};
+}
+
 function _createBidResponse(response) {
   return {
     requestId: response.requestId,
@@ -70,7 +87,7 @@ function _createBidResponse(response) {
     netRevenue: response.netRevenue,
     vastUrl: response.vastUrl,
     vastXml: response.vastXml,
-    dealId: response.dealId
+    dealId: response.dealId,
   };
 }
 /**
@@ -81,23 +98,8 @@ function _createBidResponse(response) {
  */
 
 function isBidRequestValid(bid) {
-  const hasNoAd = function() {
-    if (!storage.hasLocalStorage()) {
-      return false;
-    }
-    const pxNoAds = storage.getDataFromLocalStorage(`PX_NoAds_${bid.params.website}`);
-    if (!pxNoAds) {
-      return false;
-    } else {
-      const storedDate = new Date(pxNoAds);
-      const now = new Date();
-      const diff = Math.abs(storedDate.getTime() - now.getTime()) / 60000;
-      return diff <= 5;
-    }
-  }
-  return !!(bid.params.website && bid.params.language) && !hasNoAd();
+  return !!(bid.params.website && bid.params.language);
 }
-
 /**
  * Make a server request from the list of BidRequests.
  *
@@ -107,7 +109,7 @@ function isBidRequestValid(bid) {
  */
 
 function buildRequests(bidRequests, bidderRequest) {
-  const request = _createServerRequest(bidRequests, bidderRequest);
+  var request = _createServerRequest(bidRequests, bidderRequest);
   return request;
 }
 /**
@@ -119,34 +121,23 @@ function buildRequests(bidRequests, bidderRequest) {
  */
 
 function interpretResponse(serverResponse, bidRequest) {
-  const itemName = `PX_NoAds_${websiteFromBidRequest(bidRequest)}`;
-  if (serverResponse.body.length > 0) {
-    storage.removeDataFromLocalStorage(itemName, true);
-    return serverResponse.body.map(_createBidResponse);
-  } else {
-    storage.setDataInLocalStorage(itemName, new Date());
-    return [];
-  }
+  return serverResponse.body.map(_createBidResponse);
 }
 
-const websiteFromBidRequest = function(bidR) {
-  if (bidR.data) {
-    return JSON.parse(bidR.data).website
-  } else if (bidR.params.website) {
-    return bidR.params.website;
-  }
-}
+function _assignFloor(bid) {
+  if (typeof bid.getFloor === 'function') {
+    var floorInfo = bid.getFloor({
+      currency: 'EUR',
+      mediaType: 'banner',
+      size: '*',
+    });
 
-/**
- * Register the user sync pixels which should be dropped after the auction.
- *
- * @param syncOptions Which user syncs are allowed?
- * @param serverResponses List of server's responses.
- * @return The user syncs which should be dropped.
- */
+    if (floorInfo.currency === 'EUR') {
+      return floorInfo.floor;
+    }
+  }
 
-function getUserSyncs(syncOptions, serverResponses) {
-  return [];
+  return null;
 }
 
 export const spec = {
@@ -154,7 +145,7 @@ export const spec = {
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
   interpretResponse: interpretResponse,
-  getUserSyncs: getUserSyncs
+
 };
 
 registerBidder(spec);
diff --git a/modules/pubCommonId.js b/modules/pubCommonId.js
index 174fa6ffe6e..427f775c44b 100644
--- a/modules/pubCommonId.js
+++ b/modules/pubCommonId.js
@@ -212,9 +212,11 @@ export function requestBidHook(next, config) {
   // into bid requests later.
   if (adUnits && pubcid) {
     adUnits.forEach((unit) => {
-      unit.bids.forEach((bid) => {
-        Object.assign(bid, {crumbs: {pubcid}});
-      });
+      if (unit.bids && utils.isArray(unit.bids)) {
+        unit.bids.forEach((bid) => {
+          Object.assign(bid, {crumbs: {pubcid}});
+        });
+      }
     });
   }
 
diff --git a/modules/pubCommonIdSystem.js b/modules/pubCommonIdSystem.js
index 8e2be1207f5..95e539a4d6a 100644
--- a/modules/pubCommonIdSystem.js
+++ b/modules/pubCommonIdSystem.js
@@ -7,11 +7,173 @@
 
 import * as utils from '../src/utils.js';
 import {submodule} from '../src/hook.js';
+import {getStorageManager} from '../src/storageManager.js';
+import {ajax} from '../src/ajax.js';
+import { uspDataHandler, coppaDataHandler } from '../src/adapterManager.js';
 
 const PUB_COMMON_ID = 'PublisherCommonId';
-
 const MODULE_NAME = 'pubCommonId';
 
+const COOKIE = 'cookie';
+const LOCAL_STORAGE = 'html5';
+const SHAREDID_OPT_OUT_VALUE = '00000000000000000000000000';
+const SHAREDID_URL = 'https://id.sharedid.org/id';
+const SHAREDID_SUFFIX = '_sharedid';
+const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const SHAREDID_DEFAULT_STATE = false;
+const GVLID = 887;
+
+const storage = getStorageManager(GVLID, 'pubCommonId');
+
+/**
+ * Store sharedid in either cookie or local storage
+ * @param {Object} config Need config.storage object to derive key, expiry time, and storage type.
+ * @param {string} value Shareid value to store
+ */
+
+function storeData(config, value) {
+  try {
+    if (value) {
+      const key = config.storage.name + SHAREDID_SUFFIX;
+      const expiresStr = (new Date(Date.now() + (storage.expires * (60 * 60 * 24 * 1000)))).toUTCString();
+
+      if (config.storage.type === COOKIE) {
+        if (storage.cookiesAreEnabled()) {
+          storage.setCookie(key, value, expiresStr, 'LAX', pubCommonIdSubmodule.domainOverride());
+        }
+      } else if (config.storage.type === LOCAL_STORAGE) {
+        if (storage.hasLocalStorage()) {
+          storage.setDataInLocalStorage(`${key}_exp`, expiresStr);
+          storage.setDataInLocalStorage(key, value);
+        }
+      }
+    }
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * Read sharedid from cookie or local storage
+ * @param config Need config.storage to derive key and storage type
+ * @return {string}
+ */
+function readData(config) {
+  try {
+    const key = config.storage.name + SHAREDID_SUFFIX;
+    if (config.storage.type === COOKIE) {
+      if (storage.cookiesAreEnabled()) {
+        return storage.getCookie(key);
+      }
+    } else if (config.storage.type === LOCAL_STORAGE) {
+      if (storage.hasLocalStorage()) {
+        const expValue = storage.getDataFromLocalStorage(`${key}_exp`);
+        if (!expValue) {
+          return storage.getDataFromLocalStorage(key);
+        } else if ((new Date(expValue)).getTime() - Date.now() > 0) {
+          return storage.getDataFromLocalStorage(key)
+        }
+      }
+    }
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * Delete sharedid from cookie or local storage
+ * @param config Need config.storage to derive key and storage type
+ */
+function delData(config) {
+  try {
+    const key = config.storage.name + SHAREDID_SUFFIX;
+    if (config.storage.type === COOKIE) {
+      if (storage.cookiesAreEnabled()) {
+        storage.setCookie(key, '', EXPIRED_COOKIE_DATE);
+      }
+    } else if (config.storage.type === LOCAL_STORAGE) {
+      storage.removeDataFromLocalStorage(`${key}_exp`);
+      storage.removeDataFromLocalStorage(key);
+    }
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * setup success and error handler for sharedid callback thru ajax
+ * @param {string} pubcid Current pubcommon id
+ * @param {function} callback userId module callback.
+ * @param {Object} config Need config.storage to derive sharedid storage params
+ * @return {{success: success, error: error}}
+ */
+
+function handleResponse(pubcid, callback, config) {
+  return {
+    success: function (responseBody) {
+      if (responseBody) {
+        try {
+          let responseObj = JSON.parse(responseBody);
+          utils.logInfo('PubCommonId: Generated SharedId: ' + responseObj.sharedId);
+          if (responseObj.sharedId) {
+            if (responseObj.sharedId !== SHAREDID_OPT_OUT_VALUE) {
+              // Store sharedId locally
+              storeData(config, responseObj.sharedId);
+            } else {
+              // Delete local copy if the user has opted out
+              delData(config);
+            }
+          }
+          // Pass pubcid even though there is no change in order to trigger decode
+          callback(pubcid);
+        } catch (error) {
+          utils.logError(error);
+        }
+      }
+    },
+    error: function (statusText, responseBody) {
+      utils.logInfo('PubCommonId: failed to get sharedid');
+    }
+  }
+}
+
+/**
+ * Builds and returns the shared Id URL with attached consent data if applicable
+ * @param {Object} consentData
+ * @return {string}
+ */
+function sharedIdUrl(consentData) {
+  const usPrivacyString = uspDataHandler.getConsentData();
+  let sharedIdUrl = SHAREDID_URL;
+  if (usPrivacyString && typeof usPrivacyString === 'string') {
+    sharedIdUrl = `${SHAREDID_URL}?us_privacy=${usPrivacyString}`;
+  }
+  if (!consentData || typeof consentData.gdprApplies !== 'boolean' || !consentData.gdprApplies) return sharedIdUrl;
+  if (usPrivacyString) {
+    sharedIdUrl = `${sharedIdUrl}&gdpr=1&gdpr_consent=${consentData.consentString}`
+    return sharedIdUrl;
+  }
+  sharedIdUrl = `${SHAREDID_URL}?gdpr=1&gdpr_consent=${consentData.consentString}`;
+  return sharedIdUrl
+}
+
+/**
+ * Wraps pixelCallback in order to call sharedid sync
+ * @param {string} pubcid Pubcommon id value
+ * @param {function|undefined} pixelCallback fires a pixel to first party server
+ * @param {Object} config Need config.storage to derive sharedid storage params.
+ * @return {function(...[*]=)}
+ */
+
+function getIdCallback(pubcid, pixelCallback, config, consentData) {
+  return function (callback) {
+    if (typeof pixelCallback === 'function') {
+      pixelCallback();
+    }
+    ajax(sharedIdUrl(consentData), handleResponse(pubcid, callback, config), undefined, {method: 'GET', withCredentials: true});
+  }
+}
+
 /** @type {Submodule} */
 export const pubCommonIdSubmodule = {
   /**
@@ -19,6 +181,11 @@ export const pubCommonIdSubmodule = {
    * @type {string}
    */
   name: MODULE_NAME,
+  /**
+   * Vendor id of prebid
+   * @type {Number}
+   */
+  gvlid: GVLID,
   /**
    * Return a callback function that calls the pixelUrl with id as a query parameter
    * @param pixelUrl
@@ -43,52 +210,134 @@ export const pubCommonIdSubmodule = {
    * decode the stored id value for passing to bid requests
    * @function
    * @param {string} value
+   * @param {SubmoduleConfig} config
    * @returns {{pubcid:string}}
    */
-  decode(value) {
-    return { 'pubcid': value }
+  decode(value, config) {
+    const idObj = {'pubcid': value};
+    const {params: {enableSharedId = SHAREDID_DEFAULT_STATE} = {}} = config;
+
+    if (enableSharedId) {
+      const sharedId = readData(config);
+      if (sharedId) idObj['sharedid'] = {id: sharedId};
+    }
+
+    return idObj;
   },
   /**
    * performs action to obtain id
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config] Config object with params and storage properties
+   * @param {Object} consentData
+   * @param {string} storedId Existing pubcommon id
    * @returns {IdResponse}
    */
-  getId: function ({create = true, pixelUrl} = {}) {
-    try {
-      if (typeof window[PUB_COMMON_ID] === 'object') {
-        // If the page includes its own pubcid module, then save a copy of id.
-        return {id: window[PUB_COMMON_ID].getId()};
-      }
-    } catch (e) {
+  getId: function (config = {}, consentData, storedId) {
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      utils.logInfo('PubCommonId: IDs not provided for coppa requests, exiting PubCommonId');
+      return;
     }
+    const {params: {create = true, pixelUrl, enableSharedId = SHAREDID_DEFAULT_STATE} = {}} = config;
+    let newId = storedId;
+    if (!newId) {
+      try {
+        if (typeof window[PUB_COMMON_ID] === 'object') {
+          // If the page includes its own pubcid module, then save a copy of id.
+          newId = window[PUB_COMMON_ID].getId();
+        }
+      } catch (e) {
+      }
 
-    const newId = (create && utils.hasDeviceAccess()) ? utils.generateUUID() : undefined;
-    return {
-      id: newId,
-      callback: this.makeCallback(pixelUrl, newId)
+      if (!newId) newId = (create && utils.hasDeviceAccess()) ? utils.generateUUID() : undefined;
     }
+
+    const pixelCallback = this.makeCallback(pixelUrl, newId);
+    const combinedCallback = enableSharedId ? getIdCallback(newId, pixelCallback, config, consentData) : pixelCallback;
+
+    return {id: newId, callback: combinedCallback};
   },
   /**
-   * performs action to extend an id
+   * performs action to extend an id.  There are generally two ways to extend the expiration time
+   * of stored id: using pixelUrl or return the id and let main user id module write it again with
+   * the new expiration time.
+   *
+   * PixelUrl, if defined, should point back to a first party domain endpoint.  On the server
+   * side, there is either a plugin, or customized logic to read and write back the pubcid cookie.
+   * The extendId function itself should return only the callback, and not the id itself to avoid
+   * having the script-side overwriting server-side.  This applies to both pubcid and sharedid.
+   *
+   * On the other hand, if there is no pixelUrl, then the extendId should return storedId so that
+   * its expiration time is updated.  Sharedid, however, will have to be updated by this submodule
+   * separately.
+   *
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleParams} [config]
+   * @param {ConsentData|undefined} consentData
    * @param {Object} storedId existing id
    * @returns {IdResponse|undefined}
    */
-  extendId: function({extend = false, pixelUrl} = {}, storedId) {
-    try {
-      if (typeof window[PUB_COMMON_ID] === 'object') {
-        // If the page includes its onw pubcid module, then there is nothing to do.
-        return;
-      }
-    } catch (e) {
+  extendId: function(config = {}, consentData, storedId) {
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      utils.logInfo('PubCommonId: IDs not provided for coppa requests, exiting PubCommonId');
+      return;
     }
+    const {params: {extend = false, pixelUrl, enableSharedId = SHAREDID_DEFAULT_STATE} = {}} = config;
 
     if (extend) {
-      // When extending, only one of response fields is needed
-      const callback = this.makeCallback(pixelUrl, storedId);
-      return callback ? {callback: callback} : {id: storedId};
+      try {
+        if (typeof window[PUB_COMMON_ID] === 'object') {
+          if (enableSharedId) {
+            // If the page includes its own pubcid module, then there is nothing to do
+            // except to update sharedid's expiration time
+            storeData(config, readData(config));
+          }
+          return;
+        }
+      } catch (e) {
+      }
+
+      if (pixelUrl) {
+        const callback = this.makeCallback(pixelUrl, storedId);
+        return {callback: callback};
+      } else {
+        if (enableSharedId) {
+          // Update with the same value to extend expiration time
+          storeData(config, readData(config));
+        }
+        return {id: storedId};
+      }
+    }
+  },
+
+  /**
+   * @param {string} domain
+   * @param {HTMLDocument} document
+   * @return {(string|undefined)}
+   */
+  domainOverride: function () {
+    const domainElements = document.domain.split('.');
+    const cookieName = `_gd${Date.now()}`;
+    for (let i = 0, topDomain, testCookie; i < domainElements.length; i++) {
+      const nextDomain = domainElements.slice(i).join('.');
+
+      // write test cookie
+      storage.setCookie(cookieName, '1', undefined, undefined, nextDomain);
+
+      // read test cookie to verify domain was valid
+      testCookie = storage.getCookie(cookieName);
+
+      // delete test cookie
+      storage.setCookie(cookieName, '', 'Thu, 01 Jan 1970 00:00:01 GMT', undefined, nextDomain);
+
+      if (testCookie === '1') {
+        // cookie was written successfully using test domain so the topDomain is updated
+        topDomain = nextDomain;
+      } else {
+        // cookie failed to write using test domain so exit by returning the topDomain
+        return topDomain;
+      }
     }
   }
 };
diff --git a/modules/pubProvidedIdSystem.js b/modules/pubProvidedIdSystem.js
new file mode 100644
index 00000000000..0b2175f57cb
--- /dev/null
+++ b/modules/pubProvidedIdSystem.js
@@ -0,0 +1,54 @@
+/**
+ * This module adds Publisher Provided ids support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/pubProvidedSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js';
+import * as utils from '../src/utils.js';
+
+const MODULE_NAME = 'pubProvidedId';
+
+/** @type {Submodule} */
+export const pubProvidedIdSubmodule = {
+
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * decode the stored id value for passing to bid request
+   * @function
+   * @param {string} value
+   * @returns {{pubProvidedId: array}} or undefined if value doesn't exists
+   */
+  decode(value) {
+    const res = value ? {pubProvidedId: value} : undefined;
+    utils.logInfo('PubProvidedId: Decoded value ' + JSON.stringify(res));
+    return res;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @returns {{id: array}}
+   */
+  getId(config) {
+    const configParams = (config && config.params) || {};
+    let res = [];
+    if (utils.isArray(configParams.eids)) {
+      res = res.concat(configParams.eids);
+    }
+    if (typeof configParams.eidsFunction === 'function') {
+      res = res.concat(configParams.eidsFunction());
+    }
+    return {id: res};
+  }
+};
+
+// Register submodule for userId
+submodule('userId', pubProvidedIdSubmodule);
diff --git a/modules/pubgeniusBidAdapter.js b/modules/pubgeniusBidAdapter.js
index d42073b3da5..89dea545434 100644
--- a/modules/pubgeniusBidAdapter.js
+++ b/modules/pubgeniusBidAdapter.js
@@ -1,27 +1,27 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import {
   deepAccess,
   deepSetValue,
   inIframe,
   isArrayOfNums,
+  isFn,
   isInteger,
-  isNumber,
   isStr,
   logError,
   parseQueryStringParameters,
+  pick,
 } from '../src/utils.js';
 
-const BIDDER_VERSION = '1.0.0';
+const BIDDER_VERSION = '1.1.0';
 const BASE_URL = 'https://ortb.adpearl.io';
-const AUCTION_URL = BASE_URL + '/prebid/auction';
 
 export const spec = {
   code: 'pubgenius',
 
-  supportedMediaTypes: [ BANNER ],
+  supportedMediaTypes: [ BANNER, VIDEO ],
 
   isBidRequestValid(bid) {
     const adUnitId = bid.params.adUnitId;
@@ -30,15 +30,20 @@ export const spec = {
       return false;
     }
 
-    const sizes = deepAccess(bid, 'mediaTypes.banner.sizes');
-    return Boolean(sizes && sizes.length) && sizes.every(size => isArrayOfNums(size, 2));
+    const { mediaTypes } = bid;
+
+    if (mediaTypes.banner) {
+      return isValidBanner(mediaTypes.banner);
+    }
+
+    return isValidVideo(mediaTypes.video, bid.params.video);
   },
 
   buildRequests: function (bidRequests, bidderRequest) {
     const data = {
       id: bidderRequest.auctionId,
       imp: bidRequests.map(buildImp),
-      tmax: config.getConfig('bidderTimeout'),
+      tmax: bidderRequest.timeout,
       ext: {
         pbadapter: {
           version: BIDDER_VERSION,
@@ -66,7 +71,7 @@ export const spec = {
       deepSetValue(data, 'regs.ext.us_privacy', usp);
     }
 
-    const schain = bidderRequest.schain;
+    const schain = bidRequests[0].schain;
     if (schain) {
       deepSetValue(data, 'source.ext.schain', schain);
     }
@@ -85,7 +90,7 @@ export const spec = {
 
     return {
       method: 'POST',
-      url: AUCTION_URL,
+      url: `${getBaseUrl()}/prebid/auction`,
       data,
     };
   },
@@ -128,7 +133,7 @@ export const spec = {
       const qs = parseQueryStringParameters(params);
       syncs.push({
         type: 'iframe',
-        url: `${BASE_URL}/usersync/pixels.html?${qs}`,
+        url: `${getBaseUrl()}/usersync/pixels.html?${qs}`,
       });
     }
 
@@ -136,25 +141,75 @@ export const spec = {
   },
 
   onTimeout(data) {
-    ajax(`${BASE_URL}/prebid/events?type=timeout`, null, JSON.stringify(data), {
+    ajax(`${getBaseUrl()}/prebid/events?type=timeout`, null, JSON.stringify(data), {
       method: 'POST',
     });
   },
 };
 
+function buildVideoParams(videoMediaType, videoParams) {
+  videoMediaType = videoMediaType || {};
+  const params = pick(videoMediaType, [
+    'mimes',
+    'minduration',
+    'maxduration',
+    'protocols',
+    'startdelay',
+    'placement',
+    'skip',
+    'skipafter',
+    'minbitrate',
+    'maxbitrate',
+    'delivery',
+    'playbackmethod',
+    'api',
+    '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];
+  }
+
+  return Object.assign(params, videoParams);
+}
+
 function buildImp(bid) {
   const imp = {
     id: bid.bidId,
-    banner: {
-      format: deepAccess(bid, 'mediaTypes.banner.sizes').map(size => ({ w: size[0], h: size[1] })),
-      topframe: numericBoolean(!inIframe()),
-    },
     tagid: String(bid.params.adUnitId),
   };
 
-  const bidFloor = bid.params.bidFloor;
-  if (isNumber(bidFloor)) {
-    imp.bidfloor = bidFloor;
+  if (bid.mediaTypes.banner) {
+    imp.banner = {
+      format: bid.mediaTypes.banner.sizes.map(size => ({ w: size[0], h: size[1] })),
+      topframe: numericBoolean(!inIframe()),
+    };
+  } else {
+    imp.video = buildVideoParams(bid.mediaTypes.video, bid.params.video);
+  }
+
+  if (isFn(bid.getFloor)) {
+    const { floor } = bid.getFloor({
+      mediaType: bid.mediaTypes.banner ? 'banner' : 'video',
+      size: '*',
+      currency: 'USD',
+    });
+
+    if (floor) {
+      imp.bidfloor = floor;
+    }
   }
 
   const pos = bid.params.position;
@@ -170,14 +225,26 @@ function buildImp(bid) {
 }
 
 function buildSite(bidderRequest) {
-  const pageUrl = config.getConfig('pageUrl') || bidderRequest.refererInfo.referer;
+  let site = null;
+  const { refererInfo } = bidderRequest;
+
+  const pageUrl = config.getConfig('pageUrl') || refererInfo.canonicalUrl || refererInfo.referer;
   if (pageUrl) {
-    return {
-      page: pageUrl,
-    };
+    site = site || {};
+    site.page = pageUrl;
   }
 
-  return null;
+  if (refererInfo.reachedTop) {
+    try {
+      const pageRef = window.top.document.referrer;
+      if (pageRef) {
+        site = site || {};
+        site.ref = pageRef;
+      }
+    } catch (e) {}
+  }
+
+  return site;
 }
 
 function interpretBid(bid) {
@@ -186,7 +253,6 @@ function interpretBid(bid) {
     cpm: bid.price,
     width: bid.w,
     height: bid.h,
-    ad: bid.adm,
     ttl: bid.exp,
     creativeId: bid.crid,
     netRevenue: true,
@@ -198,6 +264,24 @@ function interpretBid(bid) {
     };
   }
 
+  const pbadapter = deepAccess(bid, 'ext.pbadapter') || {};
+  switch (pbadapter.mediaType) {
+    case 'video':
+      if (bid.nurl) {
+        bidResponse.vastUrl = bid.nurl;
+      }
+
+      if (bid.adm) {
+        bidResponse.vastXml = bid.adm;
+      }
+
+      bidResponse.mediaType = VIDEO;
+      break;
+    default: // banner by default
+      bidResponse.ad = bid.adm;
+      break;
+  }
+
   return bidResponse;
 }
 
@@ -205,4 +289,27 @@ function numericBoolean(value) {
   return value ? 1 : 0;
 }
 
+function getBaseUrl() {
+  const pubg = config.getConfig('pubgenius');
+  return (pubg && pubg.endpoint) || BASE_URL;
+}
+
+function isValidSize(size) {
+  return isArrayOfNums(size, 2) && size[0] > 0 && size[1] > 0;
+}
+
+function isValidBanner(banner) {
+  const sizes = banner.sizes;
+  return !!(sizes && sizes.length) && sizes.every(isValidSize);
+}
+
+function isValidVideo(videoMediaType, videoParams) {
+  const params = buildVideoParams(videoMediaType, videoParams);
+
+  return !!(params.placement &&
+    isValidSize([params.w, params.h]) &&
+    params.mimes && params.mimes.length &&
+    isArrayOfNums(params.protocols) && params.protocols.length);
+}
+
 registerBidder(spec);
diff --git a/modules/pubgeniusBidAdapter.md b/modules/pubgeniusBidAdapter.md
index 66851af9c3f..2a10b421de2 100644
--- a/modules/pubgeniusBidAdapter.md
+++ b/modules/pubgeniusBidAdapter.md
@@ -12,8 +12,6 @@ Module that connects to pubGENIUS's demand sources
 
 # Test Parameters
 
-Test bids have $0.01 CPM by default. Use `bidFloor` in bidder params to control CPM for testing purposes.
-
 ```
 var adUnits = [
   {
@@ -45,12 +43,43 @@ var adUnits = [
         bidder: 'pubgenius',
         params: {
           adUnitId: '1000',
-          bidFloor: 0.5,
           test: true
         }
       }
     ]
-  }
+  },
+  {
+    code: 'test-video',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 360],
+        mimes: ['video/mp4'],
+        protocols: [3],
+      }
+    },
+    bids: [
+      {
+        bidder: 'pubgenius',
+        params: {
+          adUnitId: '1001',
+          test: true,
+
+          // Other video parameters can be put here as in OpenRTB v2.5 spec.
+          // This overrides the same parameters in mediaTypes.video.
+          video: {
+            placement: 1,
+
+            // w and h overrides mediaTypes.video.playerSize.
+            w: 640,
+            h: 360,
+
+            skip: 1
+          }
+        }
+      }
+    ]
+  },
 ];
 ```
 
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
index a19c6f095ad..08fb22f3b61 100755
--- a/modules/pubmaticAnalyticsAdapter.js
+++ b/modules/pubmaticAnalyticsAdapter.js
@@ -1,10 +1,16 @@
 import adapter from '../src/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
-import { ajax } from '../src/ajax.js';
-import { config } from '../src/config.js';
+import {
+  ajax
+} from '../src/ajax.js';
+import {
+  config
+} from '../src/config.js';
 import * as utils from '../src/utils.js';
-import { getGlobal } from '../src/prebidGlobal.js';
+import {
+  getGlobal
+} from '../src/prebidGlobal.js';
 
 /// /////////// CONSTANTS //////////////
 const ADAPTER_CODE = 'pubmatic';
@@ -30,6 +36,11 @@ const DEFAULT_PUBLISHER_ID = 0;
 const DEFAULT_PROFILE_ID = 0;
 const DEFAULT_PROFILE_VERSION_ID = 0;
 const enc = window.encodeURIComponent;
+const MEDIATYPE = {
+  BANNER: 0,
+  VIDEO: 1,
+  NATIVE: 2
+}
 
 /// /////////// VARIABLES //////////////
 let publisherId = DEFAULT_PUBLISHER_ID; // int: mandatory
@@ -47,7 +58,11 @@ function sizeToDimensions(size) {
 }
 
 function validMediaType(type) {
-  return ({'banner': 1, 'native': 1, 'video': 1}).hasOwnProperty(type);
+  return ({
+    'banner': 1,
+    'native': 1,
+    'video': 1
+  }).hasOwnProperty(type);
 }
 
 function formatSource(src) {
@@ -82,11 +97,12 @@ function setMediaTypes(types, bid) {
 
 function copyRequiredBidDetails(bid) {
   return utils.pick(bid, [
-    'bidder', bidder => bidder.toLowerCase(),
+    'bidder',
     'bidId',
     'status', () => NO_BID, // default a bid to NO_BID until response is recieved or bid is timed out
     'finalSource as source',
     'params',
+    'floorData',
     'adUnit', () => utils.pick(bid, [
       'adUnitCode',
       'transactionId',
@@ -151,7 +167,10 @@ function parseBidResponse(bid) {
     'bidId',
     'mediaType',
     'params',
+    'floorData',
     'mi',
+    'regexPattern', () => bid.regexPattern || undefined,
+    'partnerImpId', // partner impression ID
     'dimensions', () => utils.pick(bid, [
       'width',
       'height'
@@ -165,16 +184,68 @@ function getDomainFromUrl(url) {
   return a.hostname;
 }
 
+function getDevicePlatform() {
+  var deviceType = 3;
+  try {
+    var ua = navigator.userAgent;
+    if (ua && utils.isStr(ua) && ua.trim() != '') {
+      ua = ua.toLowerCase().trim();
+      var isMobileRegExp = new RegExp('(mobi|tablet|ios).*');
+      if (ua.match(isMobileRegExp)) {
+        deviceType = 2;
+      } else {
+        deviceType = 1;
+      }
+    }
+  } catch (ex) {}
+  return deviceType;
+}
+
+function getValueForKgpv(bid, adUnitId) {
+  if (bid.params.regexPattern) {
+    return bid.params.regexPattern;
+  } else if (bid.bidResponse && bid.bidResponse.regexPattern) {
+    return bid.bidResponse.regexPattern;
+  } else if (bid.params.kgpv) {
+    return getUpdatedKGPVForVideo(bid.params.kgpv, bid.bidResponse);
+  } else {
+    return adUnitId;
+  }
+}
+
+function getUpdatedKGPVForVideo(kgpv, bidResponse) {
+  if (bidResponse && bidResponse.mediaType && bidResponse.mediaType == 'video') {
+    var videoKgpv = ['', '0x0'];
+    var splitKgpv = kgpv.split('@');
+    if (splitKgpv.length > 1) {
+      if (splitKgpv.length == 2) {
+        if (splitKgpv[1].indexOf(':') > -1) {
+          var kgpvIndex = splitKgpv[1].split(':');
+          videoKgpv[1] = videoKgpv[1] + ':' + kgpvIndex[1];
+        }
+        videoKgpv[0] = splitKgpv[0];
+      }
+      kgpv = videoKgpv.join('@');
+    }
+  }
+  return kgpv;
+}
+
+function getAdapterNameForAlias(aliasName) {
+  return adapterManager.aliasRegistry[aliasName] || aliasName;
+}
+
 function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
   highestBid = (highestBid && highestBid.length > 0) ? highestBid[0] : null;
-  return Object.keys(adUnit.bids).reduce(function(partnerBids, bidId) {
+  return Object.keys(adUnit.bids).reduce(function (partnerBids, bidId) {
     let bid = adUnit.bids[bidId];
     partnerBids.push({
-      'pn': bid.bidder,
+      'pn': getAdapterNameForAlias(bid.bidder),
+      'bc': bid.bidder,
       'bidid': bid.bidId,
       'db': bid.bidResponse ? 0 : 1,
-      'kgpv': bid.params.kgpv ? bid.params.kgpv : adUnitId,
-      'kgpsv': bid.params.kgpv ? bid.params.kgpv : adUnitId,
+      'kgpv': getValueForKgpv(bid, adUnitId),
+      'kgpsv': bid.params.kgpv ? getUpdatedKGPVForVideo(bid.params.kgpv, bid.bidResponse) : adUnitId,
       'psz': bid.bidResponse ? (bid.bidResponse.dimensions.width + 'x' + bid.bidResponse.dimensions.height) : '0x0',
       'eg': bid.bidResponse ? bid.bidResponse.bidGrossCpmUSD : 0,
       'en': bid.bidResponse ? bid.bidResponse.bidPriceUSD : 0,
@@ -184,21 +255,45 @@ function gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestBid) {
       'l2': 0,
       'ss': (s2sBidders.indexOf(bid.bidder) > -1) ? 1 : 0,
       't': (bid.status == ERROR && bid.error.code == TIMEOUT_ERROR) ? 1 : 0,
-      'wb': (highestBid && highestBid.requestId === bid.bidId ? 1 : 0),
+      'wb': (highestBid && highestBid.adId === bid.bidId ? 1 : 0),
       'mi': bid.bidResponse ? (bid.bidResponse.mi || undefined) : undefined,
       '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
+      'ocry': bid.bidResponse ? (bid.bidResponse.originalCurrency || CURRENCY_USD) : CURRENCY_USD,
+      'piid': bid.bidResponse ? (bid.bidResponse.partnerImpId || EMPTY_STRING) : EMPTY_STRING,
+      'frv': (s2sBidders.indexOf(bid.bidder) > -1) ? undefined : (bid.bidResponse ? (bid.bidResponse.floorData ? bid.bidResponse.floorData.floorRuleValue : undefined) : undefined),
     });
     return partnerBids;
   }, [])
 }
 
+function getSizesForAdUnit(adUnit, adUnitId) {
+  var bid = Object.values(adUnit.bids).filter((bid) => !!bid.bidResponse && bid.bidResponse.mediaType === 'native')[0];
+  if (!!bid || (bid === undefined && adUnit.dimensions.length === 0)) {
+    return ['1x1'];
+  } else {
+    return adUnit.dimensions.map(function (e) {
+      return e[0] + 'x' + e[1];
+    })
+  }
+}
+
+function getAdUnitAdFormats(adUnit) {
+  var af = adUnit ? Object.keys(adUnit.mediaTypes).map(format => MEDIATYPE[format.toUpperCase()]) : [];
+  return af;
+}
+
+function getAdUnit(adUnits, adUnitId) {
+  return adUnits.filter(adUnit => (adUnit.divID && adUnit.divID == adUnitId) || (adUnit.code == adUnitId))[0];
+}
 function executeBidsLoggerCall(e, highestCpmBids) {
   let auctionId = e.auctionId;
   let referrer = config.getConfig('pageUrl') || cache.auctions[auctionId].referer || '';
   let auctionCache = cache.auctions[auctionId];
-  let outputObj = { s: [] };
+  let floorData = auctionCache.floorData;
+  let outputObj = {
+    s: []
+  };
   let pixelURL = END_POINT_BID_LOGGER;
 
   if (!auctionCache) {
@@ -218,19 +313,29 @@ function executeBidsLoggerCall(e, highestCpmBids) {
   outputObj['tst'] = Math.round((new window.Date()).getTime() / 1000);
   outputObj['pid'] = '' + profileId;
   outputObj['pdvid'] = '' + profileVersionId;
+  outputObj['dvc'] = {'plt': getDevicePlatform()};
+  outputObj['tgid'] = (function() {
+    var testGroupId = parseInt(config.getConfig('testGroupId') || 0);
+    if (testGroupId <= 15 && testGroupId >= 0) {
+      return testGroupId;
+    }
+    return 0;
+  })();
 
-  // GDPR support
-  if (auctionCache.gdprConsent) {
-    outputObj['cns'] = auctionCache.gdprConsent.consentString || '';
-    outputObj['gdpr'] = auctionCache.gdprConsent.gdprApplies === true ? 1 : 0;
-    pixelURL += '&gdEn=1';
+  if (!!floorData) {
+    outputObj['fmv'] = floorData.floorRequestData ? floorData.floorRequestData.modelVersion || undefined : undefined;
+    outputObj['ft'] = floorData.floorResponseData ? (floorData.floorResponseData.enforcements.enforceJS == false ? 0 : 1) : undefined;
   }
 
   outputObj.s = Object.keys(auctionCache.adUnitCodes).reduce(function(slotsArray, adUnitId) {
     let adUnit = auctionCache.adUnitCodes[adUnitId];
+    let origAdUnit = getAdUnit(auctionCache.origAdUnits, adUnitId);
     let slotObject = {
       'sn': adUnitId,
-      'sz': adUnit.dimensions.map(e => e[0] + 'x' + e[1]),
+      'au': origAdUnit.adUnitId || adUnitId,
+      'mt': getAdUnitAdFormats(origAdUnit),
+      'sz': getSizesForAdUnit(adUnit, adUnitId),
+      'fskp': floorData ? (floorData.floorRequestData ? (floorData.floorRequestData.skipped == false ? 0 : 1) : undefined) : undefined,
       'ps': gatherPartnerBidsForAdUnitForLogger(adUnit, adUnitId, highestCpmBids.filter(bid => bid.adUnitCode === adUnitId))
     };
     slotsArray.push(slotObject);
@@ -242,8 +347,7 @@ function executeBidsLoggerCall(e, highestCpmBids) {
   ajax(
     pixelURL,
     null,
-    'json=' + enc(JSON.stringify(outputObj)),
-    {
+    'json=' + enc(JSON.stringify(outputObj)), {
       contentType: 'application/x-www-form-urlencoded',
       withCredentials: true,
       method: 'POST'
@@ -254,35 +358,38 @@ function executeBidsLoggerCall(e, highestCpmBids) {
 function executeBidWonLoggerCall(auctionId, adUnitId) {
   const winningBidId = cache.auctions[auctionId].adUnitCodes[adUnitId].bidWon;
   const winningBid = cache.auctions[auctionId].adUnitCodes[adUnitId].bids[winningBidId];
+  const adapterName = getAdapterNameForAlias(winningBid.bidder);
+  var origAdUnit = getAdUnit(cache.auctions[auctionId].origAdUnits, adUnitId).adUnitId || adUnitId;
   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 += '&bidid=' + enc(winningBidId);
+  pixelURL += '&bidid=' + enc(winningBid.bidId);
   pixelURL += '&pid=' + enc(profileId);
   pixelURL += '&pdvid=' + enc(profileVersionId);
   pixelURL += '&slot=' + enc(adUnitId);
-  pixelURL += '&pn=' + enc(winningBid.bidder);
+  pixelURL += '&au=' + enc(origAdUnit);
+  pixelURL += '&pn=' + enc(adapterName);
+  pixelURL += '&bc=' + enc(winningBid.bidder);
   pixelURL += '&en=' + enc(winningBid.bidResponse.bidPriceUSD);
   pixelURL += '&eg=' + enc(winningBid.bidResponse.bidGrossCpmUSD);
-  pixelURL += '&kgpv=' + enc(winningBid.params.kgpv || adUnitId);
+  pixelURL += '&kgpv=' + enc(getValueForKgpv(winningBid, adUnitId));
+  pixelURL += '&piid=' + enc(winningBid.bidResponse.partnerImpId || EMPTY_STRING);
   ajax(
     pixelURL,
     null,
-    null,
-    {
+    null, {
       contentType: 'application/x-www-form-urlencoded',
       withCredentials: true,
       method: 'GET'
     }
   );
 }
-
 /// /////////// ADAPTER EVENT HANDLER FUNCTIONS //////////////
 
 function auctionInitHandler(args) {
-  s2sBidders = (function() {
+  s2sBidders = (function () {
     let s2sConf = config.getConfig('s2sConfig');
     return (s2sConf && utils.isArray(s2sConf.bidders)) ? s2sConf.bidders : [];
   }());
@@ -292,12 +399,13 @@ function auctionInitHandler(args) {
     'bidderDonePendingCount', () => args.bidderRequests.length,
   ]);
   cacheEntry.adUnitCodes = {};
+  cacheEntry.origAdUnits = args.adUnits;
+  cacheEntry.floorData = {};
   cacheEntry.referer = args.bidderRequests[0].refererInfo.referer;
   cache.auctions[args.auctionId] = cacheEntry;
 }
 
 function bidRequestedHandler(args) {
-  cache.auctions[args.auctionId].gdprConsent = args.gdprConsent || undefined;
   args.bids.forEach(function(bid) {
     if (!cache.auctions[args.auctionId].adUnitCodes.hasOwnProperty(bid.adUnitCode)) {
       cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode] = {
@@ -307,6 +415,9 @@ function bidRequestedHandler(args) {
       };
     }
     cache.auctions[args.auctionId].adUnitCodes[bid.adUnitCode].bids[bid.bidId] = copyRequiredBidDetails(bid);
+    if (bid.floorData) {
+      cache.auctions[args.auctionId].floorData['floorRequestData'] = bid.floorData;
+    }
   })
 }
 
@@ -316,6 +427,12 @@ function bidResponseHandler(args) {
     utils.logError(LOG_PRE_FIX + 'Could not find associated bid request for bid response with requestId: ', args.requestId);
     return;
   }
+
+  if (args.floorData) {
+    cache.auctions[args.auctionId].floorData['floorResponseData'] = args.floorData;
+  }
+
+  bid.bidId = args.adId;
   bid.source = formatSource(bid.source || args.source);
   setBidStatus(bid, args);
   bid.clientLatencyTimeMs = Date.now() - cache.auctions[args.auctionId].timestamp;
@@ -357,7 +474,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 ];
+    let bid = auctionCache.adUnitCodes[badBid.adUnitCode].bids[badBid.bidId || badBid.requestId];
     if (bid) {
       bid.status = ERROR;
       bid.error = {
@@ -371,7 +488,9 @@ function bidTimeoutHandler(args) {
 
 /// /////////// ADAPTER DEFINITION //////////////
 
-let baseAdapter = adapter({analyticsType: 'endpoint'});
+let baseAdapter = adapter({
+  analyticsType: 'endpoint'
+});
 let pubmaticAdapter = Object.assign({}, baseAdapter, {
 
   enableAnalytics(conf = {}) {
@@ -408,7 +527,10 @@ let pubmaticAdapter = Object.assign({}, baseAdapter, {
     baseAdapter.disableAnalytics.apply(this, arguments);
   },
 
-  track({eventType, args}) {
+  track({
+    eventType,
+    args
+  }) {
     switch (eventType) {
       case CONSTANTS.EVENTS.AUCTION_INIT:
         auctionInitHandler(args);
diff --git a/modules/pubmaticAutoRefresh.js b/modules/pubmaticAutoRefresh.js
new file mode 100644
index 00000000000..ac2640a098e
--- /dev/null
+++ b/modules/pubmaticAutoRefresh.js
@@ -0,0 +1,395 @@
+// This module will work with GPT only.
+// The module will refresh the GPT ad-slots as per the given config.
+
+// Todo
+// move strings (key names) to local consts
+// review the all logs, remove unnecessary ones
+// logMessage vs logInfo vs logWarn
+
+// we should pass GAM creative detail like campaignId, lineItemId, adverttiserId to excludeCallbackFunction
+// so excludeCallbackFunction should execute only once after render not after visibility change
+// after render check the value and cache it  defaults to false (not excluded)
+// after visibility change check from cache
+// - use slots[0].getSlotId().getId() to cache the exclusion-check-value
+// reset the value after render
+// document it! with example try it!
+
+import { config } from '../src/config.js';
+import * as events from '../src/events.js';
+import { EVENTS } from '../src/constants.json';
+import { mergeDeep, logMessage, logWarn, pick, timestamp, isFn, isArray } from '../src/utils.js';
+import { getGlobal } from '../src/prebidGlobal.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const MODULE_NAME = 'pubmaticAutoRefresh';
+const isOpenWrapSetup = true;
+
+let beforeRequestBidsHandlerAdded = false;
+let pbjsAuctionTimeoutFromLastAuction;
+let excludedGptSlotNames = {};
+let pbjsAdUnits = {};
+
+let pbjsSetup = {
+  callbackFunction: function(gptSlotName, gptSlot, pbjsAdUnit, KeyValuePairs) {
+    // todo: pick only required fields from the pbjsAdUnit
+
+    logMessage(MODULE_NAME, 'time to refresh', gptSlotName, gptSlot, pbjsAdUnit);
+
+    // set the key-value pairs for auto-refresh functionality
+    Object.keys(KeyValuePairs).forEach(key => gptSlot.setTargeting(key, KeyValuePairs[key]));
+
+    let adServerInitiated = false;
+
+    let sendAdserverRequest = function() {
+      if (adServerInitiated === true) {
+        logMessage(MODULE_NAME, 'function sendAdserverRequest already called for', gptSlotName);
+        return;
+      }
+      adServerInitiated = true;
+      logMessage(MODULE_NAME, 'refreshing GPT slot', gptSlotName);
+      window.googletag.pubads().refresh([gptSlot]);
+    }
+
+    getGlobal().requestBids({
+      timeout: pbjsAuctionTimeoutFromLastAuction,
+      adUnits: [pbjsAdUnit],
+      bidsBackHandler: function() {
+        logMessage(MODULE_NAME, 'In bidsBackHandler for', gptSlotName);
+        getGlobal().setTargetingForGPTAsync([pbjsAdUnit.code]);
+        sendAdserverRequest();
+      }
+    });
+
+    // to make sure we call sendAdserverRequest even when PrebidJS fails to execute bidsBackHandler
+    setTimeout(sendAdserverRequest, pbjsAuctionTimeoutFromLastAuction + 100)
+  },
+
+  gptSlotToPbjsAdUnitMapFunction: function(gptSlotName, gptSlot, pbjsAU) {
+    return (gptSlot.getAdUnitPath() === pbjsAU.code || gptSlot.getSlotElementId() === pbjsAU.code)
+  }
+};
+
+let openWrapSetup = {
+  callbackFunction: function(gptSlotName, gptSlot, pbjsAdUnit, KeyValuePairs) {
+    // todo: pick only required fields from the pbjsAdUnit
+
+    logMessage(MODULE_NAME, 'time to refresh', gptSlotName, gptSlot);
+
+    // set the key-value pairs for auto-refresh functionality
+    Object.keys(KeyValuePairs).forEach(key => gptSlot.setTargeting(key, KeyValuePairs[key]));
+
+    let adServerInitiated = false;
+
+    let sendAdserverRequest = function() {
+      if (adServerInitiated === true) {
+        logMessage(MODULE_NAME, 'function sendAdserverRequest already called for', gptSlotName);
+        return;
+      }
+      adServerInitiated = true;
+      logMessage(MODULE_NAME, 'refreshing GPT slot', gptSlotName);
+      window.googletag.pubads().refresh([gptSlot]);
+    }
+
+    // remove old KVs
+    if(isFn(PWT.removeKeyValuePairsFromGPTSlots) == true){
+      PWT.removeKeyValuePairsFromGPTSlots([gptSlot]);  
+    }
+    
+    if(isFn(PWT.requestBids) == true){
+      PWT.requestBids(
+          PWT.generateConfForGPT([gptSlot]),
+          function(adUnitsArray) {
+              PWT.addKeyValuePairsToGPTSlots(adUnitsArray);
+              sendAdserverRequest();
+          }
+      );  
+    } else {
+      sendAdserverRequest();
+    }    
+
+    // to make sure we call sendAdserverRequest even when PrebidJS fails to execute bidsBackHandler
+    setTimeout(sendAdserverRequest, pbjsAuctionTimeoutFromLastAuction + 100)
+  },
+
+  gptSlotToPbjsAdUnitMapFunction: function(gptSlotName, gptSlot, pbjsAU) {
+    return gptSlot.getSlotElementId() === pbjsAU.code
+  }
+};
+
+let DEFAULT_CONFIG = {
+  enabled: false,
+  // how many times we should refresh the ad-gptSlot after it is rendered
+  maximumRefreshCount: 999,
+  // delay in ms after which the gptSlot to refresh
+  countdownDuration: 30000,
+  // countdown to refresh will start when rendered creative has visbibility more(or equal) than this
+  startCountdownWithMinimumViewabilityPercentage: 50,
+  // set it to 0 to refresh all gptSlots w/o visibility percentage check
+  refreshAdSlotWithMinimumViewabilityPercentage: 50,
+  // this key will be added on gptSlot with kvValueForRefresh value; set it to null to not set it
+  kvKeyForRefresh: 'pm-auto-refresh',
+  // this value will be added for the key kvKeyForRefresh on the gptSlot
+  kvValueForRefresh: '1',
+  // this key will be added on the gptSlot and its value will be the refresh count; set it to null to not set it
+  kvKeyForRefreshCount: 'pm-auto-refresh-count',
+  // a function; the default callback function
+  callbackFunction: isOpenWrapSetup ? openWrapSetup.callbackFunction : pbjsSetup.callbackFunction,
+  // a function; if you are using customConfig for some gptSlots then we need a way to find name of the gptSlot in customConfig
+  slotIdFunctionForCustomConfig: function(gptSlot) {
+    return gptSlot.getSlotElementId();
+  },
+  // a function; this function will help find the GPT gptSlots matching PBJS AdUnit
+  gptSlotToPbjsAdUnitMapFunction: isOpenWrapSetup ? openWrapSetup.gptSlotToPbjsAdUnitMapFunction : pbjsSetup.gptSlotToPbjsAdUnitMapFunction,
+  // a function; if the following function returns true then we will ignore the gptSlot and not try to refresh it
+  excludeCallbackFunction: function(gptSlotName, gptSlot, event) {
+    // first check if gptSlotName is present in CONFIG.excludeSlotIds array
+    if (isArray(CONFIG.excludeSlotIds) && CONFIG.excludeSlotIds.indexOf(gptSlotName) !== -1) {
+      logMessage(MODULE_NAME, 'Excluding ', gptSlotName, 'as per CONFIG.excludeSlotIds,', CONFIG.excludeSlotIds);
+      return true;
+    }
+
+    if (isArray(CONFIG.excludeSizes)) {
+      const gptSlotSizes = gptSlot.getSizes(window.innerWidth, window.innerHeight).map(e => e.width + 'x' + e.height);
+      const found = gptSlotSizes.some(size => CONFIG.excludeSizes.indexOf(size) !== -1);
+      if (found === true) {
+        logMessage(MODULE_NAME, 'Excluding ', gptSlotName,
+          'with sizes,', gptSlotSizes,
+          'as per CONFIG.excludeSizes,', CONFIG.excludeSizes);
+        return true;
+      }
+    }
+
+    return false;
+  },
+  // an array; in excludeCallbackFunction we will look into this array for gptSlotId if found then the gptSlot will be ignored
+  excludeSlotIds: undefined,
+  // an array; in excludeCallbackFunction we will look into this array for gptSlot size WxH (300x250) if found then the gptSlot will be ignored
+  excludeSizes: undefined,
+  // an object of objects;
+  customConfig: undefined // will be an object for custom logic per gptSlot
+};
+
+let DEFAULT_SLOT_CONFIG = {}; // this will be set from the CONFIG
+// this object will hold the run-time config to be used after merging input-config and default-config
+let CONFIG = {};
+let DataStore = {};
+
+function getSlotLevelConfig(gptSlotName) {
+  if (CONFIG.customConfig === undefined) {
+    return DEFAULT_SLOT_CONFIG;
+  }
+
+  if (isFn(CONFIG.customConfig.hasOwnProperty) === false) {
+    return DEFAULT_SLOT_CONFIG;
+  }
+
+  if (CONFIG.customConfig.hasOwnProperty(gptSlotName) === false) {
+    return DEFAULT_SLOT_CONFIG;
+  }
+
+  return mergeDeep({}, DEFAULT_SLOT_CONFIG, CONFIG.customConfig[gptSlotName])
+}
+
+function createDefaultDbEntry() {
+  return {
+    lastRenderedAt: timestamp(),
+    lastVisibilityChangedAt: -1,
+    renderedCount: 0,
+    inViewPercentage: 0,
+    refreshRequested: false
+  };
+}
+
+function getDataStoreEntry(gptSlotName) {
+  let dsEntry = DataStore[gptSlotName] || null;
+  if (dsEntry === null) {
+    logMessage(MODULE_NAME, 'DataStore entry not found for', gptSlotName);
+  }
+  return dsEntry
+}
+
+function refreshSlotIfNeeded(gptSlotName, gptSlot, dsEntry, slotConf) {
+  if (dsEntry === null) {
+    logMessage(MODULE_NAME, gptSlotName, ': not refreshing since the gptSlot details are not found in local db');
+    return
+  }
+
+  if (dsEntry['inViewPercentage'] < slotConf.refreshAdSlotWithMinimumViewabilityPercentage) {
+    logMessage(MODULE_NAME, gptSlotName, ': not refreshing since the inViewPercentage is less than default minimum view percentage');
+    return
+  }
+
+  if (timestamp() - dsEntry['counterStartedAt'] < (slotConf.countdownDuration)) {
+    logMessage(MODULE_NAME, gptSlotName, ': not refreshing since the countdownDuration is not reached.');
+    return
+  }
+
+  if (dsEntry['refreshRequested'] === true) {
+    logMessage(MODULE_NAME, gptSlotName, ': not refreshing since the gptSlot refresh request is in progress');
+    return
+  }
+
+  // find the pbjsAdUnit and pass it
+  let pbjsAdUnit = find( Object.keys(pbjsAdUnits).map(code => pbjsAdUnits[code]) ,
+    pbjsAU => slotConf.gptSlotToPbjsAdUnitMapFunction(gptSlotName, gptSlot, pbjsAU)
+  ) || null;
+
+  if (pbjsAdUnit === null) {
+    logMessage(MODULE_NAME, gptSlotName, ': not refreshing since the matching pbjsAdUnit was not found');
+    return;
+  }
+
+  // generate KVs to be added for auto-refresh functionality
+  let KeyValuePairs = {};
+  KeyValuePairs[slotConf['kvKeyForRefresh']] = slotConf['kvValueForRefresh'];
+  KeyValuePairs[slotConf['kvKeyForRefreshCount']] = dsEntry['renderedCount']; // this is the Nth refresh
+
+  dsEntry['refreshRequested'] = true;
+
+  slotConf.callbackFunction(gptSlotName, gptSlot, pbjsAdUnit, KeyValuePairs);
+}
+
+function isGptSlotMaxRefreshCountReached(gptSlotName, currentRenderedCount, confMaxRefreshCount) {
+  if (currentRenderedCount >= (confMaxRefreshCount + 1)) {
+    return true;
+  }
+  return false;
+}
+
+function gptSlotRenderEndedHandler(event) {
+  let gptSlot = event.slot;
+  const gptSlotName = CONFIG.slotIdFunctionForCustomConfig(gptSlot);
+
+  // logMessage(MODULE_NAME, 'gptSlotRenderEndedHandler: gptSlotName', gptSlotName);
+
+  // delete exclusion entry and revaluate
+  delete excludedGptSlotNames[gptSlotName];
+
+  if (isFn(CONFIG.excludeCallbackFunction) && CONFIG.excludeCallbackFunction(gptSlotName, gptSlot, event) === true) {
+    excludedGptSlotNames[gptSlotName] = true;
+    logMessage(MODULE_NAME, 'Excluding the gptSlotName', gptSlotName,
+      'from auto-refreshing as per config.excludeCallbackFunction. gptSlot:', gptSlot);
+    return;
+  }
+
+  DataStore[gptSlotName] = DataStore[gptSlotName] || createDefaultDbEntry();
+  let dsEntry = getDataStoreEntry(gptSlotName);
+  dsEntry['lastRenderedAt'] = timestamp();
+  dsEntry['renderedCount']++;
+  dsEntry['inViewPercentage'] = 0;
+  dsEntry['refreshRequested'] = false;
+  dsEntry['hasCounterStarted'] = false;
+  dsEntry['counterStartedAt'] = -1;
+
+  const slotConf = getSlotLevelConfig(gptSlotName);
+
+  if (isGptSlotMaxRefreshCountReached(gptSlotName, dsEntry['renderedCount'], slotConf.maximumRefreshCount) === true) {
+    return;
+  }
+
+  if (slotConf.startCountdownWithMinimumViewabilityPercentage === 0) {
+    dsEntry['hasCounterStarted'] = true;
+    dsEntry['counterStartedAt'] = timestamp();
+    logMessage(MODULE_NAME, 'started the countdown to refresh slot', gptSlotName, 'after rendering the creative.');
+    setTimeout(function() {
+      refreshSlotIfNeeded(gptSlotName, gptSlot, dsEntry, slotConf);
+    }, slotConf.countdownDuration);
+  }
+}
+
+function gptSlotVisibilityChangedHandler(event) {
+  let gptSlot = event.slot;
+  const gptSlotName = CONFIG.slotIdFunctionForCustomConfig(gptSlot);
+  const slotConf = getSlotLevelConfig(gptSlotName);
+  let dsEntry = getDataStoreEntry(gptSlotName);
+
+  // logMessage(MODULE_NAME, 'gptSlotVisibilityChangedHandler: gptSlotName', gptSlotName,
+  //   'event.inViewPercentage', event.inViewPercentage);
+
+  if (excludedGptSlotNames[gptSlotName] === true) {
+    logMessage(MODULE_NAME, 'Excluding the gptSlotName', gptSlotName,
+      'from logging viewability change as per config.excludeCallbackFunction. gptSlot:', gptSlot);
+    return;
+  }
+
+  if (dsEntry === null) {
+    logMessage(MODULE_NAME, 'DS entry not found, nothing to do');
+    return
+  }
+
+  dsEntry['inViewPercentage'] = event.inViewPercentage;
+  dsEntry['lastVisibilityChangedAt'] = timestamp();
+
+  if (isGptSlotMaxRefreshCountReached(gptSlotName, dsEntry['renderedCount'], slotConf.maximumRefreshCount) === true) {
+    return;
+  }
+
+  if (dsEntry['hasCounterStarted'] === false) {
+    if (slotConf.startCountdownWithMinimumViewabilityPercentage <= dsEntry['inViewPercentage']) {
+      dsEntry['hasCounterStarted'] = true;
+      dsEntry['counterStartedAt'] = timestamp();
+      logMessage(MODULE_NAME, 'started the countdown to refresh slot', gptSlotName,
+        'after viewability condition is met. startCountdownWithMinimumViewabilityPercentage',
+        slotConf.startCountdownWithMinimumViewabilityPercentage,
+        ', inViewPercentage', dsEntry['inViewPercentage']);
+      setTimeout(function() {
+        refreshSlotIfNeeded(gptSlotName, gptSlot, dsEntry, slotConf);
+      }, slotConf.countdownDuration);
+    }
+  } else {
+    refreshSlotIfNeeded(gptSlotName, gptSlot, dsEntry, slotConf);
+  }
+}
+
+function applyModuleConfig() {
+  // CONFIG = DEFAULT_CONFIG + Provided module config (higher priority)
+  mergeDeep(CONFIG, DEFAULT_CONFIG, config.getConfig(MODULE_NAME) || {});
+}
+
+function setDefaultSlotConfig() {
+  // Generate default slot config that will be applied if customConfig for a GPT slot is not found
+  DEFAULT_SLOT_CONFIG = pick(CONFIG, [
+    'countdownDuration',
+    'startCountdownWithMinimumViewabilityPercentage',
+    'refreshAdSlotWithMinimumViewabilityPercentage',
+    'maximumRefreshCount',
+    'kvKeyForRefresh',
+    'kvValueForRefresh',
+    'kvKeyForRefreshCount',
+    'callbackFunction',
+    'gptSlotToPbjsAdUnitMapFunction'
+  ]);
+}
+
+function init() {
+  if (beforeRequestBidsHandlerAdded === true) {
+    // BEFORE_REQUEST_BIDS event listener already added, no need to add again
+    return;
+  }
+  beforeRequestBidsHandlerAdded = true;
+
+  applyModuleConfig();
+
+  if (CONFIG.enabled === true) {
+    setDefaultSlotConfig();
+    logMessage(MODULE_NAME, ' applicable Config is :', CONFIG);
+    logMessage(MODULE_NAME, ' applicable DEFAULT_SLOT_CONFIG is :', DEFAULT_SLOT_CONFIG);
+
+    // Add GPT event listeners
+    window.googletag = window.googletag || {cmd: []};
+    window.googletag.cmd.push(function() {
+      window.googletag.pubads().addEventListener('slotRenderEnded', gptSlotRenderEndedHandler);
+      window.googletag.pubads().addEventListener('slotVisibilityChanged', gptSlotVisibilityChangedHandler);
+    });
+  } else {
+    logWarn(MODULE_NAME, 'is included but not enabled.');
+  }
+}
+
+events.on(EVENTS.BEFORE_REQUEST_BIDS, init);
+events.on(EVENTS.AUCTION_INIT, (arg) => {
+  pbjsAuctionTimeoutFromLastAuction = arg.timeout
+  arg.adUnits.forEach(au => {
+    pbjsAdUnits[ au.code ] = au;
+  });
+});
diff --git a/modules/pubmaticAutoRefresh.md b/modules/pubmaticAutoRefresh.md
new file mode 100644
index 00000000000..98c06f2cdba
--- /dev/null
+++ b/modules/pubmaticAutoRefresh.md
@@ -0,0 +1,232 @@
+# pubmaticAutoRefresh
+- This module will work with GPT only.
+- The module will refresh the GPT ad-slots as per the given config.
+- Before refreshing GPT ad-slot, respective PBJS AdUnit is found by the module and new bids are fetched by PBJS and then the GPT ads-lot is refreshed, with a failsafe.
+
+
+# Config
+| Param               | Data type | Default value | Usage |
+|---------------------|-----------|----------------|------------------------------------------|
+| enabled             | boolean   | false | must be set to true to enable the module |
+| maximumRefreshCount | int       | 999 | how many times the slot must be refreshed after it is rendered for the first time |
+| countdownDuration   | int       | 30000 | time in milliseconds|
+| startCountdownWithMinimumViewabilityPercentage | int (0-100) | 50 | the countDown will start when ad-slot will have viewability percenatge more than this. When set to 0 the count-down will start after rendering the creative, even when ad slot is not viewable. |
+| refreshAdSlotWithMinimumViewabilityPercentage | int (0-100) | 50 | the ad slot will be refreshed only if it has viewability percenathge more than this value. When set to 0 the ad-slot will be refreshed even if it is not viewable|
+| kvKeyForRefresh | string | 'pm-auto-refresh' | this key will be added on gptSlot with kvValueForRefresh value; set it to null to not set it |
+| kvValueForRefresh | string | '1' | this value will be added for the key kvKeyForRefresh on the gptSlot |
+| kvKeyForRefreshCount | string | 'pm-auto-refresh-count' | this key will be added on the gptSlot and its value will be the refresh count; set it to null to not set it |
+| slotIdFunctionForCustomConfig | function | `(gpttSlot) => gptSlot.getSlotElementId()` | a function; if you are using customConfig for some gptSlots then we need a way to find name of the gptSlot in customConfig |
+| callbackFunction | function | `(gptSlotName, gptSlot, pbjsAdUnit, KeyValuePairs) => { performs pbjs auction, sets kvs, refreshes GPT slot}` | the default callback function, if you set own callback function then you will need to take care of initiating Prebid auction, setting KVs and refresing GPT slot |
+| gptSlotToPbjsAdUnitMapFunction | function | `(gptSlot) => (gptSlot.getAdUnitPath() === pbjsAU.code || gptSlot.getSlotElementId() === pbjsAU.code)` | this function will help find the GPT gptSlots matching PBJS AdUnit |
+| excludeCallbackFunction | function | `(gptSlotName, gptSlot, event) => { return true if gptSlotName is found in config.excludeSlotIds else return true if gptSlot size is found in config.excludeSizes else return false }` | if this function returns true then we will ignore the gptSlot and not try to refresh it. the lats argument, event, is the GPT's `slotRenderEnded` related data as mentioned at https://developers.google.com/publisher-tag/reference#googletag.events.slotrenderendedevent |
+| excludeSlotIds | array of strings | undefined | in excludeCallbackFunction we will look into this array for gptSlotId if found then the gptSlot will be ignored |
+| excludeSizes | array of strings | undefined | in excludeCallbackFunction we will look into the array of supported sizes for gptSlot size WxH (300x250) if found then the gptSlot will be ignored |
+| customConfig | Object | undefined | if you want to have seperate value for any of the following supported configs for any gptAdSlot then you can enter it here. Supported custom configs ` maximumRefreshCount, countdownDuration, startCountdownWithMinimumViewabilityPercentage, refreshAdSlotWithMinimumViewabilityPercentage, kvKeyForRefresh, kvValueForRefresh, kvKeyForRefreshCount, callbackFunction, gptSlotToPbjsAdUnitMapFunction, excludeCallbackFunction ` Example: `{ 'Div-1' : { maximumRefreshCount: 5 }, 'Div-Top-1': { countdownDuration: 50000 } }` |
+
+
+# Use Cases
+
+- Simply enable the module with default config
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true
+    }
+});
+
+```
+
+- Refresh all GPT ad-slots after every 20 seconds
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        countdownDuration: 20000
+    }
+});
+
+```
+
+- Refresh all GPT ad-slots after 20 seconds, maximum 2 times
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        countdownDuration: 20000,
+        maximumRefreshCount: 2
+    }
+});
+
+```
+
+- Refresh all GPT ad-slots after 20 seconds but only if GPT ad-slot is in view 100%
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        countdownDuration: 20000,
+        refreshAdSlotWithMinimumViewabilityPercentage: 100 // or set to 50 for partially visible        
+    }
+});
+```
+
+
+- Refresh all GPT ad-slots but only after the slot is 100% viewed by the user, refresh after 20 seconds
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        countdownDuration: 20000,
+        startCountdownWithMinimumViewabilityPercentage: 100 // or set to 50 for partially visible        
+    }
+});
+```
+
+- Refresh all GPT ad-slots but only after the slot is 100% viewed by user, refresh after 20 seconds but when GPT ad-slot is 100% in view
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        countdownDuration: 20000,
+        startCountdownWithMinimumViewabilityPercentage: 100, // or set to 50 for partially visible  
+        refreshAdSlotWithMinimumViewabilityPercentage: 100 // or set to 50 for partially visible              
+    }
+});
+```
+
+- Refresh the GPT ad-slots after rendering (even if not viewed) and even when the ad-slot is not in the view
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        startCountdownWithMinimumViewabilityPercentage: 0, // or set to 50 for partially visible  
+        refreshAdSlotWithMinimumViewabilityPercentage: 0 // or set to 50 for partially visible              
+    }
+});
+```
+
+- Do not refresh GPT slot rendering in Div `DIV-100`
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        excludeSlotIds: [ 'Div-100']
+    }
+});
+```
+
+- Do not refresh GPT ad slot with given sizes (if any one size matches then slot will not be refreshed)
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        excludeSizes: [ '300x250', '300x300']
+    }
+});
+```
+
+- Do not refresh GPT ad slot that matches my custom logic
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        excludeCallbackFunction: function(gptSlotName, gptSlot, event){
+        	// gptSlotName is derived as per slotIdFunctionForCustomConfig
+        	// custom logic goes here
+        	// return true to exclude
+        	// return false to not exclude
+        }
+    }
+});
+```
+
+- Do not refresh GPT ad slot if GPT creativeId = 1234, refer https://developers.google.com/publisher-tag/reference#googletag.events.slotrenderendedevent for `event` specification
+
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        excludeCallbackFunction: function(gptSlotName, gptSlot, event){
+            if(event.creativeId === 1234){
+                console.log('excludeCallbackFunction, returning true as creativeId is 1234');
+                return true;
+            }
+            return false;
+        }
+    }
+});
+
+```
+
+- Change key value pairs to be used
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        kvKeyForRefresh: 'autorefresh',
+        kvValueForRefresh: 'true',
+        kvKeyForRefreshCount: 'autorefreshcnt'
+    }
+});
+```
+
+
+- Refresh all ad-slots with default countdownDuration, but for Div-1 and Div-2 use countdownDuration = 10000
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        customConfig: {
+        	'Div-1': {
+        		countdownDuration: 10000
+        	},
+        	'Div-2': {
+        		countdownDuration: 10000
+        	}
+        }
+    }
+});
+```
+
+- Change logic to generate gptSlotName, default is SlotElementId, change it to AdUnitPath. Before making any change please check the current implementation in the module.
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        slotIdFunctionForCustomConfig: function(gptSlot){ 
+            return gptSlot.getAdUnitPath() 
+        }
+    }
+});
+```
+
+- Change logic to find respective PBJS adUnit for my GPT ad-slot, this helps to find relation between gptSlot and pbjsAdUnit. Before making any change please check the current implementation in the module.
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        gptSlotToPbjsAdUnitMapFunction: function(gptSlotName, gptSlot, pbjsAU) {
+            return ( ("PBJS_" + gptSlot.getAdUnitPath()) === pbjsAU.code)
+        }
+    }
+});
+```
+
+- Change Callback function to take control of refreshing GPT ad-slot. Before making any change please check the current implementation in the module.
+```
+pbjs.setConfig({
+    'pubmaticAutoRefresh': {
+        enabled: true,
+        callbackFunction: function(gptSlotName, gptSlot, pbjsAdUnit, KeyValuePairs) {
+            // set KeyValuePairs on gptSlot
+            // init pbjs auction for pbjsAdUnit
+            // after pbjs auction ends call the GAM for gptSlot
+            // you may want to failsafe as well
+        }
+    }
+});
+```
+
+# Drwaback
+- only onle slot is handled at a time
+-  if GAM slot is not filled by any creative (including GAM in-house cratives) then GPT does not trigger the required event hence our module will not be able to refresh such slot
\ No newline at end of file
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
index fd2c9e98643..cdee2506575 100644
--- a/modules/pubmaticBidAdapter.js
+++ b/modules/pubmaticBidAdapter.js
@@ -6,8 +6,8 @@ import { Renderer } from '../src/Renderer.js';
 
 const BIDDER_CODE = 'pubmatic';
 const LOG_WARN_PREFIX = 'PubMatic: ';
-const ENDPOINT = 'https://hbopenbid.pubmatic.com/translator?source=prebid-client';
-const USER_SYNC_URL_IFRAME = 'https://ads.pubmatic.com/AdServer/js/showad.js#PIX&kdntuid=1&p=';
+const ENDPOINT = 'https://hbopenbid.pubmatic.com/translator?source=ow-client';
+const USER_SYNC_URL_IFRAME = 'https://ads.pubmatic.com/AdServer/js/user_sync.html?kdntuid=1&p=';
 const USER_SYNC_URL_IMAGE = 'https://image8.pubmatic.com/AdServer/ImgSync?p=';
 const DEFAULT_CURRENCY = 'USD';
 const AUCTION_TYPE = 1;
@@ -17,7 +17,8 @@ const DEFAULT_WIDTH = 0;
 const DEFAULT_HEIGHT = 0;
 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');
+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 CUSTOM_PARAMS = {
   'kadpageurl': '', // Custom page url
   'gender': '', // User gender
@@ -49,7 +50,8 @@ const VIDEO_CUSTOM_PARAMS = {
   'linearity': DATA_TYPES.NUMBER,
   'placement': DATA_TYPES.NUMBER,
   'minbitrate': DATA_TYPES.NUMBER,
-  'maxbitrate': DATA_TYPES.NUMBER
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
 }
 
 const NATIVE_ASSETS = {
@@ -83,6 +85,12 @@ const NATIVE_ASSET_IMAGE_TYPE = {
   'IMAGE': 3
 }
 
+const MEDIATYPE = {
+  0: BANNER,
+  1: VIDEO,
+  2: NATIVE
+}
+
 // check if title, image can be added with mandatory field default values
 const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
   {
@@ -102,13 +110,17 @@ const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
   }
 ]
 
-const NET_REVENUE = false;
+const NET_REVENUE = true;
 const dealChannelValues = {
   1: 'PMP',
   5: 'PREF',
   6: 'PMPG'
 };
 
+const FLOC_FORMAT = {
+  'EID': 1,
+  'SEGMENT': 2
+}
 // BB stands for Blue BillyWig
 const BB_RENDERER = {
   bootstrapPlayer: function(bid) {
@@ -163,7 +175,6 @@ const BB_RENDERER = {
     return `${pub}-${renderer}`; // NB convention!
   }
 };
-
 let publisherId = 0;
 let isInvalidNativeRequest = false;
 let NATIVE_ASSET_ID_TO_KEY_MAP = {};
@@ -206,6 +217,9 @@ function _cleanSlot(slotName) {
   if (utils.isStr(slotName)) {
     return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
   }
+  if (slotName) {
+    utils.logWarn(BIDDER_CODE + ': adSlot must be a string. Ignoring adSlot');
+  }
   return '';
 }
 
@@ -383,38 +397,30 @@ function _createNativeRequest(params) {
             }
             break;
           case NATIVE_ASSETS.IMAGE.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.IMAGE.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
-                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
-                  mimes: params[key].mimes,
-                  ext: params[key].ext,
-                }
-              };
-            } else {
-              utils.logWarn(LOG_WARN_PREFIX + 'Error: Image sizes is required for native ad: ' + JSON.stringify(params));
-            }
+            assetObj = {
+              id: NATIVE_ASSETS.IMAGE.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                mimes: params[key].mimes,
+                ext: params[key].ext,
+              }
+            };
             break;
           case NATIVE_ASSETS.ICON.KEY:
-            if (params[key].sizes && params[key].sizes.length > 0) {
-              assetObj = {
-                id: NATIVE_ASSETS.ICON.ID,
-                required: params[key].required ? 1 : 0,
-                img: {
-                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
-                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
-                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
-                  ext: params[key].ext
-                }
-              };
-            } else {
-              utils.logWarn(LOG_WARN_PREFIX + 'Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            assetObj = {
+              id: NATIVE_ASSETS.ICON.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                ext: params[key].ext
+              }
             };
             break;
           case NATIVE_ASSETS.VIDEO.KEY:
@@ -532,12 +538,20 @@ function _createBannerRequest(bid) {
   return bannerObj;
 }
 
+export function checkVideoPlacement(videoData, adUnitCode) {
+  // Check for video.placement property. If property is missing display log message.
+  if (!utils.deepAccess(videoData, 'placement')) {
+    utils.logWarn(MSG_VIDEO_PLACEMENT_MISSING + ' for ' + adUnitCode);
+  };
+}
+
 function _createVideoRequest(bid) {
-  var videoData = bid.params.video;
+  var videoData = utils.mergeDeep(utils.deepAccess(bid.mediaTypes, 'video'), bid.params.video);
   var videoObj;
 
   if (videoData !== UNDEFINED) {
     videoObj = {};
+    checkVideoPlacement(videoData, bid.adUnitCode);
     for (var key in VIDEO_CUSTOM_PARAMS) {
       if (videoData.hasOwnProperty(key)) {
         videoObj[key] = _checkParamDataType(key, videoData[key], VIDEO_CUSTOM_PARAMS[key]);
@@ -560,11 +574,6 @@ function _createVideoRequest(bid) {
       utils.logWarn(LOG_WARN_PREFIX + 'Error: Video size params(playersize or w&h) missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
       return videoObj;
     }
-    if (bid.params.video.hasOwnProperty('skippable')) {
-      videoObj.ext = {
-        'video_skippable': bid.params.video.skippable ? 1 : 0
-      };
-    }
   } else {
     videoObj = UNDEFINED;
     utils.logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
@@ -592,6 +601,28 @@ function _addPMPDealsInImpression(impObj, bid) {
   }
 }
 
+function _addDealCustomTargetings(imp, bid) {
+  var dctr = '';
+  var dctrLen;
+  if (bid.params.dctr) {
+    dctr = bid.params.dctr;
+    if (utils.isStr(dctr) && dctr.length > 0) {
+      var arr = dctr.split('|');
+      dctr = '';
+      arr.forEach(val => {
+        dctr += (val.length > 0) ? (val.trim() + '|') : '';
+      });
+      dctrLen = dctr.length;
+      if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
+        dctr = dctr.substring(0, dctrLen - 1);
+      }
+      imp.ext['key_val'] = dctr.trim()
+    } else {
+      utils.logWarn(LOG_WARN_PREFIX + 'Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
+    }
+  }
+}
+
 function _createImpressionObject(bid, conf) {
   var impObj = {};
   var bannerObj;
@@ -613,7 +644,7 @@ function _createImpressionObject(bid, conf) {
   };
 
   _addPMPDealsInImpression(impObj, bid);
-
+  _addDealCustomTargetings(impObj, bid);
   if (bid.hasOwnProperty('mediaTypes')) {
     for (mediaTypes in bid.mediaTypes) {
       switch (mediaTypes) {
@@ -663,6 +694,8 @@ function _createImpressionObject(bid, conf) {
     impObj.banner = bannerObj;
   }
 
+  _addImpressionFPD(impObj, bid);
+
   _addFloorFromFloorModule(impObj, bid);
 
   return impObj.hasOwnProperty(BANNER) ||
@@ -670,6 +703,36 @@ function _createImpressionObject(bid, conf) {
             impObj.hasOwnProperty(VIDEO) ? impObj : UNDEFINED;
 }
 
+function _addImpressionFPD(imp, bid) {
+  const ortb2 = {...utils.deepAccess(bid, 'ortb2Imp.ext.data')};
+  Object.keys(ortb2).forEach(prop => {
+    /**
+      * Prebid AdSlot
+      * @type {(string|undefined)}
+    */
+    if (prop === 'pbadslot') {
+      if (typeof ortb2[prop] === 'string' && ortb2[prop]) utils.deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
+    } else if (prop === 'adserver') {
+      /**
+       * Copy GAM AdUnit and Name to imp
+       */
+      ['name', 'adslot'].forEach(name => {
+        /** @type {(string|undefined)} */
+        const value = utils.deepAccess(ortb2, `adserver.${name}`);
+        if (typeof value === 'string' && value) {
+          utils.deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
+          // copy GAM ad unit id as imp[].ext.dfp_ad_unit_code
+          if (name === 'adslot') {
+            utils.deepSetValue(imp, `ext.dfp_ad_unit_code`, value);
+          }
+        }
+      });
+    } else {
+      utils.deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
+    }
+  });
+}
+
 function _addFloorFromFloorModule(impObj, bid) {
   let bidFloor = -1;
   // get lowest floor from floorModule
@@ -694,29 +757,94 @@ function _addFloorFromFloorModule(impObj, bid) {
   impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : UNDEFINED);
 }
 
+function _getFlocId(validBidRequests, flocFormat) {
+  var flocIdObject = null;
+  var flocId = utils.deepAccess(validBidRequests, '0.userId.flocId');
+  if (flocId && flocId.id) {
+    switch (flocFormat) {
+      case FLOC_FORMAT.SEGMENT:
+        flocIdObject = {
+          id: 'FLOC',
+          name: 'FLOC',
+          ext: {
+            ver: flocId.version
+          },
+          segment: [{
+            id: flocId.id,
+            name: 'chrome.com',
+            value: flocId.id.toString()
+          }]
+        }
+        break;
+      case FLOC_FORMAT.EID:
+      default:
+        flocIdObject = {
+          source: 'chrome.com',
+          uids: [
+            {
+              atype: 1,
+              id: flocId.id,
+              ext: {
+                ver: flocId.version
+              }
+            },
+          ]
+        }
+        break;
+    }
+  }
+  return flocIdObject;
+}
+
+function _handleFlocId(payload, validBidRequests) {
+  var flocObject = _getFlocId(validBidRequests, FLOC_FORMAT.SEGMENT);
+  if (flocObject) {
+    if (!payload.user) {
+      payload.user = {};
+    }
+    if (!payload.user.data) {
+      payload.user.data = [];
+    }
+    payload.user.data.push(flocObject);
+  }
+}
+
 function _handleEids(payload, validBidRequests) {
-  const bidUserIdAsEids = utils.deepAccess(validBidRequests, '0.userIdAsEids');
+  let bidUserIdAsEids = utils.deepAccess(validBidRequests, '0.userIdAsEids');
+  let flocObject = _getFlocId(validBidRequests, FLOC_FORMAT.EID);
+  if (flocObject) {
+    if (!bidUserIdAsEids) {
+      bidUserIdAsEids = [];
+    }
+    bidUserIdAsEids.push(flocObject);
+  }
   if (utils.isArray(bidUserIdAsEids) && bidUserIdAsEids.length > 0) {
     utils.deepSetValue(payload, 'user.eids', bidUserIdAsEids);
   }
 }
 
-function _checkMediaType(adm, newBid) {
+function _checkMediaType(bid, newBid) {
   // Create a regex here to check the strings
-  var admStr = '';
-  var videoRegex = new RegExp(/VAST\s+version/);
-  if (adm.indexOf('span class="PubAPIAd"') >= 0) {
-    newBid.mediaType = BANNER;
-  } else if (videoRegex.test(adm)) {
-    newBid.mediaType = VIDEO;
+  if (bid.ext && bid.ext['bidtype'] != undefined) {
+    newBid.mediaType = MEDIATYPE[bid.ext.bidtype];
   } else {
-    try {
-      admStr = JSON.parse(adm.replace(/\\/g, ''));
-      if (admStr && admStr.native) {
-        newBid.mediaType = NATIVE;
+    utils.logInfo(LOG_WARN_PREFIX + 'bid.ext.bidtype does not exist, checking alternatively for mediaType')
+    var adm = bid.adm;
+    var admStr = '';
+    var videoRegex = new RegExp(/VAST\s+version/);
+    if (adm.indexOf('span class="PubAPIAd"') >= 0) {
+      newBid.mediaType = BANNER;
+    } else if (videoRegex.test(adm)) {
+      newBid.mediaType = VIDEO;
+    } else {
+      try {
+        admStr = JSON.parse(adm.replace(/\\/g, ''));
+        if (admStr && admStr.native) {
+          newBid.mediaType = NATIVE;
+        }
+      } catch (e) {
+        utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
       }
-    } catch (e) {
-      utils.logWarn(LOG_WARN_PREFIX + 'Error: Cannot parse native reponse for ad response: ' + adm);
     }
   }
 }
@@ -806,54 +934,31 @@ function _blockedIabCategoriesValidation(payload, blockedIabCategories) {
   }
 }
 
-function _handleDealCustomTargetings(payload, dctrArr, validBidRequests) {
-  var dctr = '';
-  var dctrLen;
-  // set dctr value in site.ext, if present in validBidRequests[0], else ignore
-  if (dctrArr.length > 0) {
-    if (validBidRequests[0].params.hasOwnProperty('dctr')) {
-      dctr = validBidRequests[0].params.dctr;
-      if (utils.isStr(dctr) && dctr.length > 0) {
-        var arr = dctr.split('|');
-        dctr = '';
-        arr.forEach(val => {
-          dctr += (val.length > 0) ? (val.trim() + '|') : '';
-        });
-        dctrLen = dctr.length;
-        if (dctr.substring(dctrLen, dctrLen - 1) === '|') {
-          dctr = dctr.substring(0, dctrLen - 1);
-        }
-        payload.site.ext = {
-          key_val: dctr.trim()
-        }
-      } else {
-        utils.logWarn(LOG_WARN_PREFIX + 'Ignoring param : dctr with value : ' + dctr + ', expects string-value, found empty or non-string value');
-      }
-      if (dctrArr.length > 1) {
-        utils.logWarn(LOG_WARN_PREFIX + 'dctr value found in more than 1 adunits. Value from 1st adunit will be picked. Ignoring values from subsequent adunits');
-      }
-    } else {
-      utils.logWarn(LOG_WARN_PREFIX + 'dctr value not found in 1st adunit, ignoring values from subsequent adunits');
-    }
-  }
-}
-
-function _assignRenderer(br, request) {
+function _assignRenderer(newBid, request) {
   let bidParams, context, adUnitCode;
   if (request.bidderRequest && request.bidderRequest.bids) {
     for (let bidderRequestBidsIndex = 0; bidderRequestBidsIndex < request.bidderRequest.bids.length; bidderRequestBidsIndex++) {
-      if (request.bidderRequest.bids[bidderRequestBidsIndex].bidId === br.requestId) {
+      if (request.bidderRequest.bids[bidderRequestBidsIndex].bidId === newBid.requestId) {
         bidParams = request.bidderRequest.bids[bidderRequestBidsIndex].params;
         context = request.bidderRequest.bids[bidderRequestBidsIndex].mediaTypes[VIDEO].context;
         adUnitCode = request.bidderRequest.bids[bidderRequestBidsIndex].adUnitCode;
       }
     }
     if (context && context === 'outstream' && bidParams && bidParams.outstreamAU && adUnitCode) {
-      br.rendererCode = bidParams.outstreamAU;
-      br.renderer = BB_RENDERER.newRenderer(br.rendererCode, adUnitCode);
+      newBid.rendererCode = bidParams.outstreamAU;
+      newBid.renderer = BB_RENDERER.newRenderer(newBid.rendererCode, adUnitCode);
     }
   }
-};
+}
+
+function isNonEmptyArray(test) {
+  if (utils.isArray(test) === true) {
+    if (test.length > 0) {
+      return true;
+    }
+  }
+  return false;
+}
 
 export const spec = {
   code: BIDDER_CODE,
@@ -869,26 +974,29 @@ export const spec = {
   isBidRequestValid: bid => {
     if (bid && bid.params) {
       if (!utils.isStr(bid.params.publisherId)) {
-        utils.logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be numeric. Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
+        utils.logWarn(LOG_WARN_PREFIX + 'Error: publisherId is mandatory and cannot be numeric (wrap it in quotes in your config). Call to OpenBid will not be sent for ad unit: ' + JSON.stringify(bid));
         return false;
       }
       // video ad validation
-      if (bid.params.hasOwnProperty('video')) {
-        if (!bid.params.video.hasOwnProperty('mimes') || !utils.isArray(bid.params.video.mimes) || bid.params.video.mimes.length === 0) {
-          utils.logWarn(LOG_WARN_PREFIX + 'Error: For video ads, mimes is mandatory and must specify atlease 1 mime value. Call to OpenBid will not be sent for ad unit:' + JSON.stringify(bid));
+      if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
+        // bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array
+        let mediaTypesVideoMimes = utils.deepAccess(bid.mediaTypes, 'video.mimes');
+        let paramsVideoMimes = utils.deepAccess(bid, 'params.video.mimes');
+        if (isNonEmptyArray(mediaTypesVideoMimes) === false && isNonEmptyArray(paramsVideoMimes) === false) {
+          utils.logWarn(LOG_WARN_PREFIX + 'Error: For video ads, bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array. Call to OpenBid will not be sent for ad unit:' + JSON.stringify(bid));
           return false;
         }
-        if (bid.hasOwnProperty('mediaTypes') && bid.mediaTypes.hasOwnProperty(VIDEO)) {
-          if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
-            utils.logError(`${LOG_WARN_PREFIX}: no context specified in bid. Rejecting bid: `, bid);
-            return false;
-          }
-          if (bid.mediaTypes[VIDEO].context === 'outstream' && !utils.isStr(bid.params.outstreamAU)) {
-            utils.logError(`${LOG_WARN_PREFIX}: for "outstream" bids outstreamAU is required. Rejecting bid: `, bid);
-            return false;
-          }
-        } else {
-          utils.logError(`${LOG_WARN_PREFIX}: mediaTypes or mediaTypes.video is not specified. Rejecting bid: `, bid);
+
+        if (!bid.mediaTypes[VIDEO].hasOwnProperty('context')) {
+          utils.logError(`${LOG_WARN_PREFIX}: no context specified in bid. Rejecting bid: `, bid);
+          return false;
+        }
+
+        if (bid.mediaTypes[VIDEO].context === 'outstream' &&
+          !utils.isStr(bid.params.outstreamAU) &&
+          !bid.hasOwnProperty('renderer') &&
+          !bid.mediaTypes[VIDEO].hasOwnProperty('renderer')) {
+          utils.logError(`${LOG_WARN_PREFIX}: for "outstream" bids either outstreamAU parameter must be provided or ad unit supplied renderer is required. Rejecting bid: `, bid);
           return false;
         }
       }
@@ -960,7 +1068,7 @@ export const spec = {
     payload.ext.wrapper = {};
     payload.ext.wrapper.profile = parseInt(conf.profId) || UNDEFINED;
     payload.ext.wrapper.version = parseInt(conf.verId) || UNDEFINED;
-    payload.ext.wrapper.wiid = conf.wiid || UNDEFINED;
+    payload.ext.wrapper.wiid = conf.wiid || bidderRequest.auctionId;
     // eslint-disable-next-line no-undef
     payload.ext.wrapper.wv = $$REPO_AND_VERSION$$;
     payload.ext.wrapper.transactionId = conf.transactionId;
@@ -974,6 +1082,11 @@ export const spec = {
     payload.site.page = conf.kadpageurl.trim() || payload.site.page.trim();
     payload.site.domain = _getDomainFromURL(payload.site.page);
 
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
     // merge the device from config.getConfig('device')
     if (typeof config.getConfig('device') === 'object') {
       payload.device = Object.assign(payload.device, config.getConfig('device'));
@@ -1008,10 +1121,17 @@ export const spec = {
       utils.deepSetValue(payload, 'regs.coppa', 1);
     }
 
-    _handleDealCustomTargetings(payload, dctrArr, validBidRequests);
     _handleEids(payload, validBidRequests);
     _blockedIabCategoriesValidation(payload, blockedIabCategories);
-
+    _handleFlocId(payload, validBidRequests);
+    // First Party Data
+    const commonFpd = config.getConfig('ortb2') || {};
+    if (commonFpd.site) {
+      utils.mergeDeep(payload, {site: commonFpd.site});
+    }
+    if (commonFpd.user) {
+      utils.mergeDeep(payload, {user: commonFpd.user});
+    }
     // Note: Do not move this block up
     // if site object is set in Prebid config then we need to copy required fields from site into app and unset the site object
     if (typeof config.getConfig('app') === 'object') {
@@ -1019,6 +1139,11 @@ export const spec = {
       // not copying domain from site as it is a derived value from page
       payload.app.publisher = payload.site.publisher;
       payload.app.ext = payload.site.ext || UNDEFINED;
+      // We will also need to pass content object in app.content if app object is also set into the config;
+      // BUT do not use content object from config if content object is present in app as app.content
+      if (typeof payload.app.content !== 'object') {
+        payload.app.content = payload.site.content || UNDEFINED;
+      }
       delete payload.site;
     }
 
@@ -1081,11 +1206,12 @@ export const spec = {
                   br.referrer = parsedReferrer;
                   br.ad = bid.adm;
                   br.pm_seat = seatbidder.seat || null;
-                  br.pm_dspid = bid.ext && bid.ext.dspid ? bid.ext.dspid : null
+                  br.pm_dspid = bid.ext && bid.ext.dspid ? bid.ext.dspid : null;
+                  br.partnerImpId = bid.id || '' // partner impression Id
                   if (requestData.imp && requestData.imp.length > 0) {
                     requestData.imp.forEach(req => {
                       if (bid.impid === req.id) {
-                        _checkMediaType(bid.adm, br);
+                        _checkMediaType(bid, br);
                         switch (br.mediaType) {
                           case BANNER:
                             break;
@@ -1113,6 +1239,7 @@ export const spec = {
                     br.meta.buyerId = bid.ext.advid;
                   }
                   if (bid.adomain && bid.adomain.length > 0) {
+                    br.meta.advertiserDomains = bid.adomain;
                     br.meta.clickUrl = bid.adomain[0];
                   }
                   // adserverTargeting
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
index d7118f393d8..bb20a4ada29 100644
--- a/modules/pubmaticBidAdapter.md
+++ b/modules/pubmaticBidAdapter.md
@@ -24,8 +24,9 @@ var adUnits = [
     bids: [{
       bidder: 'pubmatic',
       params: {
-        publisherId: '156209',               // required
-        adSlot: 'pubmatic_test2',            // optional
+        publisherId: '156209',               // required, must be a string, not an integer or other js type.
+        oustreamAU: 'renderer_test_pubmatic',   // required if mediaTypes-> video-> context is 'outstream' and optional if renderer is defined in adUnits or in mediaType video. This value can be get by BlueBillyWig Team.
+        adSlot: 'pubmatic_test2',            // optional, must be a string, not an integer or other js type.
         pmzoneid: 'zone1, zone11',           // optional
         lat: '40.712775',                    // optional
         lon: '-74.005973',                   // optional
diff --git a/modules/pubmaticServerBidAdapter.js b/modules/pubmaticServerBidAdapter.js
index a6197a9210a..1a706a4242b 100644
--- a/modules/pubmaticServerBidAdapter.js
+++ b/modules/pubmaticServerBidAdapter.js
@@ -3,7 +3,9 @@ import * as ajax from '../src/ajax.js';
 import {userSync} from '../src/userSync.js';
 import { config } from '../src/config.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 const constants = require('../src/constants.json');
+const LOG_WARN_PREFIX = 'PubMatic: ';
 
 const BIDDER_CODE = 'pubmaticServer';
 const ENDPOINT = 'https://ow.pubmatic.com/openrtb/2.5/';
@@ -16,6 +18,29 @@ const IMAGE = 'image';
 const REDIRECT = 'redirect';
 const DEFAULT_VERSION_ID = '0';
 const PUBMATIC_DIGITRUST_KEY = 'nFIn8aLzbd';
+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,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER
+}
 
 const CUSTOM_PARAMS = {
   'kadpageurl': '', // Custom page url
@@ -127,12 +152,54 @@ function _createOrtbTemplate(conf) {
 }
 
 function _createImpressionObject(bid, conf) {
-  return {
+  var mediaTypes = '';
+
+  var impObj = {
     id: bid.bidId,
     tagid: bid.params.adUnitId,
     bidfloor: _parseSlotParam('kadfloor', bid.params.kadfloor),
     secure: 1,
-    banner: {
+    ext: {
+      wrapper: {
+        div: bid.params.divId
+      },
+      bidder: {
+        pubmatic: {
+          pmZoneId: _parseSlotParam('pmzoneid', bid.params.pmzoneid)
+        }
+      }
+    }
+  };
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          var bannerObj = {
+            pos: 0,
+            topframe: utils.inIframe() ? 0 : 1,
+            format: (function() {
+              let arr = [];
+              for (let i = 0, l = bid.sizes.length; i < l; i++) {
+                arr.push({
+                  w: bid.sizes[i][0],
+                  h: bid.sizes[i][1]
+                });
+              }
+              return arr.length > 0 ? arr : UNDEFINED;
+            })()
+          }
+          impObj.banner = bannerObj;
+          break;
+        case VIDEO:
+          var videoObj = _createVideoRequest(bid);
+          if (videoObj !== UNDEFINED) {
+            impObj.video = videoObj;
+          }
+          break;
+      }
+    }
+  } else {
+    bannerObj = {
       pos: 0,
       topframe: utils.inIframe() ? 0 : 1,
       format: (function() {
@@ -145,18 +212,11 @@ function _createImpressionObject(bid, conf) {
         }
         return arr.length > 0 ? arr : UNDEFINED;
       })()
-    },
-    ext: {
-      wrapper: {
-        div: bid.params.divId
-      },
-      bidder: {
-        pubmatic: {
-          pmZoneId: _parseSlotParam('pmzoneid', bid.params.pmzoneid)
-        }
-      }
     }
-  };
+    impObj.banner = bannerObj;
+  }
+  _addImpressionFPD(impObj, bid);
+  return impObj;
 }
 
 function mandatoryParamCheck(paramName, paramValue) {
@@ -326,6 +386,32 @@ function _addExternalUserId(eids, value, source, atype) {
   }
 }
 
+function _addImpressionFPD(imp, bid) {
+  const ortb2 = {...utils.deepAccess(bid, 'ortb2Imp.ext.data')};
+  Object.keys(ortb2).forEach(prop => {
+    /**
+      * Prebid AdSlot
+      * @type {(string|undefined)}
+    */
+    if (prop === 'pbadslot') {
+      if (typeof ortb2[prop] === 'string' && ortb2[prop]) utils.deepSetValue(imp, 'ext.data.pbadslot', ortb2[prop]);
+    } else if (prop === 'adserver') {
+      /**
+       * Copy GAM AdUnit and Name to imp
+       */
+      ['name', 'adslot'].forEach(name => {
+        /** @type {(string|undefined)} */
+        const value = utils.deepAccess(ortb2, `adserver.${name}`);
+        if (typeof value === 'string' && value) {
+          utils.deepSetValue(imp, `ext.data.adserver.${name.toLowerCase()}`, value);
+        }
+      });
+    } else {
+      utils.deepSetValue(imp, `ext.data.${prop}`, ortb2[prop]);
+    }
+  });
+}
+
 function _handleEids(payload, validBidRequests) {
   let eids = [];
   _handleDigitrustId(eids);
@@ -343,14 +429,71 @@ function _handleEids(payload, validBidRequests) {
     _addExternalUserId(eids, utils.deepAccess(bidRequest, `userId.firstpartyid`), 'firstpartyid', 1);
   }
   if (eids.length > 0) {
-    payload.user.ext = {};
+    if (!payload.user.ext) {
+      payload.user.ext = {};
+    }
     payload.user.ext.eids = eids;
   }
 }
 
+function _checkParamDataType(key, value, datatype) {
+  var errMsg = 'Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value;
+  var functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = utils.isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = utils.isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = utils.isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = utils.isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  utils.logWarn(LOG_WARN_PREFIX + errMsg);
+  return UNDEFINED;
+}
+
+function _createVideoRequest(bid) {
+  var videoData = bid.params.video;
+  var videoObj;
+
+  if (videoData !== UNDEFINED) {
+    videoObj = {};
+    for (var key in VIDEO_CUSTOM_PARAMS) {
+      if (videoData.hasOwnProperty(key)) {
+        videoObj[key] = _checkParamDataType(key, videoData[key], VIDEO_CUSTOM_PARAMS[key]);
+      }
+    }
+    // read playersize and assign to h and w.
+    if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0][0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[0][1], 10);
+    } else if (utils.isNumber(bid.mediaTypes.video.playerSize[0])) {
+      videoObj.w = parseInt(bid.mediaTypes.video.playerSize[0], 10);
+      videoObj.h = parseInt(bid.mediaTypes.video.playerSize[1], 10);
+    }
+    if (bid.params.video.hasOwnProperty('skippable')) {
+      videoObj.ext = {
+        'video_skippable': bid.params.video.skippable ? 1 : 0
+      };
+    }
+  } else {
+    videoObj = UNDEFINED;
+    utils.logWarn(LOG_WARN_PREFIX + 'Error: Video config params missing for adunit: ' + bid.params.adUnit + ' with mediaType set as video. Ignoring video impression in the adunit.');
+  }
+  return videoObj;
+}
+
 export const spec = {
   code: BIDDER_CODE,
-
+  supportedMediaTypes: [BANNER, VIDEO],
   /**
   * Determines whether or not the given bid request is valid. Valid bid request must have placementId and hbid
   *
@@ -405,8 +548,14 @@ export const spec = {
       wp: 'pbjs',
       wv: constants.REPO_AND_VERSION,
       // transactionId: conf.transactionId,
-      wiid: conf.wiid || UNDEFINED
+      wiid: conf.wiid || bidderRequest.auctionId
     };
+
+    // AB Test is enabled
+    if (window.PWT && window.PWT.testGroupId && window.PWT.testGroupId === 1) {
+      payload.ext.wrapper['abtest'] = 1;
+    }
+
     payload.source = {
       tid: conf.transactionId
     };
@@ -517,9 +666,19 @@ export const spec = {
                         mi: miObj.hasOwnProperty(summary.bidder) ? miObj[summary.bidder] : UNDEFINED,
                         regexPattern: summary.regex || undefined
                       }
+                      if (bid.ext.crtype) {
+                        switch (bid.ext.crtype) {
+                          case 'video':
+                            newBid.vastXml = bid.adm;
+                        }
+                        newBid.mediaType = bid.ext.crtype;
+                      }
                       if (bid.ext.prebid && bid.ext.prebid.targeting) {
                         newBid.adserverTargeting = bid.ext.prebid.targeting
                       }
+                      if (newBid && newBid.originalBidder == 'pubmatic') {
+                        newBid.sspID = bid.id || '';
+                      }
                       break;
                     default:
                       requestData.imp.forEach(function(impObj) {
diff --git a/modules/pubperfAnalyticsAdapter.js b/modules/pubperfAnalyticsAdapter.js
new file mode 100644
index 00000000000..800ea1cd550
--- /dev/null
+++ b/modules/pubperfAnalyticsAdapter.js
@@ -0,0 +1,36 @@
+/**
+ * Analytics Adapter for Pubperf
+ */
+
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import * as utils from '../src/utils.js';
+
+var pubperfAdapter = adapter({
+  global: 'pubperf_pbjs',
+  analyticsType: 'bundle',
+  handler: 'on'
+});
+
+pubperfAdapter.originEnableAnalytics = pubperfAdapter.enableAnalytics;
+
+pubperfAdapter.enableAnalytics = config => {
+  if (!config || !config.provider || config.provider !== 'pubperf') {
+    utils.logError('expected config.provider to equal pubperf');
+    return;
+  }
+  if (!window['pubperf_pbjs']) {
+    utils.logError(
+      `Make sure that Pubperf tag from https://www.pubperf.com is included before the Prebid configuration.`
+    );
+    return;
+  }
+  pubperfAdapter.originEnableAnalytics(config);
+}
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pubperfAdapter,
+  code: 'pubperf'
+});
+
+export default pubperfAdapter;
diff --git a/modules/pubperfAnalyticsAdapter.md b/modules/pubperfAnalyticsAdapter.md
new file mode 100644
index 00000000000..50ac3691dda
--- /dev/null
+++ b/modules/pubperfAnalyticsAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+
+```
+Module Name: Pubperf Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: support@transfon.com
+```
+
+# Description
+
+Transfon's pubperf analytics adaptor allows you to view detailed auction and prebid information in Meridian. Contact support@transfon.com for more information or to sign up for analytics.
+
+For more information, please visit https://www.pubperf.com.
+
+
+# Sample pubperf tag to be placed before prebid tag
+
+```
+(function(i, s, o, g, r, a, m, z) {i['pubperf_pbjs'] = r;i[r] = i[r] || function() {z = Array.prototype.slice.call(arguments);z.unshift(+new Date());(i[r].q = i[r].q || []).push(z)}, i[r].t = 1, i[r].l = 1 * new Date();a = s.createElement(o),m = s.getElementsByTagName(o)[0];a.async = 1;a.src = g;m.parentNode.insertBefore(a, m)})(window, document, 'script', 'https://t.pubperf.com/t/b5a635e307.js', 'pubperf_pbjs');
+```
+
+# Test Parameters
+```
+{
+  provider: 'pubperf'
+}
+```
diff --git a/modules/pubwiseAnalyticsAdapter.js b/modules/pubwiseAnalyticsAdapter.js
index 915aeb58f99..fe217454b88 100644
--- a/modules/pubwiseAnalyticsAdapter.js
+++ b/modules/pubwiseAnalyticsAdapter.js
@@ -4,7 +4,6 @@ import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import { getStorageManager } from '../src/storageManager.js';
 const utils = require('../src/utils.js');
-
 const storage = getStorageManager();
 
 /****
@@ -17,30 +16,54 @@ const storage = getStorageManager();
  pbjs.enableAnalytics({
   provider: 'pubwise',
   options: {
-    site: 'test-test-test-test',
-    endpoint: 'https://api.pubwise.io/api/v4/event/add/',
+    site: 'b1ccf317-a6fc-428d-ba69-0c9c208aa61c'
   }
  });
- */
+
+Changes in 4.0 Version
+4.0.1 - Initial Version for Prebid 4.x, adds activationId, adds additiona testing, removes prebid global in favor of a prebid.version const
+4.0.2 - Updates to include dedicated default site to keep everything from getting rate limited
+
+*/
 
 const analyticsType = 'endpoint';
-const analyticsName = 'PubWise Analytics: ';
-let defaultUrl = 'https://api.pubwise.io/api/v4/event/default/';
-let pubwiseVersion = '3.0';
-let pubwiseSchema = 'AVOCET';
-let configOptions = {site: '', endpoint: 'https://api.pubwise.io/api/v4/event/default/', debug: ''};
+const analyticsName = 'PubWise:';
+const prebidVersion = '$prebid.version$';
+let pubwiseVersion = '4.0.1';
+let configOptions = {site: '', endpoint: 'https://api.pubwise.io/api/v5/event/add/', debug: null};
 let pwAnalyticsEnabled = false;
 let utmKeys = {utm_source: '', utm_medium: '', utm_campaign: '', utm_term: '', utm_content: ''};
+let sessionData = {sessionId: '', activationId: ''};
+let pwNamespace = 'pubwise';
+let pwEvents = [];
+let metaData = {};
+let auctionEnded = false;
+let sessTimeout = 60 * 30 * 1000; // 30 minutes, G Analytics default session length
+let sessName = 'sess_id';
+let sessTimeoutName = 'sess_timeout';
 
-function markEnabled() {
-  utils.logInfo(`${analyticsName}Enabled`, configOptions);
-  pwAnalyticsEnabled = true;
+function enrichWithSessionInfo(dataBag) {
+  try {
+    // eslint-disable-next-line
+    // console.log(sessionData);
+    dataBag['session_id'] = sessionData.sessionId;
+    dataBag['activation_id'] = sessionData.activationId;
+  } catch (e) {
+    dataBag['error_sess'] = 1;
+  }
+
+  return dataBag;
 }
 
 function enrichWithMetrics(dataBag) {
   try {
+    if (window.PREBID_TIMEOUT) {
+      dataBag['target_timeout'] = window.PREBID_TIMEOUT;
+    } else {
+      dataBag['target_timeout'] = 'NA';
+    }
     dataBag['pw_version'] = pubwiseVersion;
-    dataBag['pbjs_version'] = $$PREBID_GLOBAL$$.version;
+    dataBag['pbjs_version'] = prebidVersion;
     dataBag['debug'] = configOptions.debug;
   } catch (e) {
     dataBag['error_metric'] = 1;
@@ -54,7 +77,7 @@ function enrichWithUTM(dataBag) {
   try {
     for (let prop in utmKeys) {
       utmKeys[prop] = utils.getParameterByName(prop);
-      if (utmKeys[prop] != '') {
+      if (utmKeys[prop]) {
         newUtm = true;
         dataBag[prop] = utmKeys[prop];
       }
@@ -62,70 +85,253 @@ function enrichWithUTM(dataBag) {
 
     if (newUtm === false) {
       for (let prop in utmKeys) {
-        let itemValue = storage.getDataFromLocalStorage(`pw-${prop}`);
-        if (itemValue.length !== 0) {
+        let itemValue = storage.getDataFromLocalStorage(setNamespace(prop));
+        if (itemValue !== null && typeof itemValue !== 'undefined' && itemValue.length !== 0) {
           dataBag[prop] = itemValue;
         }
       }
     } else {
       for (let prop in utmKeys) {
-        storage.setDataInLocalStorage(`pw-${prop}`, utmKeys[prop]);
+        storage.setDataInLocalStorage(setNamespace(prop), utmKeys[prop]);
       }
     }
   } catch (e) {
-    utils.logInfo(`${analyticsName}Error`, e);
+    pwInfo(`Error`, e);
     dataBag['error_utm'] = 1;
   }
   return dataBag;
 }
 
-function sendEvent(eventType, data) {
-  utils.logInfo(`${analyticsName}Event ${eventType} ${pwAnalyticsEnabled}`, data);
+function expireUtmData() {
+  pwInfo(`Session Expiring UTM Data`);
+  for (let prop in utmKeys) {
+    storage.removeDataFromLocalStorage(setNamespace(prop));
+  }
+}
+
+function enrichWithCustomSegments(dataBag) {
+  // c_script_type: '', c_slot1: '', c_slot2: '', c_slot3: '', c_slot4: ''
+  if (configOptions.custom) {
+    if (configOptions.custom.c_script_type) {
+      dataBag['c_script_type'] = configOptions.custom.c_script_type;
+    }
+
+    if (configOptions.custom.c_host) {
+      dataBag['c_host'] = configOptions.custom.c_host;
+    }
+
+    if (configOptions.custom.c_slot1) {
+      dataBag['c_slot1'] = configOptions.custom.c_slot1;
+    }
+
+    if (configOptions.custom.c_slot2) {
+      dataBag['c_slot2'] = configOptions.custom.c_slot2;
+    }
+
+    if (configOptions.custom.c_slot3) {
+      dataBag['c_slot3'] = configOptions.custom.c_slot3;
+    }
+
+    if (configOptions.custom.c_slot4) {
+      dataBag['c_slot4'] = configOptions.custom.c_slot4;
+    }
+  }
+
+  return dataBag;
+}
+
+function setNamespace(itemText) {
+  return pwNamespace.concat('_' + itemText);
+}
+
+function localStorageSessTimeoutName() {
+  return setNamespace(sessTimeoutName);
+}
+
+function localStorageSessName() {
+  return setNamespace(sessName);
+}
+
+function extendUserSessionTimeout() {
+  storage.setDataInLocalStorage(localStorageSessTimeoutName(), Date.now().toString());
+}
+
+function userSessionID() {
+  return storage.getDataFromLocalStorage(localStorageSessName()) ? localStorage.getItem(localStorageSessName()) : '';
+}
+
+function sessionExpired() {
+  let sessLastTime = storage.getDataFromLocalStorage(localStorageSessTimeoutName());
+  return (Date.now() - parseInt(sessLastTime)) > sessTimeout;
+}
+
+function flushEvents() {
+  if (pwEvents.length > 0) {
+    let dataBag = {metaData: metaData, eventList: pwEvents.splice(0)}; // put all the events together with the metadata and send
+    ajax(configOptions.endpoint, (result) => pwInfo(`Result`, result), JSON.stringify(dataBag));
+  }
+}
+
+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
+  ];
+  return ingested.indexOf(eventType) !== -1;
+}
 
-  // put the typical items in the data bag
-  let dataBag = {
-    eventType: eventType,
-    args: data,
-    target_site: configOptions.site,
-    pubwiseSchema: pubwiseSchema,
-    debug: configOptions.debug ? 1 : 0,
-  };
+function markEnabled() {
+  pwInfo(`Enabled`, configOptions);
+  pwAnalyticsEnabled = true;
+  setInterval(flushEvents, 100);
+}
+
+function pwInfo(info, context) {
+  utils.logInfo(`${analyticsName} ` + info, context);
+}
 
-  dataBag = enrichWithMetrics(dataBag);
-  // for certain events, track additional info
-  if (eventType == CONSTANTS.EVENTS.AUCTION_INIT) {
-    dataBag = enrichWithUTM(dataBag);
+function filterBidResponse(data) {
+  let modified = Object.assign({}, data);
+  // clean up some properties we don't track in public version
+  if (typeof modified.ad !== 'undefined') {
+    modified.ad = '';
   }
+  if (typeof modified.adUrl !== 'undefined') {
+    modified.adUrl = '';
+  }
+  if (typeof modified.adserverTargeting !== 'undefined') {
+    modified.adserverTargeting = '';
+  }
+  if (typeof modified.ts !== 'undefined') {
+    modified.ts = '';
+  }
+  // clean up a property to make simpler
+  if (typeof modified.statusMessage !== 'undefined' && modified.statusMessage === 'Bid returned empty or error response') {
+    modified.statusMessage = 'eoe';
+  }
+  modified.auctionEnded = auctionEnded;
+  return modified;
+}
 
-  ajax(configOptions.endpoint, (result) => utils.logInfo(`${analyticsName}Result`, result), JSON.stringify(dataBag));
+function filterAuctionInit(data) {
+  let modified = Object.assign({}, data);
+
+  modified.refererInfo = {};
+  // handle clean referrer, we only need one
+  if (typeof modified.bidderRequests !== 'undefined' && typeof modified.bidderRequests[0] !== 'undefined' && typeof modified.bidderRequests[0].refererInfo !== 'undefined') {
+    modified.refererInfo = modified.bidderRequests[0].refererInfo;
+  }
+
+  if (typeof modified.adUnitCodes !== 'undefined') {
+    delete modified.adUnitCodes;
+  }
+  if (typeof modified.adUnits !== 'undefined') {
+    delete modified.adUnits;
+  }
+  if (typeof modified.bidderRequests !== 'undefined') {
+    delete modified.bidderRequests;
+  }
+  if (typeof modified.bidsReceived !== 'undefined') {
+    delete modified.bidsReceived;
+  }
+  if (typeof modified.config !== 'undefined') {
+    delete modified.config;
+  }
+  if (typeof modified.noBids !== 'undefined') {
+    delete modified.noBids;
+  }
+  if (typeof modified.winningBids !== 'undefined') {
+    delete modified.winningBids;
+  }
+
+  return modified;
 }
 
-let pubwiseAnalytics = Object.assign(adapter(
-  {
-    defaultUrl,
-    analyticsType
-  }),
-{
+let pubwiseAnalytics = Object.assign(adapter({analyticsType}), {
   // Override AnalyticsAdapter functions by supplying custom methods
   track({eventType, args}) {
-    sendEvent(eventType, args);
+    this.handleEvent(eventType, args);
   }
 });
 
+pubwiseAnalytics.handleEvent = function(eventType, data) {
+  // we log most events, but some are information
+  if (isIngestedEvent(eventType)) {
+    pwInfo(`Emitting Event ${eventType} ${pwAnalyticsEnabled}`, data);
+
+    // record metadata
+    metaData = {
+      target_site: configOptions.site,
+      debug: configOptions.debug ? 1 : 0,
+    };
+    metaData = enrichWithSessionInfo(metaData);
+    metaData = enrichWithMetrics(metaData);
+    metaData = enrichWithUTM(metaData);
+    metaData = enrichWithCustomSegments(metaData);
+
+    // add data on init to the metadata container
+    if (eventType === CONSTANTS.EVENTS.AUCTION_INIT) {
+      data = filterAuctionInit(data);
+    } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
+      data = filterBidResponse(data);
+    }
+
+    // add all ingested events
+    pwEvents.push({
+      eventType: eventType,
+      args: data
+    });
+  } else {
+    pwInfo(`Skipping Event ${eventType} ${pwAnalyticsEnabled}`, 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) {
+    flushEvents();
+  }
+}
+
+pubwiseAnalytics.storeSessionID = function (userSessID) {
+  storage.setDataInLocalStorage(localStorageSessName(), userSessID);
+  pwInfo(`New Session Generated`, userSessID);
+};
+
+// ensure a session exists, if not make one, always store it
+pubwiseAnalytics.ensureSession = function () {
+  if (sessionExpired() === true || userSessionID() === null || userSessionID() === '') {
+    let generatedId = utils.generateUUID();
+    expireUtmData();
+    this.storeSessionID(generatedId);
+    sessionData.sessionId = generatedId;
+  }
+  // eslint-disable-next-line
+  // console.log('ensured session');
+  extendUserSessionTimeout();
+};
+
 pubwiseAnalytics.adapterEnableAnalytics = pubwiseAnalytics.enableAnalytics;
 
 pubwiseAnalytics.enableAnalytics = function (config) {
-  if (config.options.debug === undefined) {
-    config.options.debug = utils.debugTurnedOn();
+  configOptions = Object.assign(configOptions, config.options);
+  // take the PBJS debug for our debug setting if no PW debug is defined
+  if (configOptions.debug === null) {
+    configOptions.debug = utils.debugTurnedOn();
   }
-  configOptions = config.options;
   markEnabled();
+  sessionData.activationId = utils.generateUUID();
+  this.ensureSession();
   pubwiseAnalytics.adapterEnableAnalytics(config);
 };
 
 adapterManager.registerAnalyticsAdapter({
   adapter: pubwiseAnalytics,
-  code: 'pubwise'
+  code: 'pubwise',
+  gvlid: 842
 });
 
 export default pubwiseAnalytics;
diff --git a/modules/pubwiseBidAdapter.js b/modules/pubwiseBidAdapter.js
new file mode 100644
index 00000000000..f450a8bede8
--- /dev/null
+++ b/modules/pubwiseBidAdapter.js
@@ -0,0 +1,777 @@
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+const VERSION = '0.1.0';
+const GVLID = 842;
+const NET_REVENUE = true;
+const UNDEFINED = undefined;
+const DEFAULT_CURRENCY = 'USD';
+const AUCTION_TYPE = 1;
+const BIDDER_CODE = 'pwbid';
+const ENDPOINT_URL = 'https://bid.pubwise.io/prebid';
+const DEFAULT_WIDTH = 0;
+const DEFAULT_HEIGHT = 0;
+const PREBID_NATIVE_HELP_LINK = 'https://prebid.org/dev-docs/show-native-ads.html';
+// const USERSYNC_URL = '//127.0.0.1:8080/usersync'
+
+const CUSTOM_PARAMS = {
+  'gender': '', // User gender
+  'yob': '', // User year of birth
+  'lat': '', // User location - Latitude
+  'lon': '', // User Location - Longitude
+};
+
+// rtb native types are meant to be dynamic and extendable
+// the extendable data asset types are nicely aligned
+// in practice we set an ID that is distinct for each real type of return
+const NATIVE_ASSETS = {
+  'TITLE': { ID: 1, KEY: 'title', TYPE: 0 },
+  'IMAGE': { ID: 2, KEY: 'image', TYPE: 0 },
+  'ICON': { ID: 3, KEY: 'icon', TYPE: 0 },
+  'SPONSOREDBY': { ID: 4, KEY: 'sponsoredBy', TYPE: 1 },
+  'BODY': { ID: 5, KEY: 'body', TYPE: 2 },
+  'CLICKURL': { ID: 6, KEY: 'clickUrl', TYPE: 0 },
+  'VIDEO': { ID: 7, KEY: 'video', TYPE: 0 },
+  'EXT': { ID: 8, KEY: 'ext', TYPE: 0 },
+  'DATA': { ID: 9, KEY: 'data', TYPE: 0 },
+  'LOGO': { ID: 10, KEY: 'logo', TYPE: 0 },
+  'SPONSORED': { ID: 11, KEY: 'sponsored', TYPE: 1 },
+  'DESC': { ID: 12, KEY: 'data', TYPE: 2 },
+  'RATING': { ID: 13, KEY: 'rating', TYPE: 3 },
+  'LIKES': { ID: 14, KEY: 'likes', TYPE: 4 },
+  'DOWNLOADS': { ID: 15, KEY: 'downloads', TYPE: 5 },
+  'PRICE': { ID: 16, KEY: 'price', TYPE: 6 },
+  'SALEPRICE': { ID: 17, KEY: 'saleprice', TYPE: 7 },
+  'PHONE': { ID: 18, KEY: 'phone', TYPE: 8 },
+  'ADDRESS': { ID: 19, KEY: 'address', TYPE: 9 },
+  'DESC2': { ID: 20, KEY: 'desc2', TYPE: 10 },
+  'DISPLAYURL': { ID: 21, KEY: 'displayurl', TYPE: 11 },
+  'CTA': { ID: 22, KEY: 'cta', TYPE: 12 }
+};
+
+const NATIVE_ASSET_IMAGE_TYPE = {
+  'ICON': 1,
+  'LOGO': 2,
+  'IMAGE': 3
+}
+
+// to render any native unit we have to have a few items
+const NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS = [
+  {
+    id: NATIVE_ASSETS.SPONSOREDBY.ID,
+    required: true,
+    data: {
+      type: 1
+    }
+  },
+  {
+    id: NATIVE_ASSETS.TITLE.ID,
+    required: true,
+  },
+  {
+    id: NATIVE_ASSETS.IMAGE.ID,
+    required: true,
+  }
+]
+
+let isInvalidNativeRequest = false
+let NATIVE_ASSET_ID_TO_KEY_MAP = {};
+let NATIVE_ASSET_KEY_TO_ASSET_MAP = {};
+
+// together allows traversal of NATIVE_ASSETS_LIST in any direction
+// id -> key
+utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_ID_TO_KEY_MAP[anAsset.ID] = anAsset.KEY });
+// key -> asset
+utils._each(NATIVE_ASSETS, anAsset => { NATIVE_ASSET_KEY_TO_ASSET_MAP[anAsset.KEY] = anAsset });
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  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.
+   */
+  isBidRequestValid: function (bid) {
+    // siteId is required
+    if (bid.params && bid.params.siteId) {
+      // it must be a string
+      if (!utils.isStr(bid.params.siteId)) {
+        _logWarn('siteId is required for bid', bid);
+        return false;
+      }
+    } else {
+      return false;
+    }
+
+    return true;
+  },
+  /**
+   * 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) {
+    var refererInfo;
+    if (bidderRequest && bidderRequest.refererInfo) {
+      refererInfo = bidderRequest.refererInfo;
+    }
+    var conf = _initConf(refererInfo);
+    var payload = _createOrtbTemplate(conf);
+    var bidCurrency = '';
+    var bid;
+    var blockedIabCategories = [];
+
+    validBidRequests.forEach(originalBid => {
+      bid = utils.deepClone(originalBid);
+      bid.params.adSlot = bid.params.adSlot || '';
+      _parseAdSlot(bid);
+
+      conf = _handleCustomParams(bid.params, conf);
+      conf.transactionId = bid.transactionId;
+      bidCurrency = bid.params.currency || UNDEFINED;
+      bid.params.currency = bidCurrency;
+
+      if (bid.params.hasOwnProperty('bcat') && utils.isArray(bid.params.bcat)) {
+        blockedIabCategories = blockedIabCategories.concat(bid.params.bcat);
+      }
+
+      var impObj = _createImpressionObject(bid, conf);
+      if (impObj) {
+        payload.imp.push(impObj);
+      }
+    });
+
+    // no payload imps, no rason to continue
+    if (payload.imp.length == 0) {
+      return;
+    }
+
+    // test bids can also be turned on here
+    if (window.location.href.indexOf('pubwiseTestBid=true') !== -1) {
+      payload.test = 1;
+    }
+
+    if (bid.params.isTest) {
+      payload.test = Number(bid.params.isTest) // should be 1 or 0
+    }
+    payload.site.publisher.id = bid.params.siteId.trim();
+    payload.user.gender = (conf.gender ? conf.gender.trim() : UNDEFINED);
+    payload.user.geo = {};
+    payload.user.geo.lat = _parseSlotParam('lat', conf.lat);
+    payload.user.geo.lon = _parseSlotParam('lon', conf.lon);
+    payload.user.yob = _parseSlotParam('yob', conf.yob);
+    payload.device.geo = payload.user.geo;
+    payload.site.page = payload.site.page.trim();
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+
+    // add the content object from config in request
+    if (typeof config.getConfig('content') === 'object') {
+      payload.site.content = config.getConfig('content');
+    }
+
+    // merge the device from config.getConfig('device')
+    if (typeof config.getConfig('device') === 'object') {
+      payload.device = Object.assign(payload.device, config.getConfig('device'));
+    }
+
+    // passing transactionId in source.tid
+    utils.deepSetValue(payload, 'source.tid', conf.transactionId);
+
+    // schain
+    if (validBidRequests[0].schain) {
+      utils.deepSetValue(payload, 'source.ext.schain', validBidRequests[0].schain);
+    }
+
+    // gdpr consent
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.deepSetValue(payload, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      utils.deepSetValue(payload, 'regs.ext.gdpr', (bidderRequest.gdprConsent.gdprApplies ? 1 : 0));
+    }
+
+    // ccpa on the root object
+    if (bidderRequest && bidderRequest.uspConsent) {
+      utils.deepSetValue(payload, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // if coppa is in effect then note it
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(payload, 'regs.coppa', 1);
+    }
+
+    var options = {contentType: 'text/plain'}
+
+    _logInfo('buildRequests payload', payload);
+    _logInfo('buildRequests bidderRequest', bidderRequest);
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: payload,
+      options: options,
+      bidderRequest: 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 (response, request) {
+    const bidResponses = [];
+    var respCur = DEFAULT_CURRENCY;
+    _logInfo('interpretResponse request', request);
+    let parsedRequest = request.data; // not currently stringified
+    // let parsedReferrer = parsedRequest.site && parsedRequest.site.ref ? parsedRequest.site.ref : '';
+
+    // try {
+    if (response.body && response.body.seatbid && utils.isArray(response.body.seatbid)) {
+      // Supporting multiple bid responses for same adSize
+      respCur = response.body.cur || respCur;
+      response.body.seatbid.forEach(seatbidder => {
+        seatbidder.bid &&
+            utils.isArray(seatbidder.bid) &&
+            seatbidder.bid.forEach(bid => {
+              let newBid = {
+                requestId: bid.impid,
+                cpm: (parseFloat(bid.price) || 0).toFixed(2),
+                width: bid.w,
+                height: bid.h,
+                creativeId: bid.crid || bid.id,
+                currency: respCur,
+                netRevenue: NET_REVENUE,
+                ttl: 300,
+                ad: bid.adm,
+                pw_seat: seatbidder.seat || null,
+                pw_dspid: bid.ext && bid.ext.dspid ? bid.ext.dspid : null,
+                partnerImpId: bid.id || '' // partner impression Id
+              };
+              if (parsedRequest.imp && parsedRequest.imp.length > 0) {
+                parsedRequest.imp.forEach(req => {
+                  if (bid.impid === req.id) {
+                    _checkMediaType(bid.adm, newBid);
+                    switch (newBid.mediaType) {
+                      case BANNER:
+                        break;
+                      case NATIVE:
+                        _parseNativeResponse(bid, newBid);
+                        break;
+                    }
+                  }
+                });
+              }
+
+              newBid.meta = {};
+              if (bid.ext && bid.ext.dspid) {
+                newBid.meta.networkId = bid.ext.dspid;
+              }
+              if (bid.ext && bid.ext.advid) {
+                newBid.meta.buyerId = bid.ext.advid;
+              }
+              if (bid.adomain && bid.adomain.length > 0) {
+                newBid.meta.advertiserDomains = bid.adomain;
+                newBid.meta.clickUrl = bid.adomain[0];
+              }
+
+              bidResponses.push(newBid);
+            });
+      });
+    }
+    // } catch (error) {
+    // _logError(error);
+    // }
+    return bidResponses;
+  }
+}
+
+function _checkMediaType(adm, newBid) {
+  // Create a regex here to check the strings
+  var admJSON = '';
+  if (adm.indexOf('"ver":') >= 0) {
+    try {
+      admJSON = JSON.parse(adm.replace(/\\/g, ''));
+      if (admJSON && admJSON.assets) {
+        newBid.mediaType = NATIVE;
+      }
+    } catch (e) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + adm);
+    }
+  } else {
+    newBid.mediaType = BANNER;
+  }
+}
+
+function _parseNativeResponse(bid, newBid) {
+  newBid.native = {};
+  if (bid.hasOwnProperty('adm')) {
+    var adm = '';
+    try {
+      adm = JSON.parse(bid.adm.replace(/\\/g, ''));
+    } catch (ex) {
+      _logWarn('Error: Cannot parse native reponse for ad response: ' + newBid.adm);
+      return;
+    }
+    if (adm && adm.assets && adm.assets.length > 0) {
+      newBid.mediaType = NATIVE;
+      for (let i = 0, len = adm.assets.length; i < len; i++) {
+        switch (adm.assets[i].id) {
+          case NATIVE_ASSETS.TITLE.ID:
+            newBid.native.title = adm.assets[i].title && adm.assets[i].title.text;
+            break;
+          case NATIVE_ASSETS.IMAGE.ID:
+            newBid.native.image = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.ICON.ID:
+            newBid.native.icon = {
+              url: adm.assets[i].img && adm.assets[i].img.url,
+              height: adm.assets[i].img && adm.assets[i].img.h,
+              width: adm.assets[i].img && adm.assets[i].img.w,
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.ID:
+          case NATIVE_ASSETS.BODY.ID:
+          case NATIVE_ASSETS.LIKES.ID:
+          case NATIVE_ASSETS.DOWNLOADS.ID:
+          case NATIVE_ASSETS.PRICE:
+          case NATIVE_ASSETS.SALEPRICE.ID:
+          case NATIVE_ASSETS.PHONE.ID:
+          case NATIVE_ASSETS.ADDRESS.ID:
+          case NATIVE_ASSETS.DESC2.ID:
+          case NATIVE_ASSETS.CTA.ID:
+          case NATIVE_ASSETS.RATING.ID:
+          case NATIVE_ASSETS.DISPLAYURL.ID:
+            newBid.native[NATIVE_ASSET_ID_TO_KEY_MAP[adm.assets[i].id]] = adm.assets[i].data && adm.assets[i].data.value;
+            break;
+        }
+      }
+      newBid.clickUrl = adm.link && adm.link.url;
+      newBid.clickTrackers = (adm.link && adm.link.clicktrackers) || [];
+      newBid.impressionTrackers = adm.imptrackers || [];
+      newBid.jstracker = adm.jstracker || [];
+      if (!newBid.width) {
+        newBid.width = DEFAULT_WIDTH;
+      }
+      if (!newBid.height) {
+        newBid.height = DEFAULT_HEIGHT;
+      }
+    }
+  }
+}
+
+function _getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  return anchor.hostname;
+}
+
+function _handleCustomParams(params, conf) {
+  var key, value, entry;
+  for (key in CUSTOM_PARAMS) {
+    if (CUSTOM_PARAMS.hasOwnProperty(key)) {
+      value = params[key];
+      if (value) {
+        entry = CUSTOM_PARAMS[key];
+
+        if (typeof entry === 'object') {
+          // will be used in future when we want to
+          // process a custom param before using
+          // 'keyname': {f: function() {}}
+          value = entry.f(value, conf);
+        }
+
+        if (utils.isStr(value)) {
+          conf[key] = value;
+        } else {
+          _logWarn('Ignoring param : ' + key + ' with value : ' + CUSTOM_PARAMS[key] + ', expects string-value, found ' + typeof value);
+        }
+      }
+    }
+  }
+  return conf;
+}
+
+function _createOrtbTemplate(conf) {
+  return {
+    id: '' + new Date().getTime(),
+    at: AUCTION_TYPE,
+    cur: [DEFAULT_CURRENCY],
+    imp: [],
+    site: {
+      page: conf.pageURL,
+      ref: conf.refURL,
+      publisher: {}
+    },
+    device: {
+      ua: navigator.userAgent,
+      js: 1,
+      dnt: (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0,
+      h: screen.height,
+      w: screen.width,
+      language: navigator.language
+    },
+    user: {},
+    ext: {
+      version: VERSION
+    }
+  };
+}
+
+function _createImpressionObject(bid, conf) {
+  var impObj = {};
+  var bannerObj;
+  var nativeObj = {};
+  var mediaTypes = '';
+
+  impObj = {
+    id: bid.bidId,
+    tagid: bid.params.adUnit || undefined,
+    bidfloor: _parseSlotParam('bidFloor', bid.params.bidFloor), // capitalization dicated by 3.2.4 spec
+    secure: 1,
+    bidfloorcur: bid.params.currency ? _parseSlotParam('currency', bid.params.currency) : DEFAULT_CURRENCY // capitalization dicated by 3.2.4 spec
+  };
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    for (mediaTypes in bid.mediaTypes) {
+      switch (mediaTypes) {
+        case BANNER:
+          bannerObj = _createBannerRequest(bid);
+          if (bannerObj !== UNDEFINED) {
+            impObj.banner = bannerObj;
+          }
+          break;
+        case NATIVE:
+          nativeObj['request'] = JSON.stringify(_createNativeRequest(bid.nativeParams));
+          if (!isInvalidNativeRequest) {
+            impObj.native = nativeObj;
+          } else {
+            _logWarn('Error: Error in Native adunit ' + bid.params.adUnit + '. Ignoring the adunit. Refer to ' + PREBID_NATIVE_HELP_LINK + ' for more details.');
+          }
+          break;
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+  }
+
+  _addFloorFromFloorModule(impObj, bid);
+
+  return impObj.hasOwnProperty(BANNER) ||
+          impObj.hasOwnProperty(NATIVE) ? impObj : UNDEFINED;
+}
+
+function _parseSlotParam(paramName, paramValue) {
+  if (!utils.isStr(paramValue)) {
+    paramValue && _logWarn('Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
+    return UNDEFINED;
+  }
+
+  switch (paramName) {
+    case 'bidFloor':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lat':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'lon':
+      return parseFloat(paramValue) || UNDEFINED;
+    case 'yob':
+      return parseInt(paramValue) || UNDEFINED;
+    default:
+      return paramValue;
+  }
+}
+
+function _parseAdSlot(bid) {
+  _logInfo('parseAdSlot bid', bid)
+  bid.params.adUnit = '';
+  bid.params.width = 0;
+  bid.params.height = 0;
+  bid.params.adSlot = _cleanSlotName(bid.params.adSlot);
+
+  if (bid.hasOwnProperty('mediaTypes')) {
+    if (bid.mediaTypes.hasOwnProperty(BANNER) &&
+          bid.mediaTypes.banner.hasOwnProperty('sizes')) { // if its a banner, has mediaTypes and sizes
+      var i = 0;
+      var sizeArray = [];
+      for (;i < bid.mediaTypes.banner.sizes.length; i++) {
+        if (bid.mediaTypes.banner.sizes[i].length === 2) { // sizes[i].length will not be 2 in case where size is set as fluid, we want to skip that entry
+          sizeArray.push(bid.mediaTypes.banner.sizes[i]);
+        }
+      }
+      bid.mediaTypes.banner.sizes = sizeArray;
+      if (bid.mediaTypes.banner.sizes.length >= 1) {
+        // if there is more than one size then pop one onto the banner params width
+        // pop the first into the params, then remove it from mediaTypes
+        bid.params.width = bid.mediaTypes.banner.sizes[0][0];
+        bid.params.height = bid.mediaTypes.banner.sizes[0][1];
+        bid.mediaTypes.banner.sizes = bid.mediaTypes.banner.sizes.splice(1, bid.mediaTypes.banner.sizes.length - 1);
+      }
+    }
+  } else {
+    _logWarn('MediaTypes are Required for all Adunit Configs', bid)
+  }
+}
+
+function _cleanSlotName(slotName) {
+  if (utils.isStr(slotName)) {
+    return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
+  }
+  return '';
+}
+
+function _initConf(refererInfo) {
+  return {
+    pageURL: (refererInfo && refererInfo.referer) ? refererInfo.referer : window.location.href,
+    refURL: window.document.referrer
+  };
+}
+
+function _commonNativeRequestObject(nativeAsset, params) {
+  var key = nativeAsset.KEY;
+  return {
+    id: nativeAsset.ID,
+    required: params[key].required ? 1 : 0,
+    data: {
+      type: nativeAsset.TYPE,
+      len: params[key].len,
+      ext: params[key].ext
+    }
+  };
+}
+
+function _addFloorFromFloorModule(impObj, bid) {
+  let bidFloor = -1; // indicates no floor
+
+  // get lowest floor from floorModule
+  if (typeof bid.getFloor === 'function' && !config.getConfig('pubwise.disableFloors')) {
+    [BANNER, 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))) {
+          let mediaTypeFloor = parseFloat(floorInfo.floor);
+          bidFloor = (bidFloor == -1 ? mediaTypeFloor : Math.min(mediaTypeFloor, bidFloor))
+        }
+      }
+    });
+  }
+
+  // get highest, if none then take the default -1
+  if (impObj.bidfloor) {
+    bidFloor = Math.max(bidFloor, impObj.bidfloor)
+  }
+
+  // assign if it has a valid floor - > 0
+  impObj.bidfloor = ((!isNaN(bidFloor) && bidFloor > 0) ? bidFloor : UNDEFINED);
+}
+
+function _createNativeRequest(params) {
+  var nativeRequestObject = {
+    assets: []
+  };
+  for (var key in params) {
+    if (params.hasOwnProperty(key)) {
+      var assetObj = {};
+      if (!(nativeRequestObject.assets && nativeRequestObject.assets.length > 0 && nativeRequestObject.assets.hasOwnProperty(key))) {
+        switch (key) {
+          case NATIVE_ASSETS.TITLE.KEY:
+            if (params[key].len || params[key].length) {
+              assetObj = {
+                id: NATIVE_ASSETS.TITLE.ID,
+                required: params[key].required ? 1 : 0,
+                title: {
+                  len: params[key].len || params[key].length,
+                  ext: params[key].ext
+                }
+              };
+            } else {
+              _logWarn('Error: Title Length is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.IMAGE.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.IMAGE.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.IMAGE,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                  wmin: params[key].wmin || params[key].minimumWidth || (params[key].minsizes ? params[key].minsizes[0] : UNDEFINED),
+                  hmin: params[key].hmin || params[key].minimumHeight || (params[key].minsizes ? params[key].minsizes[1] : UNDEFINED),
+                  mimes: params[key].mimes,
+                  ext: params[key].ext,
+                }
+              };
+            } else {
+              _logWarn('Error: Image sizes is required for native ad: ' + JSON.stringify(params));
+            }
+            break;
+          case NATIVE_ASSETS.ICON.KEY:
+            if (params[key].sizes && params[key].sizes.length > 0) {
+              assetObj = {
+                id: NATIVE_ASSETS.ICON.ID,
+                required: params[key].required ? 1 : 0,
+                img: {
+                  type: NATIVE_ASSET_IMAGE_TYPE.ICON,
+                  w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                  h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED),
+                }
+              };
+            } else {
+              _logWarn('Error: Icon sizes is required for native ad: ' + JSON.stringify(params));
+            };
+            break;
+          case NATIVE_ASSETS.VIDEO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.VIDEO.ID,
+              required: params[key].required ? 1 : 0,
+              video: {
+                minduration: params[key].minduration,
+                maxduration: params[key].maxduration,
+                protocols: params[key].protocols,
+                mimes: params[key].mimes,
+                ext: params[key].ext
+              }
+            };
+            break;
+          case NATIVE_ASSETS.EXT.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.EXT.ID,
+              required: params[key].required ? 1 : 0,
+            };
+            break;
+          case NATIVE_ASSETS.LOGO.KEY:
+            assetObj = {
+              id: NATIVE_ASSETS.LOGO.ID,
+              required: params[key].required ? 1 : 0,
+              img: {
+                type: NATIVE_ASSET_IMAGE_TYPE.LOGO,
+                w: params[key].w || params[key].width || (params[key].sizes ? params[key].sizes[0] : UNDEFINED),
+                h: params[key].h || params[key].height || (params[key].sizes ? params[key].sizes[1] : UNDEFINED)
+              }
+            };
+            break;
+          case NATIVE_ASSETS.SPONSOREDBY.KEY:
+          case NATIVE_ASSETS.BODY.KEY:
+          case NATIVE_ASSETS.RATING.KEY:
+          case NATIVE_ASSETS.LIKES.KEY:
+          case NATIVE_ASSETS.DOWNLOADS.KEY:
+          case NATIVE_ASSETS.PRICE.KEY:
+          case NATIVE_ASSETS.SALEPRICE.KEY:
+          case NATIVE_ASSETS.PHONE.KEY:
+          case NATIVE_ASSETS.ADDRESS.KEY:
+          case NATIVE_ASSETS.DESC2.KEY:
+          case NATIVE_ASSETS.DISPLAYURL.KEY:
+          case NATIVE_ASSETS.CTA.KEY:
+            assetObj = _commonNativeRequestObject(NATIVE_ASSET_KEY_TO_ASSET_MAP[key], params);
+            break;
+        }
+      }
+    }
+    if (assetObj && assetObj.id) {
+      nativeRequestObject.assets[nativeRequestObject.assets.length] = assetObj;
+    }
+  };
+
+  // for native image adtype prebid has to have few required assests i.e. title,sponsoredBy, image
+  // if any of these are missing from the request then request will not be sent
+  var requiredAssetCount = NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.length;
+  var presentrequiredAssetCount = 0;
+  NATIVE_MINIMUM_REQUIRED_IMAGE_ASSETS.forEach(ele => {
+    var lengthOfExistingAssets = nativeRequestObject.assets.length;
+    for (var i = 0; i < lengthOfExistingAssets; i++) {
+      if (ele.id == nativeRequestObject.assets[i].id) {
+        presentrequiredAssetCount++;
+        break;
+      }
+    }
+  });
+  if (requiredAssetCount == presentrequiredAssetCount) {
+    isInvalidNativeRequest = false;
+  } else {
+    isInvalidNativeRequest = true;
+  }
+  return nativeRequestObject;
+}
+
+function _createBannerRequest(bid) {
+  var sizes = bid.mediaTypes.banner.sizes;
+  var format = [];
+  var bannerObj;
+  if (sizes !== UNDEFINED && utils.isArray(sizes)) {
+    bannerObj = {};
+    if (!bid.params.width && !bid.params.height) {
+      if (sizes.length === 0) {
+        // i.e. since bid.params does not have width or height, and length of sizes is 0, need to ignore this banner imp
+        bannerObj = UNDEFINED;
+        _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+        return bannerObj;
+      } else {
+        bannerObj.w = parseInt(sizes[0][0], 10);
+        bannerObj.h = parseInt(sizes[0][1], 10);
+        sizes = sizes.splice(1, sizes.length - 1);
+      }
+    } else {
+      bannerObj.w = bid.params.width;
+      bannerObj.h = bid.params.height;
+    }
+    if (sizes.length > 0) {
+      format = [];
+      sizes.forEach(function (size) {
+        if (size.length > 1) {
+          format.push({ w: size[0], h: size[1] });
+        }
+      });
+      if (format.length > 0) {
+        bannerObj.format = format;
+      }
+    }
+    bannerObj.pos = 0;
+    bannerObj.topframe = utils.inIframe() ? 0 : 1;
+  } else {
+    _logWarn('Error: mediaTypes.banner.size missing for adunit: ' + bid.params.adUnit + '. Ignoring the banner impression in the adunit.');
+    bannerObj = UNDEFINED;
+  }
+  return bannerObj;
+}
+
+// various error levels are not always used
+// eslint-disable-next-line no-unused-vars
+function _logMessage(textValue, objectValue) {
+  utils.logMessage('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logInfo(textValue, objectValue) {
+  utils.logInfo('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logWarn(textValue, objectValue) {
+  utils.logWarn('PubWise: ' + textValue, objectValue);
+}
+
+// eslint-disable-next-line no-unused-vars
+function _logError(textValue, objectValue) {
+  utils.logError('PubWise: ' + textValue, objectValue);
+}
+
+// function _decorateLog() {
+//   arguments[0] = 'PubWise' + arguments[0];
+//   return arguments
+// }
+
+// these are exported only for testing so maintaining the JS convention of _ to indicate the intent
+export {
+  _checkMediaType,
+  _parseAdSlot
+}
+
+registerBidder(spec);
diff --git a/modules/pubwiseBidAdapter.md b/modules/pubwiseBidAdapter.md
new file mode 100644
index 00000000000..8cf38a63913
--- /dev/null
+++ b/modules/pubwiseBidAdapter.md
@@ -0,0 +1,78 @@
+# Overview
+
+```
+Module Name:  PubWise Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: info@pubwise.io
+```
+
+# Description
+
+Connects to PubWise exchange for bids.
+
+# Sample Banner Ad Unit: For Publishers
+
+With isTest parameter the system will respond in whatever dimensions provided.
+
+## Params
+
+
+
+## Banner
+```
+var adUnits = [
+    {
+        code: "div-gpt-ad-1460505748561-0",
+        mediaTypes: {
+        banner: {
+            sizes: [[300, 250]]
+        }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true
+            }
+        }]
+    }
+]
+```
+## Native
+```
+var adUnits = [
+    {
+        code: 'div-gpt-ad-1460505748561-1',
+        sizes: [[1, 1]],
+        mediaTypes: {
+            native: {
+                title: {
+                    required: true,
+                    len: 80
+                },
+                body: {
+                    required: true
+                },
+                image: {
+                    required: true,
+                    sizes: [150, 50]
+                },
+                sponsoredBy: {
+                    required: true
+                },
+                icon: {
+                    required: false
+                }
+            }
+        },
+        bids: [{
+            bidder: 'pubwise',
+            params: {
+                siteId: "xxxxxx",
+                isTest: true,
+            },
+        }]
+    }
+]
+```
+
diff --git a/modules/pubxBidAdapter.js b/modules/pubxBidAdapter.js
new file mode 100644
index 00000000000..35d75e96f95
--- /dev/null
+++ b/modules/pubxBidAdapter.js
@@ -0,0 +1,94 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+const BIDDER_CODE = 'pubx';
+const BID_ENDPOINT = 'https://api.primecaster.net/adlogue/api/slot/bid';
+const USER_SYNC_URL = 'https://api.primecaster.net/primecaster_dmppv.html'
+export const spec = {
+  code: BIDDER_CODE,
+  isBidRequestValid: function(bid) {
+    if (!(bid.params.sid)) {
+      return false;
+    } else { return true }
+  },
+  buildRequests: function(validBidRequests) {
+    return validBidRequests.map(bidRequest => {
+      const bidId = bidRequest.bidId;
+      const params = bidRequest.params;
+      const sid = params.sid;
+      const payload = {
+        sid: sid
+      };
+      return {
+        id: bidId,
+        method: 'GET',
+        url: BID_ENDPOINT,
+        data: payload,
+      }
+    });
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const body = serverResponse.body;
+    const bidResponses = [];
+    if (body.cid) {
+      const bidResponse = {
+        requestId: bidRequest.id,
+        cpm: body.cpm,
+        currency: body.currency,
+        width: body.width,
+        height: body.height,
+        creativeId: body.cid,
+        netRevenue: true,
+        ttl: body.TTL,
+        ad: body.adm
+      };
+      bidResponses.push(bidResponse);
+    } else {};
+    return bidResponses;
+  },
+  /**
+   * Determine which user syncs should occur
+   * @param {object} syncOptions
+   * @param {array} serverResponses
+   * @returns {array} User sync pixels
+   */
+  getUserSyncs: function (syncOptions, serverResponses) {
+    const kwTag = document.getElementsByName('keywords');
+    let kwString = '';
+    let kwEnc = '';
+    let titleContent = !!document.title && document.title;
+    let titleEnc = '';
+    let descContent = !!document.getElementsByName('description') && !!document.getElementsByName('description')[0] && document.getElementsByName('description')[0].content;
+    let descEnc = '';
+    const pageUrl = location.href.replace(/\?.*$/, '');
+    const pageEnc = encodeURIComponent(pageUrl);
+    const refUrl = document.referrer.replace(/\?.*$/, '');
+    const refEnc = encodeURIComponent(refUrl);
+    if (kwTag.length) {
+      const kwContents = kwTag[0].content;
+      if (kwContents.length > 20) {
+        const kwArray = kwContents.substr(0, 20).split(',');
+        kwArray.pop();
+        kwString = kwArray.join();
+      } else {
+        kwString = kwContents;
+      }
+      kwEnc = encodeURIComponent(kwString)
+    } else { }
+    if (titleContent) {
+      if (titleContent.length > 30) {
+        titleContent = titleContent.substr(0, 30);
+      } else {};
+      titleEnc = encodeURIComponent(titleContent);
+    } else { };
+    if (descContent) {
+      if (descContent.length > 60) {
+        descContent = descContent.substr(0, 60);
+      } else {};
+      descEnc = encodeURIComponent(descContent);
+    } else { };
+    return (syncOptions.iframeEnabled) ? [{
+      type: 'iframe',
+      url: USER_SYNC_URL + '?pkw=' + kwEnc + '&pd=' + descEnc + '&pu=' + pageEnc + '&pref=' + refEnc + '&pt=' + titleEnc
+    }] : [];
+  }
+}
+registerBidder(spec);
diff --git a/modules/pubxBidAdapter.md b/modules/pubxBidAdapter.md
new file mode 100644
index 00000000000..da7d960c831
--- /dev/null
+++ b/modules/pubxBidAdapter.md
@@ -0,0 +1,32 @@
+# Overview
+
+Module Name: pubx Bid Adapter
+
+Maintainer: x@pub-x.io
+
+# Description
+
+Module that connects to Pub-X's demand sources
+Supported MediaTypes: banner only
+
+# Test Parameters
+```javascript
+	var adUnits = [
+    {
+      code: 'test',
+      mediaTypes: {
+        banner: {
+          sizes: [300,250]
+        }
+      },
+      bids: [
+        {
+          bidder: 'pubx',
+          params: {
+            sid: 'eDMR' //ID should be provided by Pub-X
+          }
+        }
+      ]
+    }
+  ];
+```
\ No newline at end of file
diff --git a/modules/pubxaiAnalyticsAdapter.js b/modules/pubxaiAnalyticsAdapter.js
new file mode 100644
index 00000000000..136b328d381
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.js
@@ -0,0 +1,182 @@
+import { ajax } from '../src/ajax.js';
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+import CONSTANTS from '../src/constants.json';
+import * as utils from '../src/utils.js';
+
+const emptyUrl = '';
+const analyticsType = 'endpoint';
+const pubxaiAnalyticsVersion = 'v1.1.0';
+const defaultHost = 'api.pbxai.com';
+const auctionPath = '/analytics/auction';
+const winningBidPath = '/analytics/bidwon';
+
+let initOptions;
+let auctionTimestamp;
+let auctionCache = [];
+let events = {
+  bids: [],
+  floorDetail: {},
+  pageDetail: {},
+  deviceDetail: {}
+};
+
+var pubxaiAnalyticsAdapter = Object.assign(adapter(
+  {
+    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 = utils.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');
+      }
+    }
+    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
+      send(events, 'auctionEnd');
+    }
+  }
+});
+
+function mapBidResponse(bidResponse, status) {
+  if (typeof bidResponse !== 'undefined') {
+    let bid = {
+      adUnitCode: bidResponse.adUnitCode,
+      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: utils.parseSizesInput(bidResponse.size).toString(),
+      });
+      events.bids.push(bid);
+    } else {
+      Object.assign(bid, {
+        bidId: bidResponse.requestId,
+        floorProvider: events.floorDetail ? events.floorDetail.floorProvider : null,
+        isWinningBid: true,
+        placementId: bidResponse.params ? utils.deepAccess(bidResponse, 'params.0.placementId') : null,
+        renderedSize: bidResponse.size,
+        renderStatus: 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';
+  }
+  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));
+}
+
+function send(data, status) {
+  if (pubxaiAnalyticsAdapter.shouldFireEventRequest(initOptions.samplingRate)) {
+    let location = utils.getWindowLocation();
+    data.initOptions = initOptions;
+    if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
+      Object.assign(data.pageDetail, {
+        host: location.host,
+        path: location.pathname,
+        search: location.search,
+        adUnitCount: data.auctionInit.adUnitCodes ? data.auctionInit.adUnitCodes.length : null
+      });
+      data.initOptions.auctionId = data.auctionInit.auctionId;
+      delete data.auctionInit;
+    }
+    data.deviceDetail = {};
+    Object.assign(data.deviceDetail, {
+      platform: navigator.platform,
+      deviceType: getDeviceType(),
+      deviceOS: getOS(),
+      browser: getBrowser()
+    });
+    let pubxaiAnalyticsRequestUrl = utils.buildUrl({
+      protocol: 'https',
+      hostname: (initOptions && initOptions.hostName) || defaultHost,
+      pathname: status == 'bidwon' ? winningBidPath : auctionPath,
+      search: {
+        auctionTimestamp: auctionTimestamp,
+        pubxaiAnalyticsVersion: pubxaiAnalyticsVersion,
+        prebidVersion: $$PREBID_GLOBAL$$.version
+      }
+    });
+    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);
+    }
+  }
+}
+
+pubxaiAnalyticsAdapter.originEnableAnalytics = pubxaiAnalyticsAdapter.enableAnalytics;
+pubxaiAnalyticsAdapter.enableAnalytics = function (config) {
+  initOptions = config.options;
+  pubxaiAnalyticsAdapter.originEnableAnalytics(config);
+};
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: pubxaiAnalyticsAdapter,
+  code: 'pubxai'
+});
+
+export default pubxaiAnalyticsAdapter;
diff --git a/modules/pubxaiAnalyticsAdapter.md b/modules/pubxaiAnalyticsAdapter.md
new file mode 100644
index 00000000000..112329fc171
--- /dev/null
+++ b/modules/pubxaiAnalyticsAdapter.md
@@ -0,0 +1,27 @@
+# Overview
+Module Name: PubX.io Analytics Adapter
+Module Type: Analytics Adapter
+Maintainer: phaneendra@pubx.ai
+
+# Description
+
+Analytics adapter for prebid provided by Pubx.ai. Contact alex@pubx.ai for information.
+
+# Test Parameters
+
+```
+{
+  provider: 'pubxai',
+    options : {
+      pubxId: 'xxx',
+      hostName: 'example.com',
+      samplingRate: 1
+    }
+}
+```
+Property | Data Type | Is required? | Description |Example
+:-----:|:-----:|:-----:|:-----:|:-----:
+pubxId|string|Yes | A unique identifier provided by PubX.ai to indetify publishers.  |`"a9d48e2f-24ec-4ec1-b3e2-04e32c3aeb03"`
+hostName|string|No|hostName is provided by Pubx.ai. |`"https://example.com"`
+samplingRate |number |No|How often the sampling must be taken. |`2` -  (sample one in two cases) \  `3` - (sample one in three cases)
+ | | | |
\ No newline at end of file
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 7bfa8686728..adea33fc3b9 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -119,12 +119,10 @@ function bidResponseAvailable(request, response) {
         adId: id,
         ttl: idToBidMap[id].exp || DEFAULT_BID_TTL,
         netRevenue: DEFAULT_NET_REVENUE,
-        currency: bidResponse.cur || DEFAULT_CURRENCY
+        currency: bidResponse.cur || DEFAULT_CURRENCY,
+        meta: { advertiserDomains: idToBidMap[id].adomain || [] }
       };
-      if (idToImpMap[id]['native']) {
-        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
-        bid.mediaType = 'native';
-      } else if (idToImpMap[id].video) {
+      if (idToImpMap[id].video) {
         // for outstream, a renderer is specified
         if (idToSlotConfig[id] && utils.deepAccess(idToSlotConfig[id], 'mediaTypes.video.context') === 'outstream') {
           bid.renderer = outstreamRenderer(utils.deepAccess(idToSlotConfig[id], 'renderer.options'), utils.deepAccess(idToBidMap[id], 'ext.outstream'));
@@ -133,10 +131,13 @@ function bidResponseAvailable(request, response) {
         bid.mediaType = 'video';
         bid.width = idToBidMap[id].w;
         bid.height = idToBidMap[id].h;
-      } else {
+      } else if (idToImpMap[id].banner) {
         bid.ad = idToBidMap[id].adm;
         bid.width = idToBidMap[id].w || idToImpMap[id].banner.w;
         bid.height = idToBidMap[id].h || idToImpMap[id].banner.h;
+      } else if (idToImpMap[id]['native']) {
+        bid['native'] = nativeResponse(idToImpMap[id], idToBidMap[id]);
+        bid.mediaType = 'native';
       }
       bids.push(bid);
     }
@@ -154,7 +155,7 @@ function impression(slot) {
     'native': nativeImpression(slot),
     tagid: slot.params.ct.toString(),
     video: video(slot),
-    bidfloor: slot.params.bidfloor,
+    bidfloor: bidFloor(slot),
     ext: ext(slot),
   };
 }
@@ -165,12 +166,12 @@ function impression(slot) {
 function banner(slot) {
   const sizes = parseSizes(slot);
   const size = adSize(slot, sizes);
-  return (slot.nativeParams || slot.params.video) ? null : {
+  return (slot.mediaTypes && slot.mediaTypes.banner) ? {
     w: size[0],
     h: size[1],
     battr: slot.params.battr,
     format: sizes
-  };
+  } : null;
 }
 
 /**
@@ -192,7 +193,11 @@ function parseSizes(slot) {
  */
 function video(slot) {
   if (slot.params.video) {
-    return Object.assign({}, slot.params.video, {battr: slot.params.battr});
+    return Object.assign({},
+      slot.params.video, // previously supported as bidder param
+      slot.mediaTypes && slot.mediaTypes.video ? slot.mediaTypes.video : {}, // params on mediaTypes.video
+      {battr: slot.params.battr}
+    );
   }
   return null;
 }
@@ -420,8 +425,8 @@ function user(bidRequest, bidderRequest) {
       addExternalUserId(ext.eids, bidRequest.userId.britepoolid, 'britepool.com');
       addExternalUserId(ext.eids, bidRequest.userId.criteoId, 'criteo');
       addExternalUserId(ext.eids, bidRequest.userId.idl_env, 'identityLink');
-      addExternalUserId(ext.eids, bidRequest.userId.id5id, 'id5-sync.com');
-      addExternalUserId(ext.eids, bidRequest.userId.parrableid, 'parrable.com');
+      addExternalUserId(ext.eids, utils.deepAccess(bidRequest, 'userId.id5id.uid'), 'id5-sync.com', utils.deepAccess(bidRequest, 'userId.id5id.ext'));
+      addExternalUserId(ext.eids, utils.deepAccess(bidRequest, 'userId.parrableId.eid'), 'parrable.com');
       // liveintent
       if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
         addExternalUserId(ext.eids, bidRequest.userId.lipb.lipbid, 'liveintent.com');
@@ -519,4 +524,19 @@ function nativeResponse(imp, bid) {
   return null;
 }
 
+function bidFloor(slot) {
+  let floor = slot.params.bidfloor;
+  if (utils.isFn(slot.getFloor)) {
+    const floorData = slot.getFloor({
+      mediaType: slot.mediaTypes.banner ? 'banner' : slot.mediaTypes.video ? 'video' : 'Native',
+      size: '*',
+      currency: DEFAULT_CURRENCY,
+    });
+    if (floorData && floorData.floor) {
+      floor = floorData.floor;
+    }
+  }
+  return floor;
+}
+
 registerBidder(spec);
diff --git a/modules/pulsepointBidAdapter.md b/modules/pulsepointBidAdapter.md
index 36d4ef6cce5..7f4b7e6b611 100644
--- a/modules/pulsepointBidAdapter.md
+++ b/modules/pulsepointBidAdapter.md
@@ -45,23 +45,21 @@ Please use ```pulsepoint``` as the bidder code.
       mediaTypes: {
         video: {
             playerSize: [640, 480],
-            context: 'outstream'
+            context: 'outstream',
+            h: 300,
+            w: 400,
+            minduration: 1,
+            maxduration: 210,
+            linearity: 1,
+            mimes: ["video/mp4", "video/ogg", "video/webm"],
+            pos: 3
         }
       },
       bids: [{
           bidder: 'pulsepoint',
           params: { 
               cp: 512379,
-              ct: 505642,
-              video: {
-                  h: 300,
-                  w: 400,
-                  minduration: 1,
-                  maxduration: 210,
-                  linearity: 1,
-                  mimes: ["video/mp4", "video/ogg", "video/webm"],
-                  pos: 3
-              }
+              ct: 505642
           }
       }],
       renderer: {
@@ -74,7 +72,12 @@ Please use ```pulsepoint``` as the bidder code.
         mediaTypes: {
             video: {
                 playerSize: [640, 480],
-                context: 'instream'
+                context: 'instream',
+                h: 300,
+                w: 400,
+                minduration: 1,
+                maxduration: 210,
+                protocols: [2,3,5]
             }
         },
         bids: [{
@@ -82,14 +85,6 @@ Please use ```pulsepoint``` as the bidder code.
             params: {
                 cp: 512379,
                 ct: 694973, 
-                video: {
-                    battr: [1,3],
-                    h: 300,
-                    w: 400,
-                    minduration: 1,
-                    maxduration: 210,
-                    protocols: [2,3,5]
-                }
             }
         }]
     }];
diff --git a/modules/quantcastBidAdapter.js b/modules/quantcastBidAdapter.js
index 91022d70df9..ecb5ad3176e 100644
--- a/modules/quantcastBidAdapter.js
+++ b/modules/quantcastBidAdapter.js
@@ -1,6 +1,7 @@
 import * as utils from '../src/utils.js';
 import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
+import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import find from 'core-js-pure/features/array/find.js';
 
@@ -18,35 +19,38 @@ export const QUANTCAST_TEST_PUBLISHER = 'test-publisher';
 export const QUANTCAST_TTL = 4;
 export const QUANTCAST_PROTOCOL = 'https';
 export const QUANTCAST_PORT = '8443';
+export const QUANTCAST_FPA = '__qca';
+
+export const storage = getStorageManager(QUANTCAST_VENDOR_ID, BIDDER_CODE);
 
 function makeVideoImp(bid) {
-  const video = {};
-  if (bid.params.video) {
-    video['mimes'] = bid.params.video.mimes;
-    video['minduration'] = bid.params.video.minduration;
-    video['maxduration'] = bid.params.video.maxduration;
-    video['protocols'] = bid.params.video.protocols;
-    video['startdelay'] = bid.params.video.startdelay;
-    video['linearity'] = bid.params.video.linearity;
-    video['battr'] = bid.params.video.battr;
-    video['maxbitrate'] = bid.params.video.maxbitrate;
-    video['playbackmethod'] = bid.params.video.playbackmethod;
-    video['delivery'] = bid.params.video.delivery;
-    video['placement'] = bid.params.video.placement;
-    video['api'] = bid.params.video.api;
-  }
-  if (bid.mediaTypes.video.mimes) {
-    video['mimes'] = bid.mediaTypes.video.mimes;
+  const videoInMediaType = utils.deepAccess(bid, 'mediaTypes.video') || {};
+  const videoInParams = utils.deepAccess(bid, 'params.video') || {};
+  const video = Object.assign({}, videoInParams, videoInMediaType);
+
+  if (video.playerSize) {
+    video.w = video.playerSize[0];
+    video.h = video.playerSize[1];
   }
-  if (utils.isArray(bid.mediaTypes.video.playerSize[0])) {
-    video['w'] = bid.mediaTypes.video.playerSize[0][0];
-    video['h'] = bid.mediaTypes.video.playerSize[0][1];
-  } else {
-    video['w'] = bid.mediaTypes.video.playerSize[0];
-    video['h'] = bid.mediaTypes.video.playerSize[1];
+  const videoCopy = {
+    mimes: video.mimes,
+    minduration: video.minduration,
+    maxduration: video.maxduration,
+    protocols: video.protocols,
+    startdelay: video.startdelay,
+    linearity: video.linearity,
+    battr: video.battr,
+    maxbitrate: video.maxbitrate,
+    playbackmethod: video.playbackmethod,
+    delivery: video.delivery,
+    placement: video.placement,
+    api: video.api,
+    w: video.w,
+    h: video.h
   }
+
   return {
-    video: video,
+    video: videoCopy,
     placementCode: bid.placementCode,
     bidFloor: bid.params.bidFloor || DEFAULT_BID_FLOOR
   };
@@ -85,11 +89,6 @@ function checkTCFv1(vendorData) {
 }
 
 function checkTCFv2(tcData) {
-  if (tcData.purposeOneTreatment && tcData.publisherCC === 'DE') {
-    // special purpose 1 treatment for Germany
-    return true;
-  }
-
   let restrictions = tcData.publisher ? tcData.publisher.restrictions : {};
   let qcRestriction = restrictions && restrictions[PURPOSE_DATA_COLLECT]
     ? restrictions[PURPOSE_DATA_COLLECT][QUANTCAST_VENDOR_ID]
@@ -106,15 +105,21 @@ function checkTCFv2(tcData) {
   return !!(vendorConsent && purposeConsent);
 }
 
+function getQuantcastFPA() {
+  let fpa = storage.getCookie(QUANTCAST_FPA)
+  return fpa || ''
+}
+
+let hasUserSynced = false;
+
 /**
  * The documentation for Prebid.js Adapter 1.0 can be found at link below,
  * http://prebid.org/dev-docs/bidder-adapter-1.html
  */
 export const spec = {
   code: BIDDER_CODE,
-  GVLID: 11,
+  GVLID: QUANTCAST_VENDOR_ID,
   supportedMediaTypes: ['banner', 'video'],
-  hasUserSynced: false,
 
   /**
    * Verify the `AdUnits.bids` response with `true` for valid request and `false`
@@ -193,7 +198,8 @@ export const spec = {
         uspSignal: uspConsent ? 1 : 0,
         uspConsent,
         coppa: config.getConfig('coppa') === true ? 1 : 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: getQuantcastFPA()
       };
 
       const data = JSON.stringify(requestData);
@@ -242,7 +248,7 @@ export const spec = {
     }
 
     const bidResponsesList = response.bids.map(bid => {
-      const { ad, cpm, width, height, creativeId, currency, videoUrl, dealId } = bid;
+      const { ad, cpm, width, height, creativeId, currency, videoUrl, dealId, meta } = bid;
 
       const result = {
         requestId: response.requestId,
@@ -265,6 +271,11 @@ export const spec = {
         result['dealId'] = dealId;
       }
 
+      if (meta !== undefined && meta.advertiserDomains && utils.isArray(meta.advertiserDomains)) {
+        result.meta = {};
+        result.meta.advertiserDomains = meta.advertiserDomains;
+      }
+
       return result;
     });
 
@@ -276,7 +287,7 @@ export const spec = {
   },
   getUserSyncs(syncOptions, serverResponses) {
     const syncs = []
-    if (!this.hasUserSynced && syncOptions.pixelEnabled) {
+    if (!hasUserSynced && syncOptions.pixelEnabled) {
       const responseWithUrl = find(serverResponses, serverResponse =>
         utils.deepAccess(serverResponse.body, 'userSync.url')
       );
@@ -288,12 +299,12 @@ export const spec = {
           url: url
         });
       }
-      this.hasUserSynced = true;
+      hasUserSynced = true;
     }
     return syncs;
   },
   resetUserSync() {
-    this.hasUserSynced = false;
+    hasUserSynced = false;
   }
 };
 
diff --git a/modules/quantcastIdSystem.js b/modules/quantcastIdSystem.js
new file mode 100644
index 00000000000..7d82be884da
--- /dev/null
+++ b/modules/quantcastIdSystem.js
@@ -0,0 +1,224 @@
+/**
+ * This module adds QuantcastID to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/quantcastIdSystem
+ * @requires module:modules/userId
+ */
+
+import {submodule} from '../src/hook.js'
+import { getStorageManager } from '../src/storageManager.js';
+import { triggerPixel, logInfo } from '../src/utils.js';
+import { uspDataHandler, coppaDataHandler, gdprDataHandler } from '../src/adapterManager.js';
+
+const QUANTCAST_FPA = '__qca';
+const DEFAULT_COOKIE_EXP_DAYS = 392; // (13 months - 2 days)
+const DAY_MS = 86400000;
+const PREBID_PCODE = 'p-KceJUEvXN48CE';
+const QSERVE_URL = 'https://pixel.quantserve.com/pixel';
+const QUANTCAST_VENDOR_ID = '11';
+const PURPOSE_DATA_COLLECT = '1';
+const PURPOSE_PRODUCT_IMPROVEMENT = '10';
+const QC_TCF_REQUIRED_PURPOSES = [PURPOSE_DATA_COLLECT, PURPOSE_PRODUCT_IMPROVEMENT];
+const QC_TCF_CONSENT_FIRST_PURPOSES = [PURPOSE_DATA_COLLECT];
+const QC_TCF_CONSENT_ONLY_PUPROSES = [PURPOSE_DATA_COLLECT];
+const GDPR_PRIVACY_STRING = gdprDataHandler.getConsentData();
+const US_PRIVACY_STRING = uspDataHandler.getConsentData();
+
+export const storage = getStorageManager();
+
+export function firePixel(clientId, cookieExpDays = DEFAULT_COOKIE_EXP_DAYS) {
+  // check for presence of Quantcast Measure tag _qevent obj and publisher provided clientID
+  if (!window._qevents && clientId && clientId != '') {
+    var fpa = storage.getCookie(QUANTCAST_FPA);
+    var fpan = '0';
+    var domain = quantcastIdSubmodule.findRootDomain();
+    var now = new Date();
+    var usPrivacyParamString = '';
+    var firstPartyParamStrings;
+    var gdprParamStrings;
+
+    if (!fpa) {
+      var et = now.getTime();
+      var expires = new Date(et + (cookieExpDays * DAY_MS)).toGMTString();
+      var rand = Math.round(Math.random() * 2147483647);
+      fpa = `B0-${rand}-${et}`;
+      fpan = '1';
+      storage.setCookie(QUANTCAST_FPA, fpa, expires, '/', domain, null);
+    }
+
+    firstPartyParamStrings = `&fpan=${fpan}&fpa=${fpa}`;
+    gdprParamStrings = '&gdpr=0';
+    if (GDPR_PRIVACY_STRING && typeof GDPR_PRIVACY_STRING.gdprApplies === 'boolean' && GDPR_PRIVACY_STRING.gdprApplies) {
+      gdprParamStrings = `gdpr=1&gdpr_consent=${GDPR_PRIVACY_STRING.consentString}`;
+    }
+    if (US_PRIVACY_STRING && typeof US_PRIVACY_STRING === 'string') {
+      usPrivacyParamString = `&us_privacy=${US_PRIVACY_STRING}`;
+    }
+
+    let url = QSERVE_URL +
+    '?d=' + domain +
+    '&client_id=' + clientId +
+    '&a=' + PREBID_PCODE +
+    usPrivacyParamString +
+    gdprParamStrings +
+    firstPartyParamStrings;
+
+    triggerPixel(url);
+  }
+};
+
+export function hasGDPRConsent(gdprConsent) {
+  // Check for GDPR consent for purpose 1 and 10, and drop request if consent has not been given
+  // Remaining consent checks are performed server-side.
+  if (gdprConsent && typeof gdprConsent.gdprApplies === 'boolean' && gdprConsent.gdprApplies) {
+    if (!gdprConsent.vendorData) {
+      return false;
+    }
+    if (gdprConsent.apiVersion === 1) {
+      // We are not supporting TCF v1
+      return false;
+    }
+    if (gdprConsent.apiVersion === 2) {
+      return checkTCFv2(gdprConsent.vendorData);
+    }
+  }
+  return true;
+}
+
+export function checkTCFv2(vendorData, requiredPurposes = QC_TCF_REQUIRED_PURPOSES) {
+  var gdprApplies = vendorData.gdprApplies;
+  var purposes = vendorData.purpose;
+  var vendors = vendorData.vendor;
+  var qcConsent = vendors && vendors.consents && vendors.consents[QUANTCAST_VENDOR_ID];
+  var qcInterest = vendors && vendors.legitimateInterests && vendors.legitimateInterests[QUANTCAST_VENDOR_ID];
+  var restrictions = vendorData.publisher ? vendorData.publisher.restrictions : {};
+
+  if (!gdprApplies) {
+    return true;
+  }
+
+  return requiredPurposes.map(function(purpose) {
+    var purposeConsent = purposes.consents ? purposes.consents[purpose] : false;
+    var purposeInterest = purposes.legitimateInterests ? purposes.legitimateInterests[purpose] : false;
+
+    var qcRestriction = restrictions && restrictions[purpose]
+      ? restrictions[purpose][QUANTCAST_VENDOR_ID]
+      : null;
+
+    if (qcRestriction === 0) {
+      return false;
+    }
+
+    // Seek consent or legitimate interest based on our default legal
+    // basis for the purpose, falling back to the other if possible.
+    if (
+      // we have positive vendor consent
+      qcConsent &&
+      // there is positive purpose consent
+      purposeConsent &&
+      // publisher does not require legitimate interest
+      qcRestriction !== 2 &&
+      // purpose is a consent-first purpose or publisher has explicitly restricted to consent
+      (QC_TCF_CONSENT_FIRST_PURPOSES.indexOf(purpose) != -1 || qcRestriction === 1)
+    ) {
+      return true;
+    } else if (
+      // publisher does not require consent
+      qcRestriction !== 1 &&
+      // we have legitimate interest for vendor
+      qcInterest &&
+      // there is legitimate interest for purpose
+      purposeInterest &&
+      // purpose's legal basis does not require consent
+      QC_TCF_CONSENT_ONLY_PUPROSES.indexOf(purpose) == -1 &&
+      // purpose is a legitimate-interest-first purpose or publisher has explicitly restricted to legitimate interest
+      (QC_TCF_CONSENT_FIRST_PURPOSES.indexOf(purpose) == -1 || qcRestriction === 2)
+    ) {
+      return true;
+    }
+
+    return false;
+  }).reduce(function(a, b) {
+    return a && b;
+  }, true);
+}
+
+/**
+ * tests if us_privacy consent string is present, us_privacy applies, and notice_given / do-not-sell is set to yes
+ * @returns {boolean}
+ */
+export function hasCCPAConsent(usPrivacyConsent) {
+  if (
+    usPrivacyConsent &&
+    typeof usPrivacyConsent === 'string' &&
+    usPrivacyConsent.length == 4 &&
+    usPrivacyConsent.charAt(1) == 'Y' &&
+    usPrivacyConsent.charAt(2) == 'Y'
+  ) {
+    return false
+  }
+  return true;
+}
+
+/** @type {Submodule} */
+export const quantcastIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: 'quantcastId',
+
+  /**
+   * Vendor id of Quantcast
+   * @type {Number}
+   */
+  gvlid: QUANTCAST_VENDOR_ID,
+
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{quantcastId: string} | undefined}
+   */
+  decode(value) {
+    return value;
+  },
+
+  /**
+   * read Quantcast first party cookie and pass it along in quantcastId
+   * @function
+   * @returns {{id: {quantcastId: string} | undefined}}}
+   */
+  getId(config) {
+    // Consent signals are currently checked on the server side.
+    let fpa = storage.getCookie(QUANTCAST_FPA);
+
+    const coppa = coppaDataHandler.getCoppa();
+
+    if (coppa || !hasCCPAConsent(US_PRIVACY_STRING) || !hasGDPRConsent(GDPR_PRIVACY_STRING)) {
+      var expired = new Date(0).toUTCString();
+      var domain = quantcastIdSubmodule.findRootDomain();
+      logInfo('QuantcastId: Necessary consent not present for Id, exiting QuantcastId');
+      storage.setCookie(QUANTCAST_FPA, '', expired, '/', domain, null);
+      return undefined;
+    }
+
+    const configParams = (config && config.params) || {};
+    const storageParams = (config && config.storage) || {};
+
+    var clientId = configParams.clientId || '';
+    var cookieExpDays = storageParams.expires || DEFAULT_COOKIE_EXP_DAYS;
+
+    // Callbacks on Event Listeners won't trigger if the event is already complete so this check is required
+    if (document.readyState === 'complete') {
+      firePixel(clientId, cookieExpDays);
+    } else {
+      window.addEventListener('load', function () {
+        firePixel(clientId, cookieExpDays);
+      });
+    }
+
+    return { id: fpa ? { quantcastId: fpa } : undefined }
+  }
+};
+
+submodule('userId', quantcastIdSubmodule);
diff --git a/modules/quantcastIdSystem.md b/modules/quantcastIdSystem.md
new file mode 100644
index 00000000000..cf76099e4a5
--- /dev/null
+++ b/modules/quantcastIdSystem.md
@@ -0,0 +1,46 @@
+#### Overview
+
+```
+Module Name: Quantcast Id System
+Module Type: Id System
+Maintainer: asig@quantcast.com
+```
+
+#### Description
+
+ The Prebid Quantcast ID module stores a Quantcast ID in a first party cookie. The ID is then made available in the bid request. The ID from the cookie added in the bidstream allows Quantcast to more accurately bid on publisher inventories without third party cookies, which can result in better monetization across publisher sites from Quantcast. And, it’s free to use! For easier integration, you can work with one of our SSP partners, like PubMatic, who can facilitate the legal process as well as the software integration for you.
+
+ Add it to your Prebid.js package with:
+
+ `gulp build --modules=userId,quantcastIdSystem`
+
+ Quantcast’s privacy policies for the services rendered can be found at
+  		https://www.quantcast.com/privacy/
+
+ Publishers deploying the module are responsible for ensuring legally required notices and choices for users. 
+
+ The Quantcast ID module will only perform any action and return an ID in situations where:
+ 1. the publisher has not set a ‘coppa'  flag on the prebid configuration on their site (see [pbjs.setConfig.coppa](https://docs.prebid.org/dev-docs/publisher-api-reference/setConfig.html#setConfig-coppa)) 
+ 2. there is not a IAB us-privacy string indicating the digital property has provided user notice and the user has made a choice to opt out of sale
+ 3. if GDPR applies, an IAB TCF v2 string exists indicating that Quantcast does not have consent for purpose 1 (cookies, device identifiers, or other information can be stored or accessed on your device for the purposes presented to you), or an established legal basis (by default legitimate interest) for purpose 10 (your data can be used to improve existing systems and software, and to develop new products).
+
+ #### Quantcast ID Configuration
+
+ | Param under userSync.userIds[] | Scope | Type | Description | Example |
+ | --- | --- | --- | --- | --- |
+ | name | Required | String | `"quantcastId"` | `"quantcastId"` |
+ | params | Optional | Object | Details for Quantcast initialization. | |
+ | params.ClientID | Optional | String | Optional parameter for Quantcast prebid managed service partners. The parameter is not required for websites with Quantcast Measure tag. Reach out to Quantcast for ClientID if you are not an existing Quantcast prebid managed service partner: quantcast-idsupport@quantcast.com.  | |
+
+
+ #### Quantcast ID Example
+
+```js
+ pbjs.setConfig({
+     userSync: {
+         userIds: [{
+             name: "quantcastId"
+         }]
+     }
+ });
+```
diff --git a/modules/quantumBidAdapter.js b/modules/quantumBidAdapter.js
deleted file mode 100644
index f5da6e022f1..00000000000
--- a/modules/quantumBidAdapter.js
+++ /dev/null
@@ -1,320 +0,0 @@
-import * as utils from '../src/utils.js';
-import { BANNER, NATIVE } from '../src/mediaTypes.js';
-import {registerBidder} from '../src/adapters/bidderFactory.js';
-
-const BIDDER_CODE = 'quantum';
-const ENDPOINT_URL = 'https://s.sspqns.com/hb';
-export const spec = {
-  code: BIDDER_CODE,
-  aliases: ['quantx', 'qtx'], // short 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.
-   */
-
-  isBidRequestValid: function (bid) {
-    return !!(bid.params && 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.
-   */
-  buildRequests: function (bidRequests, bidderRequest) {
-    return bidRequests.map(bid => {
-      const qtxRequest = {};
-      let bidId = '';
-
-      const params = bid.params;
-      let placementId = params.placementId;
-
-      let devEnpoint = false;
-      if (params.useDev && params.useDev === '1') {
-        devEnpoint = 'https://sdev.sspqns.com/hb';
-      }
-      let renderMode = 'native';
-      for (let i = 0; i < bid.sizes.length; i++) {
-        if (bid.sizes[i][0] > 1 && bid.sizes[i][1] > 1) {
-          renderMode = 'banner';
-          break;
-        }
-      }
-
-      let mediaType = (bid.mediaType === 'native' || utils.deepAccess(bid, 'mediaTypes.native')) ? 'native' : 'banner';
-
-      if (mediaType === 'native') {
-        renderMode = 'native';
-      }
-
-      if (!bidId) {
-        bidId = bid.bidId;
-      }
-      qtxRequest.auid = placementId;
-
-      if (bidderRequest && bidderRequest.gdprConsent) {
-        qtxRequest.quantx_user_consent_string = bidderRequest.gdprConsent.consentString;
-        qtxRequest.quantx_gdpr = bidderRequest.gdprConsent.gdprApplies === true ? 1 : 0;
-      };
-
-      const url = devEnpoint || ENDPOINT_URL;
-
-      return {
-        method: 'GET',
-        bidId: bidId,
-        sizes: bid.sizes,
-        mediaType: mediaType,
-        renderMode: renderMode,
-        url: url,
-        'data': qtxRequest,
-        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;
-    const bidResponses = [];
-    let responseCPM;
-    let bid = {};
-    let id = bidRequest.bidId;
-
-    if (serverBody.price && serverBody.price !== 0) {
-      responseCPM = parseFloat(serverBody.price);
-
-      bid.creativeId = serverBody.creative_id || '0';
-      bid.cpm = responseCPM;
-      bid.requestId = bidRequest.bidId;
-      bid.width = 1;
-      bid.height = 1;
-      bid.ttl = 200;
-      bid.netRevenue = true;
-      bid.currency = 'USD';
-
-      if (serverBody.native) {
-        bid.native = serverBody.native;
-      }
-      if (serverBody.cobj) {
-        bid.cobj = serverBody.cobj;
-      }
-      if (!utils.isEmpty(bidRequest.sizes)) {
-        bid.width = bidRequest.sizes[0][0];
-        bid.height = bidRequest.sizes[0][1];
-      }
-
-      bid.nurl = serverBody.nurl;
-      bid.sync = serverBody.sync;
-      if (bidRequest.renderMode && bidRequest.renderMode === 'banner') {
-        bid.mediaType = 'banner';
-        if (serverBody.native) {
-          const adAssetsUrl = 'https://cdn.elasticad.net/native/serve/js/quantx/quantumAd/';
-          let assets = serverBody.native.assets;
-          let link = serverBody.native.link;
-
-          let trackers = [];
-          if (serverBody.native.imptrackers) {
-            trackers = serverBody.native.imptrackers;
-          }
-
-          let jstracker = '';
-          if (serverBody.native.jstracker) {
-            jstracker = encodeURIComponent(serverBody.native.jstracker);
-          }
-
-          if (serverBody.nurl) {
-            trackers.push(serverBody.nurl);
-          }
-
-          let ad = {};
-          ad['trackers'] = trackers;
-          ad['jstrackers'] = jstracker;
-          ad['eventtrackers'] = serverBody.native.eventtrackers || [];
-
-          for (let i = 0; i < assets.length; i++) {
-            let asset = assets[i];
-            switch (asset['id']) {
-              case 1:
-                ad['title'] = asset['title']['text'];
-                break;
-              case 2:
-                ad['sponsor_logo'] = asset['img']['url'];
-                break;
-              case 3:
-                ad['content'] = asset['data']['value'];
-                break;
-              case 4:
-                ad['main_image'] = asset['img']['url'];
-                break;
-              case 6:
-                ad['teaser_type'] = 'vast';
-                ad['video_url'] = asset['video']['vasttag'];
-                break;
-              case 10:
-                ad['sponsor_name'] = asset['data']['value'];
-                break;
-              case 2001:
-                ad['expanded_content_type'] = 'embed';
-                ad['expanded_summary'] = asset['data']['value'];
-                break;
-              case 2002:
-                ad['expanded_content_type'] = 'vast';
-                ad['expanded_summary'] = asset['data']['value'];
-                break;
-              case 2003:
-                ad['sponsor_url'] = asset['data']['value'];
-                break;
-              case 2004: // prism
-                ad['content_type'] = 'prism';
-                break;
-              case 2005: // internal_landing_page
-                ad['content_type'] = 'internal_landing_page';
-                ad['internal_content_link'] = asset['data']['value'];
-                break;
-              case 2006: // teaser as vast
-                ad['teaser_type'] = 'vast';
-                ad['video_url'] = asset['data']['value'];
-                break;
-              case 2007:
-                ad['autoexpand_content_type'] = asset['data']['value'];
-                break;
-              case 2022: // content page
-                ad['content_type'] = 'full_text';
-                ad['full_text'] = asset['data']['value'];
-                break;
-            }
-          }
-
-          ad['action_url'] = link.url;
-
-          if (!ad['sponsor_url']) {
-            ad['sponsor_url'] = ad['action_url'];
-          }
-
-          ad['clicktrackers'] = [];
-          if (link.clicktrackers) {
-            ad['clicktrackers'] = link.clicktrackers;
-          }
-
-          ad['main_image'] = 'https://resize-ssp.adux.com/scalecrop-290x130/' + window.btoa(ad['main_image']) + '/external';
-
-          bid.ad = '
' +
-            '
' +
-            '  
' +
-            '    ' +
-            '    ' +
-            '  
' +
-            '  
' + ad['title'] + '
' +
-            '    
' + ad['content'] + ' 
' +
-            '  ' +
-            '
' +
-            '' +
-            '' +
-            '' +
-            '
';
-        }
-      } else {
-        // native
-        bid.mediaType = 'native';
-        if (bidRequest.mediaType === 'native') {
-          if (serverBody.native) {
-            let assets = serverBody.native.assets;
-            let link = serverBody.native.link;
-
-            let trackers = [];
-            if (serverBody.native.imptrackers) {
-              trackers = serverBody.native.imptrackers;
-            }
-
-            if (serverBody.nurl) {
-              trackers.push(serverBody.nurl);
-            }
-
-            let native = {};
-
-            for (let i = 0; i < assets.length; i++) {
-              let asset = assets[i];
-              switch (asset['id']) {
-                case 1:
-                  native.title = asset['title']['text'];
-                  break;
-                case 2:
-                  native.icon = {
-                    url: asset['img']['url'],
-                    width: asset['img']['w'],
-                    height: asset['img']['h']
-                  };
-                  break;
-                case 3:
-                  native.body = asset['data']['value'];
-                  break;
-                case 4:
-                  native.image = {
-                    url: asset['img']['url'],
-                    width: asset['img']['w'],
-                    height: asset['img']['h']
-                  };
-                  break;
-                case 10:
-                  native.sponsoredBy = asset['data']['value'];
-                  break;
-              }
-            }
-            native.cta = 'read more';
-            if (serverBody.language) {
-              native.cta = 'read more';
-            }
-
-            native.clickUrl = link.url;
-            native.impressionTrackers = trackers;
-            if (link.clicktrackers) {
-              native.clickTrackers = link.clicktrackers;
-            }
-            native.eventtrackers = native.eventtrackers || [];
-
-            bid.qtx_native = utils.deepClone(serverBody.native);
-            bid.native = native;
-          }
-        }
-      }
-      bidResponses.push(bid);
-    }
-
-    return bidResponses;
-  },
-
-  /**
-   * Register the user sync pixels which should be dropped after the auction.
-   *
-   * @param {SyncOptions} syncOptions Which user syncs are allowed?
-   * @param {ServerResponse} serverResponse A successful response from the server
-   * @return {UserSync[]} The user syncs which should be dropped.
-   */
-  getUserSyncs: function (syncOptions, serverResponse) {
-    const syncs = [];
-    utils._each(serverResponse, function(serverResponse) {
-      if (serverResponse.body && serverResponse.body.sync) {
-        utils._each(serverResponse.body.sync, function (pixel) {
-          syncs.push({
-            type: 'image',
-            url: pixel
-          });
-        });
-      }
-    });
-    return syncs;
-  }
-}
-registerBidder(spec);
diff --git a/modules/quantumBidAdapter.md b/modules/quantumBidAdapter.md
deleted file mode 100644
index 572ca9ecd37..00000000000
--- a/modules/quantumBidAdapter.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Overview
-
-```
-Module Name:  Quantum Advertising Bid Adapter
-Module Type:  Bidder Adapter
-Maintainer: support.mediareporting@adux.com
-```
-
-# Description
-
-Connects to Quantum's ssp for bids.
-
-# Sample Ad Unit: For Publishers
-```
-var adUnits = [{
-          code: 'quantum-adUnit-id-1',
-          sizes: [[300, 250]],
-          bids: [{
-              bidder: 'quantum',
-              params: {
-                placementId: 21546 //quantum adUnit id
-              }      
-            }]
-        },{
-          code: 'quantum-native-adUnit-id-1',
-          sizes: [[0, 0]],
-          mediaTypes: 'native',
-          bids: [{
-              bidder: 'quantum',
-              params: {
-                placementId: 21546 //quantum adUnit id
-              }      
-            }]
-        }];
-```
-
-# Ad Unit and Setup: For Testing
-
-```
-
-
-  
-
-    
-    
-  
-
-
-  ```
diff --git a/modules/quantumdexBidAdapter.md b/modules/quantumdexBidAdapter.md
index 8c35ea8cb05..b88190cda94 100644
--- a/modules/quantumdexBidAdapter.md
+++ b/modules/quantumdexBidAdapter.md
@@ -1,15 +1,15 @@
 # Overview
 
 ```
-Module Name: Quantum Digital Exchange Bidder Adapter
+Module Name: APAC Digital Exchange Bidder Adapter
 Module Type: Bidder Adapter
-Maintainer: ken@quantumdex.io
+Maintainer: ken@apacdex.com
 ```
 
 # Description
 
-Connects to Quantum Digital Exchange for bids.
-Quantumdex bid adapter supports Banner and Video (Instream and Outstream) ads.
+Connects to APAC Digital Exchange for bids.
+Apacdex bid adapter supports Banner and Video (Instream and Outstream) ads.
 
 # Test Parameters
 ```
@@ -23,9 +23,9 @@ var adUnits = [
     },
     bids: [
       {
-          bidder: 'quantumdex',
+          bidder: 'apacdex',
           params: {
-              siteId: 'quantumdex-site-id', // siteId provided by Quantumdex
+              siteId: 'apacdex1234', // siteId provided by Apacdex
           }
       }
     ]
@@ -46,9 +46,9 @@ var videoAdUnit = {
   },
   bids: [
     {
-      bidder: 'quantumdex',
+      bidder: 'apacdex',
       params: {
-        siteId: 'quantumdex-site-id', // siteId provided by Quantumdex
+        siteId: 'apacdex1234', // siteId provided by Apacdex
       }
     }
   ]
diff --git a/modules/qwarryBidAdapter.js b/modules/qwarryBidAdapter.js
new file mode 100644
index 00000000000..c9a86f73910
--- /dev/null
+++ b/modules/qwarryBidAdapter.js
@@ -0,0 +1,102 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { deepClone } from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'qwarry';
+export const ENDPOINT = 'https://bidder.qwarry.co/bid/adtag?prebid=true'
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: ['banner', 'video'],
+
+  isBidRequestValid: function (bid) {
+    return !!(bid.params && bid.params.zoneToken);
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    let bids = [];
+    validBidRequests.forEach(bidRequest => {
+      bids.push({
+        bidId: bidRequest.bidId,
+        zoneToken: bidRequest.params.zoneToken,
+        pos: bidRequest.params.pos,
+        sizes: prepareSizes(bidRequest.sizes)
+      })
+    })
+
+    let payload = {
+      requestId: bidderRequest.bidderRequestId,
+      bids,
+      referer: bidderRequest.refererInfo.referer,
+      schain: validBidRequests[0].schain
+    }
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdprConsent = {
+        consentRequired: (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : false,
+        consentString: bidderRequest.gdprConsent.consentString
+      }
+    }
+
+    const options = {
+      contentType: 'application/json',
+      customHeaders: {
+        'Rtb-Direct': true
+      }
+    }
+
+    return {
+      method: 'POST',
+      url: ENDPOINT,
+      data: payload,
+      options
+    };
+  },
+
+  interpretResponse: function (serverResponse, request) {
+    const serverBody = serverResponse.body;
+    if (!serverBody || typeof serverBody !== 'object') {
+      return [];
+    }
+
+    const { prebidResponse } = serverBody;
+    if (!prebidResponse || typeof prebidResponse !== 'object') {
+      return [];
+    }
+
+    let bids = [];
+    prebidResponse.forEach(bidResponse => {
+      let bid = deepClone(bidResponse);
+      bid.cpm = parseFloat(bidResponse.cpm);
+
+      // banner or video
+      if (VIDEO === bid.format) {
+        bid.vastXml = bid.ad;
+      }
+
+      bid.meta = {};
+      bid.meta.advertiserDomains = bid.adomain || [];
+
+      bids.push(bid);
+    })
+
+    return bids;
+  },
+
+  onBidWon: function (bid) {
+    if (bid.winUrl) {
+      const cpm = bid.cpm;
+      const winUrl = bid.winUrl.replace(/\$\{AUCTION_PRICE\}/, cpm);
+      ajax(winUrl, null);
+      return true;
+    }
+    return false;
+  }
+}
+
+function prepareSizes(sizes) {
+  return sizes && sizes.map(size => ({ width: size[0], height: size[1] }));
+}
+
+registerBidder(spec);
diff --git a/modules/qwarryBidAdapter.md b/modules/qwarryBidAdapter.md
new file mode 100644
index 00000000000..056ccb51293
--- /dev/null
+++ b/modules/qwarryBidAdapter.md
@@ -0,0 +1,28 @@
+# Overview
+
+```
+Module Name: Qwarry Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: akascheev@asteriosoft.com
+```
+
+# Description
+
+Connects to Qwarry Bidder for bids.
+Qwarry bid adapter supports Banner and Video ads.
+
+# Test Parameters
+```
+const adUnits = [
+  {
+    bids: [
+      {
+          bidder: 'qwarry',
+          params: {
+              zoneToken: '?????????????????????', // zoneToken provided by Qwarry
+          }
+      }
+    ]
+  }
+];
+```
diff --git a/modules/radsBidAdapter.js b/modules/radsBidAdapter.js
index 1f07cc07b91..8f3cbe02f23 100644
--- a/modules/radsBidAdapter.js
+++ b/modules/radsBidAdapter.js
@@ -57,7 +57,7 @@ export const spec = {
           bid_id: bidId,
         };
       }
-      prepareExtraParams(params, payload);
+      prepareExtraParams(params, payload, bidderRequest);
 
       return {
         method: 'GET',
@@ -97,9 +97,46 @@ export const spec = {
       bidResponses.push(bidResponse);
     }
     return bidResponses;
+  },
+  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 (syncOptions.iframeEnabled) {
+      serverResponses[0].body.userSync.iframeUrl.forEach((url) => syncs.push({
+        type: 'iframe',
+        url: appendToUrl(url, gdprParams)
+      }));
+    }
+    if (syncOptions.pixelEnabled && serverResponses.length > 0) {
+      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;
@@ -125,10 +162,23 @@ function isVideoRequest(bid) {
   return bid.mediaType === 'video' || !!utils.deepAccess(bid, 'mediaTypes.video');
 }
 
-function prepareExtraParams(params, payload) {
+function prepareExtraParams(params, payload, bidderRequest) {
   if (params.pfilter !== undefined) {
     payload.pfilter = params.pfilter;
   }
+
+  if (bidderRequest && bidderRequest.gdprConsent) {
+    if (payload.pfilter !== undefined) {
+      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 (params.bcat !== undefined) {
     payload.bcat = params.bcat;
   }
diff --git a/modules/readpeakBidAdapter.js b/modules/readpeakBidAdapter.js
index c72bbdd658f..31e430d79f9 100644
--- a/modules/readpeakBidAdapter.js
+++ b/modules/readpeakBidAdapter.js
@@ -46,6 +46,19 @@ export const spec = {
       }
     };
 
+    if (bidderRequest.gdprConsent) {
+      request.user = {
+        ext: {
+          consent: bidderRequest.gdprConsent.consentString || ''
+        },
+      };
+      request.regs = {
+        ext: {
+          gdpr: bidderRequest.gdprConsent.gdprApplies !== undefined ? bidderRequest.gdprConsent.gdprApplies : true
+        }
+      };
+    }
+
     return {
       method: 'POST',
       url: ENDPOINT,
@@ -87,6 +100,11 @@ function bidResponseAvailable(bidRequest, bidResponse) {
         currency: bidResponse.cur,
         native: nativeResponse(idToImpMap[id], idToBidMap[id])
       };
+      if (idToBidMap[id].adomain) {
+        bid.meta = {
+          advertiserDomains: idToBidMap[id].adomain
+        }
+      }
       bids.push(bid);
     }
   });
@@ -94,11 +112,21 @@ function bidResponseAvailable(bidRequest, bidResponse) {
 }
 
 function impression(slot) {
+  let bidFloorFromModule
+  if (typeof slot.getFloor === 'function') {
+    const floorInfo = slot.getFloor({
+      currency: 'USD',
+      mediaType: 'native',
+      size: '\*'
+    });
+    bidFloorFromModule = floorInfo.currency === 'USD' ? floorInfo.floor : undefined;
+  }
   return {
     id: slot.bidId,
     native: nativeImpression(slot),
-    bidfloor: slot.params.bidfloor || 0,
-    bidfloorcur: slot.params.bidfloorcur || 'USD'
+    bidfloor: bidFloorFromModule || slot.params.bidfloor || 0,
+    bidfloorcur: (bidFloorFromModule && 'USD') || slot.params.bidfloorcur || 'USD',
+    tagId: slot.params.tagId || '0'
   };
 }
 
diff --git a/modules/readpeakBidAdapter.md b/modules/readpeakBidAdapter.md
index a15767f29a7..da250e7f77a 100644
--- a/modules/readpeakBidAdapter.md
+++ b/modules/readpeakBidAdapter.md
@@ -4,7 +4,7 @@ Module Name: ReadPeak Bid Adapter
 
 Module Type: Bidder Adapter
 
-Maintainer: kurre.stahlberg@readpeak.com
+Maintainer: devteam@readpeak.com
 
 # Description
 
@@ -23,7 +23,8 @@ Please reach out to your account team or hello@readpeak.com for more information
             params: {
                 bidfloor: 5.00,
                 publisherId: 'test',
-                siteId: 'test'
+                siteId: 'test',
+                tagId: 'test-tag-1'
             },
         }]
     }];
diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
new file mode 100644
index 00000000000..f8636862d4c
--- /dev/null
+++ b/modules/reconciliationRtdProvider.js
@@ -0,0 +1,295 @@
+/**
+ * This module adds reconciliation provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will add custom targetings to ad units
+ * The module will listen to post messages from rendered creatives with Reconciliation Tag
+ * The module will call tracking pixels to log info needed for reconciliation matching
+ * @module modules/reconciliationRtdProvider
+ * @requires module:modules/realTimeData
+ */
+
+/**
+ * @typedef {Object} ModuleParams
+ * @property {string} publisherMemberId
+ * @property {?string} initUrl
+ * @property {?string} impressionUrl
+ * @property {?boolean} allowAccess
+ */
+
+import { submodule } from '../src/hook.js';
+import { ajaxBuilder } from '../src/ajax.js';
+import * as utils from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
+
+/** @type {Object} */
+const MessageType = {
+  IMPRESSION_REQUEST: 'rsdk:impression:req',
+  IMPRESSION_RESPONSE: 'rsdk:impression:res',
+};
+/** @type {ModuleParams} */
+const DEFAULT_PARAMS = {
+  initUrl: 'https://confirm.fiduciadlt.com/init',
+  impressionUrl: 'https://confirm.fiduciadlt.com/pimp',
+  allowAccess: false,
+};
+/** @type {ModuleParams} */
+let _moduleParams = {};
+
+/**
+ * Handle postMesssage from ad creative, track impression
+ * and send response to reconciliation ad tag
+ * @param {Event} e
+ */
+function handleAdMessage(e) {
+  let data = {};
+  let adUnitId = '';
+  let adDeliveryId = '';
+
+  try {
+    data = JSON.parse(e.data);
+  } catch (e) {
+    return;
+  }
+
+  if (data.type === MessageType.IMPRESSION_REQUEST) {
+    if (utils.isGptPubadsDefined()) {
+      // 1. Find the last iframed window before window.top where the tracker was injected
+      // (the tracker could be injected in nested iframes)
+      const adWin = getTopIFrameWin(e.source);
+      if (adWin && adWin !== window.top) {
+        // 2. Find the GPT slot for the iframed window
+        const adSlot = getSlotByWin(adWin);
+        // 3. Get AdUnit IDs for the selected slot
+        if (adSlot) {
+          adUnitId = adSlot.getAdUnitPath();
+          adDeliveryId = adSlot.getTargeting('RSDK_ADID');
+          adDeliveryId = adDeliveryId.length
+            ? adDeliveryId[0]
+            : `${utils.timestamp()}-${utils.generateUUID()}`;
+        }
+      }
+    }
+
+    // Call local impression callback
+    const args = Object.assign({}, data.args, {
+      publisherDomain: window.location.hostname,
+      publisherMemberId: _moduleParams.publisherMemberId,
+      adUnitId,
+      adDeliveryId,
+    });
+
+    track.trackPost(_moduleParams.impressionUrl, args);
+
+    // Send response back to the Advertiser tag
+    let response = {
+      type: MessageType.IMPRESSION_RESPONSE,
+      id: data.id,
+      args: Object.assign(
+        {
+          publisherDomain: window.location.hostname,
+        },
+        data.args
+      ),
+    };
+
+    // If access is allowed - add ad unit id to response
+    if (_moduleParams.allowAccess) {
+      Object.assign(response.args, {
+        adUnitId,
+        adDeliveryId,
+      });
+    }
+
+    e.source.postMessage(JSON.stringify(response), '*');
+  }
+}
+
+/**
+ * Get top iframe window for nested Window object
+ * - top
+ * -- iframe.window  <-- top iframe window
+ * --- iframe.window
+ * ---- iframe.window <-- win
+ *
+ * @param {Window} win nested iframe window object
+ * @param {Window} topWin top window
+ */
+export function getTopIFrameWin(win, topWin) {
+  topWin = topWin || window;
+
+  if (!win) {
+    return null;
+  }
+
+  try {
+    while (win.parent !== topWin) {
+      win = win.parent;
+    }
+    return win;
+  } catch (e) {
+    return null;
+  }
+}
+
+/**
+ * get all slots on page
+ * @return {Object[]} slot GoogleTag slots
+ */
+function getAllSlots() {
+  return utils.isGptPubadsDefined() && window.googletag.pubads().getSlots();
+}
+
+/**
+ * get GPT slot by placement id
+ * @param {string} code placement id
+ * @return {?Object}
+ */
+function getSlotByCode(code) {
+  const slots = getAllSlots();
+  if (!slots || !slots.length) {
+    return null;
+  }
+  return (
+    find(
+      slots,
+      (s) => s.getSlotElementId() === code || s.getAdUnitPath() === code
+    ) || null
+  );
+}
+
+/**
+ * get GPT slot by iframe window
+ * @param {Window} win
+ * @return {?Object}
+ */
+export function getSlotByWin(win) {
+  const slots = getAllSlots();
+
+  if (!slots || !slots.length) {
+    return null;
+  }
+
+  return (
+    find(slots, (s) => {
+      let slotElement = document.getElementById(s.getSlotElementId());
+
+      if (slotElement) {
+        let slotIframe = slotElement.querySelector('iframe');
+
+        if (slotIframe && slotIframe.contentWindow === win) {
+          return true;
+        }
+      }
+
+      return false;
+    }) || null
+  );
+}
+
+/**
+ * Init Reconciliation post messages listeners to handle
+ * impressions messages from ad creative
+ */
+function initListeners() {
+  window.addEventListener('message', handleAdMessage, false);
+}
+
+/**
+ * Send init event to log
+ * @param {Array} adUnits
+ */
+function trackInit(adUnits) {
+  track.trackPost(
+    _moduleParams.initUrl,
+    {
+      adUnits,
+      publisherDomain: window.location.hostname,
+      publisherMemberId: _moduleParams.publisherMemberId,
+    }
+  );
+}
+
+/**
+ * Track event via POST request
+ * wrap method to allow stubbing in tests
+ * @param {string} url
+ * @param {Object} data
+ */
+export const track = {
+  trackPost(url, data) {
+    const ajax = ajaxBuilder();
+
+    ajax(
+      url,
+      function() {},
+      JSON.stringify(data),
+      {
+        method: 'POST',
+      }
+    );
+  }
+}
+
+/**
+ * Set custom targetings for provided adUnits
+ * @param {string[]} adUnitsCodes
+ * @return {Object} key-value object with custom targetings
+ */
+function getReconciliationData(adUnitsCodes) {
+  const dataToReturn = {};
+  const adUnitsToTrack = [];
+
+  adUnitsCodes.forEach((adUnitCode) => {
+    if (!adUnitCode) {
+      return;
+    }
+
+    const adSlot = getSlotByCode(adUnitCode);
+    const adUnitId = adSlot ? adSlot.getAdUnitPath() : adUnitCode;
+    const adDeliveryId = `${utils.timestamp()}-${utils.generateUUID()}`;
+
+    dataToReturn[adUnitCode] = {
+      RSDK_AUID: adUnitId,
+      RSDK_ADID: adDeliveryId,
+    };
+
+    adUnitsToTrack.push({
+      adUnitId,
+      adDeliveryId
+    });
+  }, {});
+
+  // Track init event
+  trackInit(adUnitsToTrack);
+
+  return dataToReturn;
+}
+
+/** @type {RtdSubmodule} */
+export const reconciliationSubmodule = {
+  /**
+   * used to link submodule with realTimeData
+   * @type {string}
+   */
+  name: 'reconciliation',
+  /**
+   * get data and send back to realTimeData module
+   * @function
+   * @param {string[]} adUnitsCodes
+   */
+  getTargetingData: getReconciliationData,
+  init: init,
+};
+
+function init(moduleConfig) {
+  const params = moduleConfig.params;
+  if (params && params.publisherMemberId) {
+    _moduleParams = Object.assign({}, DEFAULT_PARAMS, params);
+    initListeners();
+  } else {
+    utils.logError('missing params for Reconciliation provider');
+  }
+  return true;
+}
+
+submodule('realTimeData', reconciliationSubmodule);
diff --git a/modules/reconciliationRtdProvider.md b/modules/reconciliationRtdProvider.md
new file mode 100644
index 00000000000..53883ad99eb
--- /dev/null
+++ b/modules/reconciliationRtdProvider.md
@@ -0,0 +1,49 @@
+The purpose of this Real Time Data Provider is to allow publishers to match impressions accross the supply chain.
+
+**Reconciliation SDK**
+The purpose of Reconciliation SDK module is to collect supply chain structure information and vendor-specific impression IDs from suppliers participating in ad creative delivery and report it to the Reconciliation Service, allowing publishers, advertisers and other supply chain participants to match and reconcile ad server, SSP, DSP and veritifation system log file records. Reconciliation SDK was created as part of TAG DLT initiative ( https://www.tagtoday.net/pressreleases/dlt_9_7_2020 ).
+
+**Usage for Publishers:**
+
+Compile the Reconciliation Provider into your Prebid build:
+
+`gulp build --modules=reconciliationRtdProvider`
+
+Add Reconciliation real time data provider configuration by setting up a Prebid Config:
+
+```javascript
+const reconciliationDataProvider = {
+    name: "reconciliation",
+    params: {
+        publisherMemberId: "test_prebid_publisher", // required
+        allowAccess: true, //optional
+    }
+};
+
+pbjs.setConfig({
+    ...,
+    realTimeData: {
+      dataProviders: [
+          reconciliationDataProvider
+      ]
+    }
+});
+```
+
+where:
+- `publisherMemberId` (required) - ID associated with the publisher
+- `access` (optional) true/false - Whether ad markup will recieve Ad Unit Id's via Reconciliation Tag
+  
+**Example:**
+
+To view an example:
+ 
+- in your cli run:
+
+`gulp serve --modules=reconciliationRtdProvider,appnexusBidAdapter`
+
+Your could also change 'appnexusBidAdapter' to another one.
+
+- in your browser, navigate to:
+
+`http://localhost:9999/integrationExamples/gpt/reconciliationRtdProvider_example.html`
diff --git a/modules/relaidoBidAdapter.js b/modules/relaidoBidAdapter.js
index b3b8a647137..f69f8c5c6e2 100644
--- a/modules/relaidoBidAdapter.js
+++ b/modules/relaidoBidAdapter.js
@@ -6,36 +6,28 @@ import { getStorageManager } from '../src/storageManager.js';
 
 const BIDDER_CODE = 'relaido';
 const BIDDER_DOMAIN = 'api.relaido.jp';
-const ADAPTER_VERSION = '1.0.1';
+const ADAPTER_VERSION = '1.0.4';
 const DEFAULT_TTL = 300;
 const UUID_KEY = 'relaido_uuid';
 
 const storage = getStorageManager();
 
 function isBidRequestValid(bid) {
-  if (!utils.isSafariBrowser() && !hasUuid()) {
-    utils.logWarn('uuid is not found.');
-    return false;
-  }
   if (!utils.deepAccess(bid, 'params.placementId')) {
     utils.logWarn('placementId param is reqeuired.');
     return false;
   }
-  if (hasVideoMediaType(bid)) {
-    if (!isVideoValid(bid)) {
-      utils.logWarn('Invalid mediaType video.');
-      return false;
-    }
-  } else if (hasBannerMediaType(bid)) {
-    if (!isBannerValid(bid)) {
-      utils.logWarn('Invalid mediaType banner.');
-      return false;
-    }
+  if (hasVideoMediaType(bid) && isVideoValid(bid)) {
+    return true;
   } else {
-    utils.logWarn('Invalid mediaTypes input banner or video.');
-    return false;
+    utils.logWarn('Invalid mediaType video.');
+  }
+  if (hasBannerMediaType(bid) && isBannerValid(bid)) {
+    return true;
+  } else {
+    utils.logWarn('Invalid mediaType banner.');
   }
-  return true;
+  return false;
 }
 
 function buildRequests(validBidRequests, bidderRequest) {
@@ -47,7 +39,21 @@ function buildRequests(validBidRequests, bidderRequest) {
     const bidDomain = bidRequest.params.domain || BIDDER_DOMAIN;
     const bidUrl = `https://${bidDomain}/bid/v1/prebid/${placementId}`;
     const uuid = getUuid();
-    const mediaType = getMediaType(bidRequest);
+    let mediaType = '';
+    let width = 0;
+    let height = 0;
+
+    if (hasVideoMediaType(bidRequest) && isVideoValid(bidRequest)) {
+      const playerSize = getValidSizes(utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize'));
+      width = playerSize[0][0];
+      height = playerSize[0][1];
+      mediaType = VIDEO;
+    } else if (hasBannerMediaType(bidRequest) && isBannerValid(bidRequest)) {
+      const sizes = getValidSizes(utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes'));
+      width = sizes[0][0];
+      height = sizes[0][1];
+      mediaType = BANNER;
+    }
 
     let payload = {
       version: ADAPTER_VERSION,
@@ -61,18 +67,10 @@ function buildRequests(validBidRequests, bidderRequest) {
       transaction_id: bidRequest.transactionId,
       media_type: mediaType,
       uuid: uuid,
+      width: width,
+      height: height
     };
 
-    if (hasVideoMediaType(bidRequest)) {
-      const playerSize = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
-      payload.width = playerSize[0][0];
-      payload.height = playerSize[0][1];
-    } else if (hasBannerMediaType(bidRequest)) {
-      const sizes = utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes');
-      payload.width = sizes[0][0];
-      payload.height = sizes[0][1];
-    }
-
     // It may not be encoded, so add it at the end of the payload
     payload.ref = bidderRequest.refererInfo.referer;
 
@@ -87,10 +85,9 @@ function buildRequests(validBidRequests, bidderRequest) {
       player: bidRequest.params.player,
       width: payload.width,
       height: payload.height,
-      mediaType: mediaType,
+      mediaType: payload.media_type
     });
   }
-
   return bidRequests;
 }
 
@@ -101,10 +98,6 @@ function interpretResponse(serverResponse, bidRequest) {
     return [];
   }
 
-  if (body.uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, body.uuid);
-  }
-
   const playerUrl = bidRequest.player || body.playerUrl;
   const mediaType = bidRequest.mediaType || VIDEO;
 
@@ -119,6 +112,10 @@ function interpretResponse(serverResponse, bidRequest) {
     ttl: body.ttl || DEFAULT_TTL,
     netRevenue: true,
     mediaType: mediaType,
+    meta: {
+      advertiserDomains: body.adomain || [],
+      mediaType: VIDEO
+    }
   };
   if (mediaType === VIDEO) {
     bidResponse.vastXml = body.vast;
@@ -141,7 +138,6 @@ function getUserSyncs(syncOptions, serverResponses) {
   if (serverResponses.length > 0) {
     syncUrl = utils.deepAccess(serverResponses, '0.body.syncUrl') || syncUrl;
   }
-  receiveMessage();
   return [{
     type: 'iframe',
     url: syncUrl
@@ -171,6 +167,7 @@ function onTimeout(data) {
     auction_id: utils.deepAccess(data, '0.auctionId'),
     bid_id: utils.deepAccess(data, '0.bidId'),
     ad_unit_code: utils.deepAccess(data, '0.adUnitCode'),
+    version: ADAPTER_VERSION,
     ref: window.location.href,
   }).replace(/\&$/, '');
   const bidDomain = utils.deepAccess(data, '0.params.0.domain') || BIDDER_DOMAIN;
@@ -219,37 +216,20 @@ function outstreamRender(bid) {
   });
 }
 
-function receiveMessage() {
-  window.addEventListener('message', setUuid);
-}
-
-function setUuid(e) {
-  if (utils.isPlainObject(e.data) && e.data.relaido_uuid) {
-    storage.setDataInLocalStorage(UUID_KEY, e.data.relaido_uuid);
-    window.removeEventListener('message', setUuid);
-  }
-}
-
 function isBannerValid(bid) {
   if (!isMobile()) {
     return false;
   }
-  const sizes = utils.deepAccess(bid, 'mediaTypes.banner.sizes');
-  if (sizes && utils.isArray(sizes)) {
-    if (utils.isArray(sizes[0])) {
-      const width = sizes[0][0];
-      const height = sizes[0][1];
-      if (width >= 300 && height >= 250) {
-        return true;
-      }
-    }
+  const sizes = getValidSizes(utils.deepAccess(bid, 'mediaTypes.banner.sizes'));
+  if (sizes.length > 0) {
+    return true;
   }
   return false;
 }
 
 function isVideoValid(bid) {
-  const playerSize = utils.deepAccess(bid, 'mediaTypes.video.playerSize');
-  if (playerSize && utils.isArray(playerSize) && playerSize.length > 0) {
+  const playerSize = getValidSizes(utils.deepAccess(bid, 'mediaTypes.video.playerSize'));
+  if (playerSize.length > 0) {
     const context = utils.deepAccess(bid, 'mediaTypes.video.context');
     if (context && context === 'outstream') {
       return true;
@@ -258,12 +238,12 @@ function isVideoValid(bid) {
   return false;
 }
 
-function hasUuid() {
-  return !!storage.getDataFromLocalStorage(UUID_KEY);
-}
-
 function getUuid() {
-  return storage.getDataFromLocalStorage(UUID_KEY) || '';
+  const id = storage.getCookie(UUID_KEY)
+  if (id) return id;
+  const newId = utils.generateUUID();
+  storage.setCookie(UUID_KEY, newId);
+  return newId;
 }
 
 export function isMobile() {
@@ -274,15 +254,6 @@ export function isMobile() {
   return false;
 }
 
-function getMediaType(bid) {
-  if (hasVideoMediaType(bid)) {
-    return VIDEO;
-  } else if (hasBannerMediaType(bid)) {
-    return BANNER;
-  }
-  return '';
-}
-
 function hasBannerMediaType(bid) {
   return !!utils.deepAccess(bid, 'mediaTypes.banner');
 }
@@ -291,6 +262,25 @@ function hasVideoMediaType(bid) {
   return !!utils.deepAccess(bid, 'mediaTypes.video');
 }
 
+function getValidSizes(sizes) {
+  let result = [];
+  if (sizes && utils.isArray(sizes) && sizes.length > 0) {
+    for (let i = 0; i < sizes.length; i++) {
+      if (utils.isArray(sizes[i]) && sizes[i].length == 2) {
+        const width = sizes[i][0];
+        const height = sizes[i][1];
+        if (width == 1 && height == 1) {
+          return [[1, 1]];
+        }
+        if ((width >= 300 && height >= 250)) {
+          result.push([width, height]);
+        }
+      }
+    }
+  }
+  return result;
+}
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
diff --git a/modules/relevantAnalyticsAdapter.js b/modules/relevantAnalyticsAdapter.js
new file mode 100644
index 00000000000..5917262c810
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.js
@@ -0,0 +1,33 @@
+import adapter from '../src/AnalyticsAdapter.js';
+import adapterManager from '../src/adapterManager.js';
+
+const relevantAnalytics = adapter({ analyticsType: 'bundle', handler: 'on' });
+
+const { enableAnalytics: orgEnableAnalytics } = relevantAnalytics;
+
+Object.assign(relevantAnalytics, {
+  /**
+   * Save event in the global array that will be consumed later by the Relevant Yield library
+   */
+  track: ({ eventType: ev, args }) => {
+    window.relevantDigital.pbEventLog.push({ ev, args, ts: new Date() });
+  },
+
+  /**
+   * Before forwarding the call to the original enableAnalytics function -
+   * create (if needed) the global array that is used to pass events to the Relevant Yield library
+   * by the 'track' function above.
+   */
+  enableAnalytics: function(...args) {
+    window.relevantDigital = window.relevantDigital || {};
+    window.relevantDigital.pbEventLog = window.relevantDigital.pbEventLog || [];
+    return orgEnableAnalytics.call(this, ...args);
+  },
+});
+
+adapterManager.registerAnalyticsAdapter({
+  adapter: relevantAnalytics,
+  code: 'relevant',
+});
+
+export default relevantAnalytics;
diff --git a/modules/relevantAnalyticsAdapter.md b/modules/relevantAnalyticsAdapter.md
new file mode 100644
index 00000000000..e6383fa77e1
--- /dev/null
+++ b/modules/relevantAnalyticsAdapter.md
@@ -0,0 +1,13 @@
+# Overview
+
+Module Name: Relevant Yield Analytics Adapter
+
+Module Type: Analytics Adapter
+
+Maintainer: [support@relevant-digital.com](mailto:support@relevant-digital.com)
+
+# Description
+
+Analytics adapter to be used with [Relevant Yield](https://www.relevant-digital.com/relevantyield)
+
+Contact [sales@relevant-digital.com](mailto:sales@relevant-digital.com) for information.
diff --git a/modules/resetdigitalBidAdapter.js b/modules/resetdigitalBidAdapter.js
new file mode 100644
index 00000000000..adfd8a9a9af
--- /dev/null
+++ b/modules/resetdigitalBidAdapter.js
@@ -0,0 +1,138 @@
+
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {getOrigin} from '../src/utils.js';
+const BIDDER_CODE = 'resetdigital';
+
+export const spec = {
+  code: BIDDER_CODE,
+  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
+
+    const payload = {
+      start_time: utils.timestamp(),
+      language: window.navigator.userLanguage || window.navigator.language,
+      site: {
+        domain: getOrigin(),
+        iframe: !bidderRequest.refererInfo.reachedTop,
+        url: stack && stack.length > 0 ? [stack.length - 1] : null,
+        https: (window.location.protocol === 'https:'),
+        referrer: bidderRequest.refererInfo.referer
+      },
+      imps: [],
+      user_ids: validBidRequests[0].userId,
+      sync_limit: spb
+    };
+
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      payload.gdpr = {
+        applies: bidderRequest.gdprConsent.gdprApplies,
+        consent: bidderRequest.gdprConsent.consentString
+      };
+    }
+
+    for (let x = 0; x < validBidRequests.length; x++) {
+      let req = validBidRequests[x]
+
+      payload.imps.push({
+        pub_id: req.params.pubId,
+        zone_id: req.params.zoneId,
+        bid_id: req.bidId,
+        imp_id: req.transactionId,
+        sizes: req.sizes,
+        force_bid: req.params.forceBid,
+        media_types: utils.deepAccess(req, 'mediaTypes')
+      });
+    }
+
+    let params = validBidRequests[0].params
+    let url = params.endpoint ? params.endpoint : '//hb.vhsrv.com'
+    return {
+      method: 'POST',
+      url: url,
+      data: JSON.stringify(payload)
+    };
+  },
+  interpretResponse: function(serverResponse, bidRequest) {
+    const bidResponses = [];
+    if (!serverResponse || !serverResponse.body) {
+      return bidResponses
+    }
+
+    let res = serverResponse.body;
+    if (!res.bids || !res.bids.length) {
+      return []
+    }
+
+    for (let x = 0; x < serverResponse.body.bids.length; x++) {
+      let bid = serverResponse.body.bids[x]
+
+      bidResponses.push({
+        requestId: bid.bid_id,
+        cpm: bid.cpm,
+        width: bid.w,
+        height: bid.h,
+        ad: bid.html,
+        vastUrl: bid.vast_url,
+        vastXml: bid.vast_xml,
+        mediaType: bid.html ? 'banner' : 'video',
+        ttl: 120,
+        creativeId: bid.crid,
+        dealId: bid.deal_id,
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: bid.adomain
+        }
+      })
+    }
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
+    const syncs = []
+
+    if (!serverResponses.length || !serverResponses[0].body) {
+      return syncs
+    }
+
+    let pixels = serverResponses[0].body.pixels
+    if (!pixels || !pixels.length) {
+      return syncs
+    }
+
+    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}`
+      }
+    }
+
+    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)
+      }
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/resetdigitalBidAdapter.md b/modules/resetdigitalBidAdapter.md
new file mode 100644
index 00000000000..2f9f69b5e84
--- /dev/null
+++ b/modules/resetdigitalBidAdapter.md
@@ -0,0 +1,37 @@
+# Overview
+
+```
+Module Name: ResetDigital Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: bruce@resetdigital.co
+```
+
+# Description
+
+Prebid adapter for Reset Digital. Requires approval and account setup.
+Video is supported but requires a publisher supplied renderer at this time.
+
+# Test Parameters
+
+## Web
+```
+    var adUnits = [
+           {
+               code: 'your-div',
+               mediaTypes: {
+                   banner: {
+                       sizes: [[300,250]]
+                   }
+               },
+               bids: [
+                   {
+                       bidder: "resetdigital",
+                       params: {
+                           pubId: "your-pub-id",
+                           forceBid: true
+                       }
+                   }
+               ]
+           }
+       ];
+```
diff --git a/modules/rhythmoneBidAdapter.js b/modules/rhythmoneBidAdapter.js
index 1acbcfd0463..fa090044f05 100644
--- a/modules/rhythmoneBidAdapter.js
+++ b/modules/rhythmoneBidAdapter.js
@@ -253,6 +253,9 @@ function RhythmOneBidAdapter() {
         cpm: parseFloat(bid.price),
         width: bid.w,
         height: bid.h,
+        meta: {
+          advertiserDomains: bid.adomain
+        },
         creativeId: bid.crid,
         currency: 'USD',
         netRevenue: true,
diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
index 43bef356a73..4b556e83236 100755
--- a/modules/richaudienceBidAdapter.js
+++ b/modules/richaudienceBidAdapter.js
@@ -9,28 +9,29 @@ let REFERER = '';
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: 108,
   aliases: ['ra'],
   supportedMediaTypes: [BANNER, VIDEO],
 
   /***
-     * Determines whether or not the given bid request is valid
-     *
-     * @param {bidRequest} bid The bid params to validate.
-     * @returns {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.
+   * @returns {boolean} True if this is a valid bid, and false otherwise
+   */
   isBidRequestValid: function (bid) {
     return !!(bid.params && bid.params.pid && bid.params.supplyType);
   },
   /***
-     * Build a server request from the list of valid BidRequests
-     * @param {validBidRequests} is an array of the valid bids
-     * @param {bidderRequest} bidder request object
-     * @returns {ServerRequest} Info describing the request to the server
-     */
+   * Build a server request from the list of valid BidRequests
+   * @param {validBidRequests} is an array of the valid bids
+   * @param {bidderRequest} bidder request object
+   * @returns {ServerRequest} Info describing the request to the server
+   */
   buildRequests: function (validBidRequests, bidderRequest) {
     return validBidRequests.map(bid => {
       var payload = {
-        bidfloor: bid.params.bidfloor,
+        bidfloor: raiGetFloor(bid, config),
         ifa: bid.params.ifa,
         pid: bid.params.pid,
         supplyType: bid.params.supplyType,
@@ -48,7 +49,10 @@ export const spec = {
         timeout: config.getConfig('bidderTimeout'),
         user: raiSetEids(bid),
         demand: raiGetDemandType(bid),
-        videoData: raiGetVideoInfo(bid)
+        videoData: raiGetVideoInfo(bid),
+        scr_rsl: raiGetResolution(),
+        cpuc: (typeof window.navigator != 'undefined' ? window.navigator.hardwareConcurrency : null),
+        kws: (!utils.isEmpty(bid.params.keywords) ? bid.params.keywords : null)
       };
 
       REFERER = (typeof bidderRequest.refererInfo.referer != 'undefined' ? encodeURIComponent(bidderRequest.refererInfo.referer) : null)
@@ -73,11 +77,11 @@ export const spec = {
     });
   },
   /***
-     * Read the response from the server and build a list of bids
-     * @param {serverResponse} Response from the server.
-     * @param {bidRequest} Bid request object
-     * @returns {bidResponses} Array of bids which were nested inside the server
-     */
+   * Read the response from the server and build a list of bids
+   * @param {serverResponse} Response from the server.
+   * @param {bidRequest} Bid request object
+   * @returns {bidResponses} Array of bids which were nested inside the server
+   */
   interpretResponse: function (serverResponse, bidRequest) {
     const bidResponses = [];
     // try catch
@@ -93,16 +97,23 @@ export const spec = {
         netRevenue: response.netRevenue,
         currency: response.currency,
         ttl: response.ttl,
-        dealId: response.dealId,
+        meta: response.adomain,
+        dealId: response.dealId
       };
 
       if (response.media_type === 'video') {
         bidResponse.vastXml = response.vastXML;
         try {
-          if (JSON.parse(bidRequest.data).videoData.format == 'outstream') {
-            bidResponse.renderer = Renderer.install({
-              url: 'https://cdn3.richaudience.com/prebidVideo/player.js'
-            });
+          if (bidResponse.vastXml != null) {
+            if (JSON.parse(bidRequest.data).videoData.format == 'outstream' || JSON.parse(bidRequest.data).videoData.format == 'banner') {
+              bidResponse.renderer = Renderer.install({
+                id: bidRequest.bidId,
+                adunitcode: bidRequest.tagId,
+                loaded: false,
+                config: response.media_type,
+                url: 'https://cdn3.richaudience.com/prebidVideo/player.js'
+              });
+            }
             bidResponse.renderer.setRender(renderer);
           }
         } catch (e) {
@@ -117,13 +128,13 @@ export const spec = {
     return bidResponses
   },
   /***
-     * User Syncs
-     *
-     * @param {syncOptions} Publisher prebid configuration
-     * @param {serverResponses} Response from the server
-     * @param {gdprConsent} GPDR consent object
-     * @returns {Array}
-     */
+   * User Syncs
+   *
+   * @param {syncOptions} Publisher prebid configuration
+   * @param {serverResponses} Response from the server
+   * @param {gdprConsent} GPDR consent object
+   * @returns {Array}
+   */
   getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
     const syncs = [];
 
@@ -131,11 +142,15 @@ export const spec = {
     var syncUrl = '';
     var consent = '';
 
+    var raiSync = {};
+
+    raiSync = raiGetSyncInclude(config);
+
     if (gdprConsent && typeof gdprConsent.consentString === 'string' && typeof gdprConsent.consentString != 'undefined') {
-      consent = `consentString=’${gdprConsent.consentString}`
+      consent = `consentString=${gdprConsent.consentString}`
     }
 
-    if (syncOptions.iframeEnabled) {
+    if (syncOptions.iframeEnabled && raiSync.raiIframe != 'exclude') {
       syncUrl = 'https://sync.richaudience.com/dcf3528a0b8aa83634892d50e91c306e/?ord=' + rand
       if (consent != '') {
         syncUrl += `&${consent}`
@@ -146,7 +161,7 @@ export const spec = {
       });
     }
 
-    if (syncOptions.pixelEnabled && REFERER != null && syncs.length == 0) {
+    if (syncOptions.pixelEnabled && REFERER != null && syncs.length == 0 && raiSync.raiImage != 'exclude') {
       syncUrl = `https://sync.richaudience.com/bf7c142f4339da0278e83698a02b0854/?referrer=${REFERER}`;
       if (consent != '') {
         syncUrl += `&${consent}`
@@ -193,6 +208,10 @@ function raiGetVideoInfo(bid) {
       playerSize: bid.mediaTypes.video.playerSize,
       mimes: bid.mediaTypes.video.mimes
     };
+  } else {
+    videoData = {
+      format: 'banner'
+    }
   }
   return videoData;
 }
@@ -201,7 +220,7 @@ function raiSetEids(bid) {
   let eids = [];
 
   if (bid && bid.userId) {
-    raiSetUserId(bid, eids, 'id5-sync.com', utils.deepAccess(bid, `userId.id5id`));
+    raiSetUserId(bid, eids, 'id5-sync.com', utils.deepAccess(bid, `userId.id5id.uid`));
     raiSetUserId(bid, eids, 'pubcommon', utils.deepAccess(bid, `userId.pubcid`));
     raiSetUserId(bid, eids, 'criteo.com', utils.deepAccess(bid, `userId.criteoId`));
     raiSetUserId(bid, eids, 'liveramp.com', utils.deepAccess(bid, `userId.idl_env`));
@@ -241,3 +260,50 @@ function renderAd(bid) {
 
   window.raParams(raPlayerHB, raOutstreamHBPassback, true);
 }
+
+function raiGetResolution() {
+  let resolution = '';
+  if (typeof window.screen != 'undefined') {
+    resolution = window.screen.width + 'x' + window.screen.height;
+  }
+  return resolution;
+}
+
+function raiGetSyncInclude(config) {
+  try {
+    let raConfig = null;
+    let raiSync = {};
+    if (config.getConfig('userSync').filterSettings != null && typeof config.getConfig('userSync').filterSettings != 'undefined') {
+      raConfig = config.getConfig('userSync').filterSettings
+      if (raConfig.iframe != null && typeof raConfig.iframe != 'undefined') {
+        raiSync.raiIframe = raConfig.iframe.bidders == 'richaudience' || raConfig.iframe.bidders == '*' ? raConfig.iframe.filter : 'exclude';
+      }
+      if (raConfig.image != null && typeof raConfig.image != 'undefined') {
+        raiSync.raiImage = raConfig.image.bidders == 'richaudience' || raConfig.image.bidders == '*' ? raConfig.image.filter : 'exclude';
+      }
+    }
+    return raiSync;
+  } catch (e) {
+    return null;
+  }
+}
+
+function raiGetFloor(bid, config) {
+  try {
+    let raiFloor;
+    if (bid.params.bidfloor != null) {
+      raiFloor = bid.params.bidfloor;
+    } else if (typeof bid.getFloor == 'function') {
+      let floorSpec = bid.getFloor({
+        currency: config.getConfig('currency.adServerCurrency'),
+        mediaType: bid.mediaType.banner ? 'banner' : 'video',
+        size: '*'
+      })
+
+      raiFloor = floorSpec.floor;
+    }
+    return raiFloor
+  } catch (e) {
+    return 0
+  }
+}
diff --git a/modules/richaudienceBidAdapter.md b/modules/richaudienceBidAdapter.md
index 932cdb8f8de..f888117b166 100644
--- a/modules/richaudienceBidAdapter.md
+++ b/modules/richaudienceBidAdapter.md
@@ -39,6 +39,7 @@ Please reach out to your account manager for more information.
                             "pid":"ADb1f40rmo",
                             "supplyType":"site",
                             "bidfloor":0.40,
+                            "keywords": "key1=value1;key2=value2;key3=value3;"
                         }
                     }]
                 }
diff --git a/modules/riseBidAdapter.js b/modules/riseBidAdapter.js
new file mode 100644
index 00000000000..e3265ad5d3e
--- /dev/null
+++ b/modules/riseBidAdapter.js
@@ -0,0 +1,251 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import * as utils from '../src/utils.js';
+import {VIDEO} from '../src/mediaTypes.js';
+import {config} from '../src/config.js';
+
+const SUPPORTED_AD_TYPES = [VIDEO];
+const BIDDER_CODE = 'rise';
+const BIDDER_VERSION = '4.0.0';
+const TTL = 360;
+const SELLER_ENDPOINT = 'https://hb.yellowblue.io/';
+const MODES = {
+  PRODUCTION: 'hb',
+  TEST: 'hb-test'
+}
+const SUPPORTED_SYNC_METHODS = {
+  IFRAME: 'iframe',
+  PIXEL: 'pixel'
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: BIDDER_VERSION,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+  isBidRequestValid: function(bidRequest) {
+    return !!(bidRequest.params.org);
+  },
+  buildRequests: function (bidRequests, bidderRequest) {
+    if (bidRequests.length === 0) {
+      return [];
+    }
+
+    const requests = [];
+
+    bidRequests.forEach(bid => {
+      requests.push(buildVideoRequest(bid, bidderRequest));
+    });
+
+    return requests;
+  },
+  interpretResponse: function({body}) {
+    const bidResponses = [];
+
+    const bidResponse = {
+      requestId: body.requestId,
+      cpm: body.cpm,
+      width: body.width,
+      height: body.height,
+      creativeId: body.requestId,
+      currency: body.currency,
+      netRevenue: body.netRevenue,
+      ttl: body.ttl || TTL,
+      vastXml: body.vastXml,
+      mediaType: VIDEO
+    };
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses) {
+    const syncs = [];
+    for (const response of serverResponses) {
+      if (syncOptions.iframeEnabled && response.body.userSyncURL) {
+        syncs.push({
+          type: 'iframe',
+          url: response.body.userSyncURL
+        });
+      }
+      if (syncOptions.pixelEnabled && utils.isArray(response.body.userSyncPixels)) {
+        const pixels = response.body.userSyncPixels.map(pixel => {
+          return {
+            type: 'image',
+            url: pixel
+          }
+        })
+        syncs.push(...pixels)
+      }
+    }
+    return syncs;
+  }
+};
+
+registerBidder(spec);
+
+/**
+ * Build the video request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function buildVideoRequest(bid, bidderRequest) {
+  const sellerParams = generateParameters(bid, bidderRequest);
+  const {params} = bid;
+  return {
+    method: 'GET',
+    url: getEndpoint(params.testMode),
+    data: sellerParams
+  };
+}
+
+/**
+ * Get the the ad size from the bid
+ * @param bid {bid}
+ * @returns {Array}
+ */
+function getSizes(bid) {
+  if (utils.deepAccess(bid, 'mediaTypes.video.sizes')) {
+    return bid.mediaTypes.video.sizes[0];
+  } else if (Array.isArray(bid.sizes) && bid.sizes.length > 0) {
+    return bid.sizes[0];
+  }
+  return [];
+}
+
+/**
+ * Get schain string value
+ * @param schainObject {Object}
+ * @returns {string}
+ */
+function getSupplyChain(schainObject) {
+  if (utils.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;
+}
+
+/**
+ * Get encoded node value
+ * @param val {string}
+ * @returns {string}
+ */
+function getEncodedValIfNotEmpty(val) {
+  return !utils.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 = utils.isArray(syncRule.bidders) ? syncRule.bidders : [bidderCode];
+  return isInclude && utils.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;
+}
+
+/**
+ * Generate query parameters for the request
+ * @param bid {bid}
+ * @param bidderRequest {bidderRequest}
+ * @returns {Object}
+ */
+function generateParameters(bid, bidderRequest) {
+  const timeout = config.getConfig('bidderTimeout');
+  const { syncEnabled, filterSettings } = config.getConfig('userSync') || {};
+  const [ width, height ] = getSizes(bid);
+  const { params } = bid;
+  const { bidderCode } = bidderRequest;
+  const domain = window.location.hostname;
+
+  const requestParams = {
+    auction_start: utils.timestamp(),
+    ad_unit_code: utils.getBidIdParameter('adUnitCode', bid),
+    tmax: timeout,
+    width: width,
+    height: height,
+    publisher_id: params.org,
+    floor_price: params.floorPrice,
+    ua: navigator.userAgent,
+    bid_id: utils.getBidIdParameter('bidId', bid),
+    bidder_request_id: utils.getBidIdParameter('bidderRequestId', bid),
+    transaction_id: utils.getBidIdParameter('transactionId', bid),
+    session_id: params.sessionId || utils.getBidIdParameter('auctionId', bid),
+    is_wrapper: !!params.isWrapper,
+    publisher_name: domain,
+    site_domain: domain,
+    bidder_version: BIDDER_VERSION
+  };
+
+  if (syncEnabled) {
+    const allowedSyncMethod = getAllowedSyncMethod(filterSettings, bidderCode);
+    if (allowedSyncMethod) {
+      requestParams.cs_method = allowedSyncMethod;
+    }
+  }
+
+  if (bidderRequest.uspConsent) {
+    requestParams.us_privacy = bidderRequest.uspConsent;
+  }
+
+  if (bidderRequest && bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies) {
+    requestParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+    requestParams.gdpr_consent = bidderRequest.gdprConsent.consentString;
+  }
+
+  if (params.ifa) {
+    requestParams.ifa = params.ifa;
+  }
+
+  if (bid.schain) {
+    requestParams.schain = getSupplyChain(bid.schain);
+  }
+
+  if (bidderRequest && bidderRequest.refererInfo) {
+    requestParams.referrer = utils.deepAccess(bidderRequest, 'refererInfo.referer');
+    requestParams.page_url = config.getConfig('pageUrl') || utils.deepAccess(window, 'location.href');
+  }
+
+  return requestParams;
+}
diff --git a/modules/riseBidAdapter.md b/modules/riseBidAdapter.md
new file mode 100644
index 00000000000..67eeab18226
--- /dev/null
+++ b/modules/riseBidAdapter.md
@@ -0,0 +1,51 @@
+#Overview
+
+Module Name: Rise Bidder Adapter
+
+Module Type: Bidder Adapter
+
+Maintainer: prebid-rise-engage@risecodes.com
+
+
+# Description
+
+Module that connects to Rise's demand sources.
+
+The Rise adapter requires setup and approval from the Rise. Please reach out to prebid-rise-engage@risecodes.com to create an Rise account.
+
+The adapter supports Video(instream). For the integration, Rise returns content as vastXML and requires the publisher to define the cache url in config passed to Prebid for it to be valid in the auction.
+
+# Bid Parameters
+## Video
+
+| Name | Scope | Type | Description | Example
+| ---- | ----- | ---- | ----------- | -------
+| `org` | required | String |  Rise publisher Id provided by your Rise representative  | "56f91cd4d3e3660002000033"
+| `floorPrice` | optional | Number |  Minimum price in USD. Misuse of this parameter can impact revenue | 2.00
+| `ifa` | optional | String |  The ID for advertisers (also referred to as "IDFA")  | "XXX-XXX"
+| `testMode` | optional | Boolean |  This activates the test mode  | false
+
+# Test Parameters
+```javascript
+var adUnits = [
+       {
+        code: 'dfp-video-div',
+        sizes: [[640, 480]],
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 480]],
+            context: 'instream'
+          }
+        },
+        bids: [{
+          bidder: 'rise',
+          params: {
+            org: '56f91cd4d3e3660002000033', // Required
+            floorPrice: 2.00, // Optional
+            ifa: 'XXX-XXX', // Optional
+            testMode: false // Optional
+          }
+        }]
+      }
+   ];
+```
diff --git a/modules/rtbhouseBidAdapter.js b/modules/rtbhouseBidAdapter.js
index 3337c3f1b59..036bdfaebeb 100644
--- a/modules/rtbhouseBidAdapter.js
+++ b/modules/rtbhouseBidAdapter.js
@@ -7,6 +7,7 @@ const BIDDER_CODE = 'rtbhouse';
 const REGIONS = ['prebid-eu', 'prebid-us', 'prebid-asia'];
 const ENDPOINT_URL = 'creativecdn.com/bidder/prebid/bids';
 const DEFAULT_CURRENCY_ARR = ['USD']; // NOTE - USD is the only supported currency right now; Hardcoded for bids
+const SUPPORTED_MEDIA_TYPES = [BANNER, NATIVE];
 const TTL = 55;
 
 // Codes defined by OpenRTB Native Ads 1.1 specification
@@ -34,7 +35,7 @@ export const OPENRTB = {
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER, NATIVE],
+  supportedMediaTypes: SUPPORTED_MEDIA_TYPES,
 
   isBidRequestValid: function (bid) {
     return !!(includes(REGIONS, bid.params.region) && bid.params.publisherId);
@@ -55,6 +56,23 @@ export const spec = {
       request.regs = {ext: {gdpr: gdpr}};
       request.user = {ext: {consent: consentStr}};
     }
+    if (validBidRequests[0].schain) {
+      const schain = mapSchain(validBidRequests[0].schain);
+      if (schain) {
+        request.ext = {
+          schain: schain,
+        }
+      }
+    }
+
+    if (validBidRequests[0].userIdAsEids) {
+      const eids = { eids: validBidRequests[0].userIdAsEids };
+      if (request.user && request.user.ext) {
+        request.user.ext = { ...request.user.ext, ...eids };
+      } else {
+        request.user = {ext: eids};
+      }
+    }
 
     return {
       method: 'POST',
@@ -85,6 +103,22 @@ export const spec = {
 };
 registerBidder(spec);
 
+/**
+ * @param {object} slot Ad Unit Params by Prebid
+ * @returns {int} 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);
+      }
+    });
+  }
+  return floors.length > 0 ? Math.max(...floors) : parseFloat(slot.params.bidfloor);
+}
+
 /**
  * @param {object} slot Ad Unit Params by Prebid
  * @returns {object} Imp by OpenRTB 2.5 §3.2.4
@@ -97,9 +131,9 @@ function mapImpression(slot) {
     tagid: slot.adUnitCode.toString()
   };
 
-  const bidfloor = parseFloat(slot.params.bidfloor);
+  const bidfloor = applyFloor(slot);
   if (bidfloor) {
-    imp.bidfloor = bidfloor
+    imp.bidfloor = bidfloor;
   }
 
   return imp;
@@ -151,12 +185,7 @@ function mapSource(slot) {
   const source = {
     tid: slot.transactionId,
   };
-  const schain = mapSchain(slot.schain);
-  if (schain) {
-    source.ext = {
-      schain: schain
-    }
-  }
+
   return source;
 }
 
@@ -302,6 +331,9 @@ function interpretBannerBid(serverBid) {
     width: serverBid.w,
     height: serverBid.h,
     ttl: TTL,
+    meta: {
+      advertiserDomains: serverBid.adomain
+    },
     netRevenue: true,
     currency: 'USD'
   }
@@ -320,6 +352,9 @@ function interpretNativeBid(serverBid) {
     width: 1,
     height: 1,
     ttl: TTL,
+    meta: {
+      advertiserDomains: serverBid.adomain
+    },
     netRevenue: true,
     currency: 'USD',
     native: interpretNativeAd(serverBid.adm),
diff --git a/modules/rtbsapeBidAdapter.js b/modules/rtbsapeBidAdapter.js
new file mode 100644
index 00000000000..8473ef4dbb3
--- /dev/null
+++ b/modules/rtbsapeBidAdapter.js
@@ -0,0 +1,142 @@
+import * as utils from '../src/utils.js';
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
+import {OUTSTREAM} from '../src/video.js';
+import {Renderer} from '../src/Renderer.js';
+import {triggerPixel} from '../src/utils.js';
+
+const BIDDER_CODE = 'rtbsape';
+const ENDPOINT = 'https://ssp-rtb.sape.ru/prebid';
+const RENDERER_SRC = 'https://cdn-rtb.sape.ru/js/player.js';
+const MATCH_SRC = 'https://www.acint.net/mc/?dp=141';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['sape'],
+  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) {
+    return !!(bid && bid.mediaTypes && (bid.mediaTypes.banner || bid.mediaTypes.video) && bid.params && bid.params.placeId);
+  },
+
+  /**
+   * 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) {
+    let tz = (new Date()).getTimezoneOffset()
+    let padInt = (v) => (v < 10 ? '0' + v : '' + v);
+
+    return {
+      url: ENDPOINT,
+      method: 'POST',
+      data: {
+        auctionId: bidderRequest.auctionId,
+        requestId: bidderRequest.bidderRequestId,
+        bids: validBidRequests,
+        timezone: (tz > 0 ? '-' : '+') + padInt(Math.floor(Math.abs(tz) / 60)) + ':' + padInt(Math.abs(tz) % 60),
+        refererInfo: bidderRequest.refererInfo
+      },
+    }
+  },
+
+  /**
+   * Unpack the response from the server into a list of bids.
+   *
+   * @param {ServerResponse} serverResponse A successful response from the server.
+   * @param {{data: {bids: [{mediaTypes: {banner: boolean}}]}}} bidRequest Info describing the request to the server.
+   * @return {Bid[]} An array of bids which were nested inside the server.
+   */
+  interpretResponse: function (serverResponse, bidRequest) {
+    if (!(serverResponse.body && Array.isArray(serverResponse.body.bids))) {
+      return [];
+    }
+
+    let bids = {};
+    bidRequest.data.bids.forEach(bid => bids[bid.bidId] = bid);
+
+    return serverResponse.body.bids.map(bid => {
+      let requestBid = bids[bid.requestId];
+      let context = utils.deepAccess(requestBid, 'mediaTypes.video.context');
+
+      if (context === OUTSTREAM && (bid.vastUrl || bid.vastXml)) {
+        let renderer = Renderer.install({
+          id: bid.requestId,
+          url: RENDERER_SRC,
+          loaded: false
+        });
+
+        let muted = utils.deepAccess(requestBid, 'params.video.playerMuted');
+        if (typeof muted === 'undefined') {
+          muted = true;
+        }
+
+        bid.playerMuted = muted;
+        bid.renderer = renderer
+
+        renderer.setRender(setOutstreamRenderer);
+      }
+
+      return bid;
+    });
+  },
+
+  /**
+   * Register the user sync pixels which should be dropped after the auction.
+   *
+   * @param {SyncOptions} syncOptions Which user syncs are allowed?
+   * @return {UserSync[]} The user syncs which should be dropped.
+   */
+  getUserSyncs: function (syncOptions) {
+    const sync = [];
+    if (syncOptions.iframeEnabled) {
+      sync.push({
+        type: 'iframe',
+        url: MATCH_SRC
+      });
+    }
+    return sync;
+  },
+
+  /**
+   * 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.nurl) {
+      triggerPixel(bid.nurl);
+    }
+  }
+}
+
+/**
+ * Initialize RtbSape outstream player
+ *
+ * @param bid
+ */
+function setOutstreamRenderer(bid) {
+  let props = {};
+  if (bid.vastUrl) {
+    props.url = bid.vastUrl;
+  }
+  if (bid.vastXml) {
+    props.xml = bid.vastXml;
+  }
+  bid.renderer.push(() => {
+    let player = window.sapeRtbPlayerHandler(bid.adUnitCode, bid.width, bid.height, bid.playerMuted, {singleton: true});
+    props.onComplete = () => player.destroy();
+    props.onError = () => player.destroy();
+    player.addSlot(props);
+  });
+}
+
+registerBidder(spec);
diff --git a/modules/rtbsapeBidAdapter.md b/modules/rtbsapeBidAdapter.md
new file mode 100644
index 00000000000..6b1afe3867d
--- /dev/null
+++ b/modules/rtbsapeBidAdapter.md
@@ -0,0 +1,51 @@
+# Overview
+
+```
+Module Name:  RtbSape Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer:  sergey@sape.ru
+```
+
+# Description
+Our module makes it easy to integrate RtbSape demand sources into your website.
+
+Supported Ad format:
+* Banner
+* Video (instream and outstream)
+
+# Test Parameters
+```
+var adUnits = [
+    // Banner adUnit
+    {
+        code: 'banner-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]],
+            }
+        },
+        bids: [{
+            bidder: 'rtbsape',
+            params: {
+                placeId: 553307
+            }
+        }]
+    },
+    // Video adUnit
+    {
+        code: 'video-div',
+        mediaTypes: {
+            video: {
+                context: 'outstream',
+                playerSize: [600, 340]
+            }
+        },
+        bids: [{
+            bidder: 'rtbsape',
+            params: {
+                placeId: 553309
+            }
+        }]
+    }
+];
+```
diff --git a/modules/rtdModule/index.js b/modules/rtdModule/index.js
index 3aa7753d204..e235868f791 100644
--- a/modules/rtdModule/index.js
+++ b/modules/rtdModule/index.js
@@ -3,16 +3,49 @@
  * @module modules/realTimeData
  */
 
+/**
+ * @interface UserConsentData
+ */
+/**
+ * @property
+ * @summary gdpr consent
+ * @name UserConsentData#gdpr
+ * @type {Object}
+ */
+/**
+ * @property
+ * @summary usp consent
+ * @name UserConsentData#usp
+ * @type {Object}
+ */
+/**
+ * @property
+ * @summary coppa
+ * @name UserConsentData#coppa
+ * @type {boolean}
+ */
+
 /**
  * @interface RtdSubmodule
  */
 
 /**
- * @function
+ * @function?
  * @summary return real time data
- * @name RtdSubmodule#getData
- * @param {AdUnit[]} adUnits
- * @param {function} onDone
+ * @name RtdSubmodule#getTargetingData
+ * @param {string[]} adUnitsCodes
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary modify bid request data
+ * @name RtdSubmodule#getBidRequestData
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ * @param {Object} reqBidsConfigObj
+ * @param {function} callback
  */
 
 /**
@@ -23,14 +56,50 @@
  */
 
 /**
- * @interface ModuleConfig
+ * @property
+ * @summary used to link submodule with config
+ * @name RtdSubmodule#config
+ * @type {Object}
  */
 
 /**
- * @property
- * @summary sub module name
- * @name ModuleConfig#name
- * @type {string}
+ * @function
+ * @summary init sub module
+ * @name RtdSubmodule#init
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} user consent
+ * @return {boolean} false to remove sub module
+ */
+
+/**
+ * @function?
+ * @summary on auction init event
+ * @name RtdSubmodule#onAuctionInitEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on auction end event
+ * @name RtdSubmodule#onAuctionEndEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @function?
+ * @summary on bid response event
+ * @name RtdSubmodule#onBidResponseEvent
+ * @param {Object} data
+ * @param {SubmoduleConfig} config
+ * @param {UserConsentData} userConsent
+ */
+
+/**
+ * @interface ModuleConfig
  */
 
 /**
@@ -40,41 +109,66 @@
  * @type {number}
  */
 
+/**
+ * @property
+ * @summary list of sub modules
+ * @name ModuleConfig#dataProviders
+ * @type {SubmoduleConfig[]}
+ */
+
+/**
+ * @interface SubModuleConfig
+ */
+
 /**
  * @property
  * @summary params for provide (sub module)
- * @name ModuleConfig#params
+ * @name SubModuleConfig#params
  * @type {Object}
  */
 
 /**
  * @property
- * @summary timeout (if no auction dealy)
- * @name ModuleConfig#timeout
- * @type {number}
+ * @summary name
+ * @name ModuleConfig#name
+ * @type {string}
+ */
+
+/**
+ * @property
+ * @summary delay auction for this sub module
+ * @name ModuleConfig#waitForIt
+ * @type {boolean}
  */
 
-import {getGlobal} from '../../src/prebidGlobal.js';
 import {config} from '../../src/config.js';
-import {targeting} from '../../src/targeting.js';
-import {getHook, module} from '../../src/hook.js';
+import {module} from '../../src/hook.js';
 import * as utils from '../../src/utils.js';
+import events from '../../src/events.js';
+import CONSTANTS from '../../src/constants.json';
+import {gdprDataHandler, uspDataHandler} from '../../src/adapterManager.js';
+import find from 'core-js-pure/features/array/find.js';
+import {getGlobal} from '../../src/prebidGlobal.js';
 
 /** @type {string} */
 const MODULE_NAME = 'realTimeData';
-/** @type {number} */
-const DEF_TIMEOUT = 1000;
 /** @type {RtdSubmodule[]} */
-let subModules = [];
+let registeredSubModules = [];
+/** @type {RtdSubmodule[]} */
+export let subModules = [];
 /** @type {ModuleConfig} */
 let _moduleConfig;
+/** @type {SubmoduleConfig[]} */
+let _dataProviders = [];
+/** @type {UserConsentData} */
+let _userConsent;
 
 /**
  * enable submodule in User ID
  * @param {RtdSubmodule} submodule
  */
 export function attachRealTimeDataProvider(submodule) {
-  subModules.push(submodule);
+  registeredSubModules.push(submodule);
 }
 
 export function init(config) {
@@ -85,91 +179,154 @@ export function init(config) {
     }
     confListener(); // unsubscribe config listener
     _moduleConfig = realTimeData;
-    if (typeof (_moduleConfig.auctionDelay) === 'undefined') {
-      _moduleConfig.auctionDelay = 0;
-    }
-    // delay bidding process only if auctionDelay > 0
-    if (!_moduleConfig.auctionDelay > 0) {
-      getHook('bidsBackCallback').before(setTargetsAfterRequestBids);
-    } else {
-      getGlobal().requestBids.before(requestBidsHook);
+    _dataProviders = realTimeData.dataProviders;
+    setEventsListeners();
+    getGlobal().requestBids.before(setBidRequestsData, 40);
+    initSubModules();
+  });
+}
+
+function getConsentData() {
+  return {
+    gdpr: gdprDataHandler.getConsentData(),
+    usp: uspDataHandler.getConsentData(),
+    coppa: !!(config.getConfig('coppa'))
+  }
+}
+
+/**
+ * call each sub module init function by config order
+ * if no init function / init return failure / module not configured - remove it from submodules list
+ */
+function initSubModules() {
+  _userConsent = getConsentData();
+  let subModulesByOrder = [];
+  _dataProviders.forEach(provider => {
+    const sm = find(registeredSubModules, s => s.name === provider.name);
+    const initResponse = sm && sm.init && sm.init(provider, _userConsent);
+    if (initResponse) {
+      subModulesByOrder.push(Object.assign(sm, {config: provider}));
     }
   });
+  subModules = subModulesByOrder;
+}
+
+/**
+ * call each sub module event function by config order
+ */
+function setEventsListeners() {
+  events.on(CONSTANTS.EVENTS.AUCTION_INIT, (args) => {
+    subModules.forEach(sm => { sm.onAuctionInitEvent && sm.onAuctionInitEvent(args, sm.config, _userConsent) })
+  });
+  events.on(CONSTANTS.EVENTS.AUCTION_END, (args) => {
+    getAdUnitTargeting(args);
+    subModules.forEach(sm => { sm.onAuctionEndEvent && sm.onAuctionEndEvent(args, sm.config, _userConsent) })
+  });
+  events.on(CONSTANTS.EVENTS.BID_RESPONSE, (args) => {
+    subModules.forEach(sm => { sm.onBidResponseEvent && sm.onBidResponseEvent(args, sm.config, _userConsent) })
+  });
 }
 
 /**
- * get data from sub module
- * @param {AdUnit[]} adUnits received from auction
- * @param {function} callback callback function on data received
+ * loop through configured data providers If the data provider has registered getBidRequestData,
+ * call it, providing reqBidsConfigObj, consent data and module params
+ * this allows submodules to modify bidders
+ * @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
  */
-function getProviderData(adUnits, callback) {
-  const callbackExpected = subModules.length;
-  let dataReceived = [];
-  let processDone = false;
-  const dataWaitTimeout = setTimeout(() => {
-    processDone = true;
-    callback(dataReceived);
-  }, _moduleConfig.auctionDelay || _moduleConfig.timeout || DEF_TIMEOUT);
+export function setBidRequestsData(fn, reqBidsConfigObj) {
+  _userConsent = getConsentData();
 
+  const relevantSubModules = [];
+  const prioritySubModules = [];
   subModules.forEach(sm => {
-    sm.getData(adUnits, onDataReceived);
+    if (typeof sm.getBidRequestData !== 'function') {
+      return;
+    }
+    relevantSubModules.push(sm);
+    const config = sm.config;
+    if (config && config.waitForIt) {
+      prioritySubModules.push(sm);
+    }
   });
 
-  function onDataReceived(data) {
-    if (processDone) {
-      return
+  const shouldDelayAuction = prioritySubModules.length && _moduleConfig.auctionDelay && _moduleConfig.auctionDelay > 0;
+  let callbacksExpected = prioritySubModules.length;
+  let isDone = false;
+  let waitTimeout;
+
+  if (!relevantSubModules.length) {
+    return exitHook();
+  }
+
+  if (shouldDelayAuction) {
+    waitTimeout = setTimeout(exitHook, _moduleConfig.auctionDelay);
+  }
+
+  relevantSubModules.forEach(sm => {
+    sm.getBidRequestData(reqBidsConfigObj, onGetBidRequestDataCallback.bind(sm), sm.config, _userConsent)
+  });
+
+  if (!shouldDelayAuction) {
+    return exitHook();
+  }
+
+  function onGetBidRequestDataCallback() {
+    if (isDone) {
+      return;
     }
-    dataReceived.push(data);
-    if (dataReceived.length === callbackExpected) {
-      processDone = true;
-      clearTimeout(dataWaitTimeout);
-      callback(dataReceived);
+    if (this.config && this.config.waitForIt) {
+      callbacksExpected--;
+    }
+    if (callbacksExpected <= 0) {
+      return exitHook();
     }
   }
+
+  function exitHook() {
+    isDone = true;
+    clearTimeout(waitTimeout);
+    fn.call(this, reqBidsConfigObj);
+  }
 }
 
 /**
- * delete invalid data received from provider
- * this is to ensure working flow for GPT
- * @param {Object} data received from provider
- * @return {Object} valid data for GPT targeting
+ * loop through configured data providers If the data provider has registered getTargetingData,
+ * call it, providing ad unit codes, consent data and module params
+ * the sub mlodle will return data to set on the ad unit
+ * this function used to place key values on primary ad server per ad unit
+ * @param {Object} auction object received on auction end event
  */
-export function validateProviderDataForGPT(data) {
-  // data must be an object, contains object with string as value
-  if (typeof data !== 'object') {
-    return {};
+export function getAdUnitTargeting(auction) {
+  const relevantSubModules = subModules.filter(sm => typeof sm.getTargetingData === 'function');
+  if (!relevantSubModules.length) {
+    return;
   }
-  for (let key in data) {
-    if (data.hasOwnProperty(key)) {
-      for (let innerKey in data[key]) {
-        if (data[key].hasOwnProperty(innerKey)) {
-          if (typeof data[key][innerKey] !== 'string') {
-            utils.logWarn(`removing ${key}: {${innerKey}:${data[key][innerKey]} } from GPT targeting because of invalid type (must be string)`);
-            delete data[key][innerKey];
-          }
-        }
-      }
+
+  // get data
+  const adUnitCodes = auction.adUnitCodes;
+  if (!adUnitCodes) {
+    return;
+  }
+  let targeting = [];
+  for (let i = relevantSubModules.length - 1; i >= 0; i--) {
+    const smTargeting = relevantSubModules[i].getTargetingData(adUnitCodes, relevantSubModules[i].config, _userConsent);
+    if (smTargeting && typeof smTargeting === 'object') {
+      targeting.push(smTargeting);
+    } else {
+      utils.logWarn('invalid getTargetingData response for sub module', relevantSubModules[i].name);
     }
   }
-  return data;
-}
-
-/**
- * run hook after bids request and before callback
- * get data from provider and set key values to primary ad server
- * @param {function} next - next hook function
- * @param {AdUnit[]} adUnits received from auction
- */
-export function setTargetsAfterRequestBids(next, adUnits) {
-  getProviderData(adUnits, (data) => {
-    if (data && Object.keys(data).length) {
-      const _mergedData = deepMerge(data);
-      if (Object.keys(_mergedData).length) {
-        setDataForPrimaryAdServer(_mergedData);
-      }
+  // place data on auction adUnits
+  const mergedTargeting = deepMerge(targeting);
+  auction.adUnits.forEach(adUnit => {
+    const kv = adUnit.code && mergedTargeting[adUnit.code];
+    if (!kv) {
+      return
     }
-    next(adUnits);
+    adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] = Object.assign(adUnit[CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING] || {}, kv);
   });
+  return auction.adUnits;
 }
 
 /**
@@ -198,54 +355,5 @@ export function deepMerge(arr) {
   }, {});
 }
 
-/**
- * run hook before bids request
- * get data from provider and set key values to primary ad server & bidders
- * @param {function} fn - hook function
- * @param {Object} reqBidsConfigObj - request bids object
- */
-export function requestBidsHook(fn, reqBidsConfigObj) {
-  getProviderData(reqBidsConfigObj.adUnits || getGlobal().adUnits, (data) => {
-    if (data && Object.keys(data).length) {
-      const _mergedData = deepMerge(data);
-      if (Object.keys(_mergedData).length) {
-        setDataForPrimaryAdServer(_mergedData);
-        addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, _mergedData);
-      }
-    }
-    return fn.call(this, reqBidsConfigObj);
-  });
-}
-
-/**
- * set data to primary ad server
- * @param {Object} data - key values to set
- */
-function setDataForPrimaryAdServer(data) {
-  data = validateProviderDataForGPT(data);
-  if (utils.isGptPubadsDefined()) {
-    targeting.setTargetingForGPT(data, null)
-  } else {
-    window.googletag = window.googletag || {};
-    window.googletag.cmd = window.googletag.cmd || [];
-    window.googletag.cmd.push(() => {
-      targeting.setTargetingForGPT(data, null);
-    });
-  }
-}
-
-/**
- * @param {AdUnit[]} adUnits
- *  @param {Object} data - key values to set
- */
-function addIdDataToAdUnitBids(adUnits, data) {
-  adUnits.forEach(adUnit => {
-    adUnit.bids = adUnit.bids.map(bid => {
-      const rd = data[adUnit.code] || {};
-      return Object.assign(bid, {realTimeData: rd});
-    })
-  });
-}
-
-init(config);
 module('realTimeData', attachRealTimeDataProvider);
+init(config);
diff --git a/modules/rtdModule/provider.md b/modules/rtdModule/provider.md
index fb42e7188d3..116db160238 100644
--- a/modules/rtdModule/provider.md
+++ b/modules/rtdModule/provider.md
@@ -1,27 +1,33 @@
 New provider must include the following:
 
-1. sub module object:
-```
-export const subModuleName = {
-  name: String,
-  getData: Function 
-};
-```
+1. sub module object with the following keys:
 
-2. Function that returns the real time data according to the following structure:
-```
+|  param name | type  | Scope | Description | Params |
+| :------------ | :------------ | :------ | :------ | :------ |
+| name  | string  | required | must match the name provided by the publisher in the on-page config | n/a |
+|  init | function | required | defines the function that does any auction-level initialization required | config, userConsent |
+|  getTargetingData  | function | optional | defines a function that provides ad server targeting data to RTD-core | adUnitArray, config, userConsent |
+|  getBidRequestData  | function | optional | defines a function that provides ad server targeting data to RTD-core | reqBidsConfigObj, callback, config, userConsent  |
+|  onAuctionInitEvent | function | optional | listens to the AUCTION_INIT event and calls a sub-module function that lets it inspect and/or update the auction | auctionDetails, config, userConsent |
+|  onAuctionEndEvent | function |optional | listens to the AUCTION_END event and calls a sub-module function that lets it know when auction is done | auctionDetails, config, userConsent |
+|  onBidResponseEvent | function |optional | listens to the BID_RESPONSE event and calls a sub-module function that lets it know when a bid response has been collected | bidResponse, config, userConsent |
+
+2. `getTargetingData` function (if defined) should return ad unit targeting data according to the following structure:
+```json
 {
   "adUnitCode":{
       "key":"value",
       "key2":"value"
   },
   "adUnitCode2":{
-      "dataKey":"dataValue",
+      "dataKey":"dataValue"
   }
 }
 ``` 
 
 3. Hook to Real Time Data module:
-```
+```javascript
 submodule('realTimeData', subModuleName);
 ```
+
+4. See detailed documentation [here](https://docs.prebid.org/dev-docs/add-rtd-submodule.html)
diff --git a/modules/rtdModule/realTimeData.md b/modules/rtdModule/realTimeData.md
deleted file mode 100644
index b2859098b1f..00000000000
--- a/modules/rtdModule/realTimeData.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Real Time Data Configuration Example 
-
-Example showing config using `browsi` sub module
-```
-    pbjs.setConfig({
-        "realTimeData": {
-            "auctionDelay": 1000,
-            dataProviders[{
-                "name": "browsi",
-                "params": {
-                    "url": "testUrl.com",
-                    "siteKey": "testKey",
-                    "pubKey": "testPub",
-                    "keyName":"bv"
-                }  
-            }]
-        }
-    });
-```    
-
-Example showing real time data object received form `browsi` real time data provider
-```
-{
-  "adUnitCode":{
-      "key":"value",
-      "key2":"value"
-  },
-  "adUnitCode2":{
-      "dataKey":"dataValue",
-  }
-}
-```   
diff --git a/modules/rubiconAnalyticsAdapter.js b/modules/rubiconAnalyticsAdapter.js
index 00ad14dd316..d25401ee70f 100644
--- a/modules/rubiconAnalyticsAdapter.js
+++ b/modules/rubiconAnalyticsAdapter.js
@@ -5,7 +5,23 @@ import { ajax } from '../src/ajax.js';
 import { config } from '../src/config.js';
 import * as utils from '../src/utils.js';
 import { getGlobal } from '../src/prebidGlobal.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const RUBICON_GVL_ID = 52;
+export const storage = getStorageManager(RUBICON_GVL_ID, 'rubicon');
+const COOKIE_NAME = 'rpaSession';
+const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
+const END_EXPIRE_TIME = 21600000; // 6 hours
+
+const pbsErrorMap = {
+  1: 'timeout-error',
+  2: 'input-error',
+  3: 'connect-error',
+  4: 'request-error',
+  999: 'generic-error'
+}
 
+let prebidGlobal = getGlobal();
 const {
   EVENTS: {
     AUCTION_INIT,
@@ -38,8 +54,24 @@ const cache = {
   auctions: {},
   targeting: {},
   timeouts: {},
+  gpt: {},
 };
 
+const BID_REJECTED_IPF = 'rejected-ipf';
+
+export let rubiConf = {
+  pvid: utils.generateUUID().slice(0, 8),
+  analyticsEventDelay: 0
+};
+// we are saving these as global to this module so that if a pub accidentally overwrites the entire
+// rubicon object, then we do not lose other data
+config.getConfig('rubicon', config => {
+  utils.mergeDeep(rubiConf, config.rubicon);
+  if (utils.deepAccess(config, 'rubicon.updatePageView') === true) {
+    rubiConf.pvid = utils.generateUUID().slice(0, 8)
+  }
+});
+
 export function getHostNameFromReferer(referer) {
   try {
     rubiconAdapter.referrerHostname = utils.parseUrl(referer, {noDecodeWholeURL: true}).hostname;
@@ -83,10 +115,11 @@ function formatSource(src) {
   return src.toLowerCase();
 }
 
-function sendMessage(auctionId, bidWonId) {
+function sendMessage(auctionId, bidWonId, trigger) {
   function formatBid(bid) {
     return utils.pick(bid, [
       'bidder',
+      'bidderDetail',
       'bidId', bidId => utils.deepAccess(bid, 'bidResponse.pbsBidId') || utils.deepAccess(bid, 'bidResponse.seatBidId') || bidId,
       'status',
       'error',
@@ -94,7 +127,7 @@ function sendMessage(auctionId, bidWonId) {
         if (source) {
           return source;
         }
-        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.indexOf(bid.bidder) !== -1
+        return serverConfig && Array.isArray(serverConfig.bidders) && serverConfig.bidders.some(s2sBidder => s2sBidder.toLowerCase() === bid.bidder) !== -1
           ? 'server' : 'client'
       },
       'clientLatencyMillis',
@@ -106,7 +139,9 @@ function sendMessage(auctionId, bidWonId) {
         'dimensions',
         'mediaType',
         'floorValue',
-        'floorRule'
+        'floorRuleValue',
+        'floorRule',
+        'adomains'
       ]) : undefined
     ]);
   }
@@ -117,7 +152,7 @@ function sendMessage(auctionId, bidWonId) {
       'videoAdFormat', () => bid.videoAdFormat,
       'mediaTypes'
     ]), {
-      adserverTargeting: stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
+      adserverTargeting: !utils.isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
       bidwonStatus: 'success', // hard-coded for now
       accountId,
       siteId: bid.siteId,
@@ -126,17 +161,26 @@ function sendMessage(auctionId, bidWonId) {
     });
   }
   let auctionCache = cache.auctions[auctionId];
-  let referrer = config.getConfig('pageUrl') || auctionCache.referrer;
+  let referrer = config.getConfig('pageUrl') || (auctionCache && auctionCache.referrer);
   let message = {
-    eventTimeMillis: Date.now(),
-    integration: config.getConfig('rubicon.int_type') || DEFAULT_INTEGRATION,
+    timestamps: {
+      prebidLoaded: rubiconAdapter.MODULE_INITIALIZED_TIME,
+      auctionEnded: auctionCache.endTs,
+      eventTime: Date.now()
+    },
+    trigger,
+    integration: rubiConf.int_type || DEFAULT_INTEGRATION,
     version: '$prebid.version$',
     referrerUri: referrer,
-    referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer)
+    referrerHostname: rubiconAdapter.referrerHostname || getHostNameFromReferer(referrer),
+    channel: 'web',
   };
-  const wrapperName = config.getConfig('rubicon.wrapperName');
-  if (wrapperName) {
-    message.wrapperName = wrapperName;
+  if (rubiConf.wrapperName) {
+    message.wrapper = {
+      name: rubiConf.wrapperName,
+      family: rubiConf.wrapperFamily,
+      rule: rubiConf.rule_name
+    }
   }
   if (auctionCache && !auctionCache.sent) {
     let adUnitMap = Object.keys(auctionCache.bids).reduce((adUnits, bidId) => {
@@ -148,8 +192,10 @@ function sendMessage(auctionId, bidWonId) {
           'transactionId',
           'mediaTypes',
           'dimensions',
-          'adserverTargeting', () => stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
-          'adSlot'
+          'adserverTargeting', () => !utils.isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
+          'gam', gam => !utils.isEmpty(gam) ? gam : undefined,
+          'pbAdSlot',
+          'pattern'
         ]);
         adUnit.bids = [];
         adUnit.status = 'no-bid'; // default it to be no bid
@@ -190,22 +236,59 @@ function sendMessage(auctionId, bidWonId) {
       clientTimeoutMillis: auctionCache.timeout,
       samplingFactor,
       accountId,
-      adUnits: Object.keys(adUnitMap).map(i => adUnitMap[i])
+      adUnits: Object.keys(adUnitMap).map(i => adUnitMap[i]),
+      requestId: auctionId
     };
 
     // pick our of top level floor data we want to send!
     if (auctionCache.floorData) {
-      auction.floors = utils.pick(auctionCache.floorData, [
-        'location',
-        'modelName', () => auctionCache.floorData.modelVersion,
-        'skipped',
-        'enforcement', () => utils.deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
-        'dealsEnforced', () => utils.deepAccess(auctionCache.floorData, 'enforcements.floorDeals'),
-        'skipRate', skipRate => !isNaN(skipRate) ? skipRate : 0,
-        'fetchStatus'
+      if (auctionCache.floorData.location === 'noData') {
+        auction.floors = utils.pick(auctionCache.floorData, [
+          'location',
+          'fetchStatus',
+          'floorProvider as provider'
+        ]);
+      } else {
+        auction.floors = utils.pick(auctionCache.floorData, [
+          'location',
+          'modelVersion as modelName',
+          'modelWeight',
+          'modelTimestamp',
+          'skipped',
+          'enforcement', () => utils.deepAccess(auctionCache.floorData, 'enforcements.enforceJS'),
+          'dealsEnforced', () => utils.deepAccess(auctionCache.floorData, 'enforcements.floorDeals'),
+          'skipRate',
+          'fetchStatus',
+          'floorMin',
+          'floorProvider as provider'
+        ]);
+      }
+    }
+
+    // gather gdpr info
+    if (auctionCache.gdprConsent) {
+      auction.gdpr = utils.pick(auctionCache.gdprConsent, [
+        'gdprApplies as applies',
+        'consentString',
+        'apiVersion as version'
       ]);
     }
 
+    // gather session info
+    if (auctionCache.session) {
+      message.session = utils.pick(auctionCache.session, [
+        'id',
+        'pvid',
+        'start',
+        'expires'
+      ]);
+      if (!utils.isEmpty(auctionCache.session.fpkvs)) {
+        message.fpkvs = Object.keys(auctionCache.session.fpkvs).map(key => {
+          return { key, value: auctionCache.session.fpkvs[key] };
+        });
+      }
+    }
+
     if (serverConfig) {
       auction.serverTimeoutMillis = serverConfig.timeout;
     }
@@ -241,6 +324,10 @@ function sendMessage(auctionId, bidWonId) {
   );
 }
 
+function adUnitIsOnlyInstream(adUnit) {
+  return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && utils.deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
+}
+
 function getBidPrice(bid) {
   // get the cpm from bidResponse
   let cpm;
@@ -263,13 +350,13 @@ function getBidPrice(bid) {
   }
   // otherwise we convert and return
   try {
-    return Number(getGlobal().convertCurrency(cpm, currency, 'USD'));
+    return Number(prebidGlobal.convertCurrency(cpm, currency, 'USD'));
   } catch (err) {
     utils.logWarn('Rubicon Analytics Adapter: Could not determine the bidPriceUSD of the bid ', bid);
   }
 }
 
-export function parseBidResponse(bid, previousBidResponse) {
+export function parseBidResponse(bid, previousBidResponse, auctionFloorData) {
   // The current bidResponse for this matching requestId/bidRequestId
   let responsePrice = getBidPrice(bid)
   // we need to compare it with the previous one (if there was one)
@@ -281,16 +368,55 @@ export function parseBidResponse(bid, previousBidResponse) {
     'dealId',
     'status',
     'mediaType',
-    'dimensions', () => utils.pick(bid, [
-      'width',
-      'height'
-    ]),
-    'seatBidId',
+    'dimensions', () => {
+      const width = bid.width || bid.playerWidth;
+      const height = bid.height || bid.playerHeight;
+      return (width && height) ? {width, height} : undefined;
+    },
+    // Handling use case where pbs sends back 0 or '0' bidIds
+    'pbsBidId', pbsBidId => pbsBidId == 0 ? utils.generateUUID() : pbsBidId,
+    'seatBidId', seatBidId => seatBidId == 0 ? utils.generateUUID() : seatBidId,
     'floorValue', () => utils.deepAccess(bid, 'floorData.floorValue'),
-    'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined
+    'floorRuleValue', () => utils.deepAccess(bid, 'floorData.floorRuleValue'),
+    'floorRule', () => utils.debugTurnedOn() ? utils.deepAccess(bid, 'floorData.floorRule') : undefined,
+    'adomains', () => {
+      let adomains = utils.deepAccess(bid, 'meta.advertiserDomains');
+      return Array.isArray(adomains) && adomains.length > 0 ? adomains.slice(0, 10) : undefined
+    }
   ]);
 }
 
+/*
+  Filters and converts URL Params into an object and returns only KVs that match the 'utm_KEY' format
+*/
+function getUtmParams() {
+  let search;
+
+  try {
+    search = utils.parseQS(utils.getWindowLocation().search);
+  } catch (e) {
+    search = {};
+  }
+
+  return Object.keys(search).reduce((accum, param) => {
+    if (param.match(/utm_/)) {
+      accum[param.replace(/utm_/, '')] = search[param];
+    }
+    return accum;
+  }, {});
+}
+
+function getFpkvs() {
+  rubiConf.fpkvs = Object.assign((rubiConf.fpkvs || {}), getUtmParams());
+
+  // convert all values to strings
+  Object.keys(rubiConf.fpkvs).forEach(key => {
+    rubiConf.fpkvs[key] = rubiConf.fpkvs[key] + '';
+  });
+
+  return rubiConf.fpkvs;
+}
+
 let samplingFactor = 1;
 let accountId;
 // List of known rubicon aliases
@@ -309,8 +435,90 @@ function setRubiconAliases(aliasRegistry) {
   });
 }
 
+function getRpaCookie() {
+  let encodedCookie = storage.getDataFromLocalStorage(COOKIE_NAME);
+  if (encodedCookie) {
+    try {
+      return JSON.parse(window.atob(encodedCookie));
+    } catch (e) {
+      utils.logError(`Rubicon Analytics: Unable to decode ${COOKIE_NAME} value: `, e);
+    }
+  }
+  return {};
+}
+
+function setRpaCookie(decodedCookie) {
+  try {
+    storage.setDataInLocalStorage(COOKIE_NAME, window.btoa(JSON.stringify(decodedCookie)));
+  } catch (e) {
+    utils.logError(`Rubicon Analytics: Unable to encode ${COOKIE_NAME} value: `, e);
+  }
+}
+
+function updateRpaCookie() {
+  const currentTime = Date.now();
+  let decodedRpaCookie = getRpaCookie();
+  if (
+    !Object.keys(decodedRpaCookie).length ||
+    (currentTime - decodedRpaCookie.lastSeen) > LAST_SEEN_EXPIRE_TIME ||
+    decodedRpaCookie.expires < currentTime
+  ) {
+    decodedRpaCookie = {
+      id: utils.generateUUID(),
+      start: currentTime,
+      expires: currentTime + END_EXPIRE_TIME, // six hours later,
+    }
+  }
+  // possible that decodedRpaCookie is undefined, and if it is, we probably are blocked by storage or some other exception
+  if (Object.keys(decodedRpaCookie).length) {
+    decodedRpaCookie.lastSeen = currentTime;
+    decodedRpaCookie.fpkvs = {...decodedRpaCookie.fpkvs, ...getFpkvs()};
+    decodedRpaCookie.pvid = rubiConf.pvid;
+    setRpaCookie(decodedRpaCookie)
+  }
+  return decodedRpaCookie;
+}
+
+function subscribeToGamSlots() {
+  window.googletag.pubads().addEventListener('slotRenderEnded', event => {
+    const isMatchingAdSlot = utils.isAdUnitCodeMatchingSlot(event.slot);
+    // loop through auctions and adUnits and mark the info
+    Object.keys(cache.auctions).forEach(auctionId => {
+      (Object.keys(cache.auctions[auctionId].bids) || []).forEach(bidId => {
+        let bid = cache.auctions[auctionId].bids[bidId];
+        // if this slot matches this bids adUnit, add the adUnit info
+        if (isMatchingAdSlot(bid.adUnit.adUnitCode)) {
+          // mark this adUnit as having been rendered by gam
+          cache.auctions[auctionId].gamHasRendered[bid.adUnit.adUnitCode] = true;
+
+          bid.adUnit.gam = utils.pick(event, [
+            // these come in as `null` from Gpt, which when stringified does not get removed
+            // so set explicitly to undefined when not a number
+            'advertiserId', advertiserId => utils.isNumber(advertiserId) ? advertiserId : undefined,
+            'creativeId', creativeId => utils.isNumber(event.sourceAgnosticCreativeId) ? event.sourceAgnosticCreativeId : utils.isNumber(creativeId) ? creativeId : undefined,
+            'lineItemId', lineItemId => utils.isNumber(event.sourceAgnosticLineItemId) ? event.sourceAgnosticLineItemId : utils.isNumber(lineItemId) ? lineItemId : undefined,
+            'adSlot', () => event.slot.getAdUnitPath(),
+            'isSlotEmpty', () => event.isEmpty || undefined
+          ]);
+        }
+      });
+      // Now if all adUnits have gam rendered, send the payload
+      if (rubiConf.waitForGamSlots && !cache.auctions[auctionId].sent && Object.keys(cache.auctions[auctionId].gamHasRendered).every(adUnitCode => cache.auctions[auctionId].gamHasRendered[adUnitCode])) {
+        clearTimeout(cache.timeouts[auctionId]);
+        delete cache.timeouts[auctionId];
+        if (rubiConf.analyticsEventDelay > 0) {
+          setTimeout(() => sendMessage.call(rubiconAdapter, auctionId, undefined, 'delayedGam'), rubiConf.analyticsEventDelay)
+        } else {
+          sendMessage.call(rubiconAdapter, auctionId, undefined, 'gam')
+        }
+      }
+    });
+  });
+}
+
 let baseAdapter = adapter({analyticsType: 'endpoint'});
 let rubiconAdapter = Object.assign({}, baseAdapter, {
+  MODULE_INITIALIZED_TIME: Date.now(),
   referrerHostname: '',
   enableAnalytics(config = {}) {
     let error = false;
@@ -353,7 +561,9 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
   },
   disableAnalytics() {
     this.getUrl = baseAdapter.getUrl;
-    accountId = null;
+    accountId = undefined;
+    rubiConf = {};
+    cache.gpt.registered = false;
     baseAdapter.disableAnalytics.apply(this, arguments);
   },
   track({eventType, args}) {
@@ -367,22 +577,42 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         ]);
         cacheEntry.bids = {};
         cacheEntry.bidsWon = {};
-        cacheEntry.referrer = args.bidderRequests[0].refererInfo.referer;
-        if (utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData')) {
-          cacheEntry.floorData = {...utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData')};
+        cacheEntry.gamHasRendered = {};
+        cacheEntry.referrer = utils.deepAccess(args, 'bidderRequests.0.refererInfo.referer');
+        const floorData = utils.deepAccess(args, 'bidderRequests.0.bids.0.floorData');
+        if (floorData) {
+          cacheEntry.floorData = {...floorData};
         }
+        cacheEntry.gdprConsent = utils.deepAccess(args, 'bidderRequests.0.gdprConsent');
+        cacheEntry.session = storage.localStorageIsEnabled() && updateRpaCookie();
         cache.auctions[args.auctionId] = cacheEntry;
+        // register to listen to gpt events if not done yet
+        if (!cache.gpt.registered && utils.isGptPubadsDefined()) {
+          subscribeToGamSlots();
+          cache.gpt.registered = true;
+        } else if (!cache.gpt.registered) {
+          cache.gpt.registered = true;
+          window.googletag = window.googletag || {};
+          window.googletag.cmd = window.googletag.cmd || [];
+          window.googletag.cmd.push(function() {
+            subscribeToGamSlots();
+          });
+        }
         break;
       case BID_REQUESTED:
         Object.assign(cache.auctions[args.auctionId].bids, args.bids.reduce((memo, bid) => {
           // mark adUnits we expect bidWon events for
           cache.auctions[args.auctionId].bidsWon[bid.adUnitCode] = false;
 
+          if (rubiConf.waitForGamSlots && !adUnitIsOnlyInstream(bid)) {
+            cache.auctions[args.auctionId].gamHasRendered[bid.adUnitCode] = false;
+          }
+
           memo[bid.bidId] = utils.pick(bid, [
             'bidder', bidder => bidder.toLowerCase(),
             'bidId',
             'status', () => 'no-bid', // default a bid to no-bid until response is recieved or bid is timed out
-            'finalSource as source',
+            'source', () => formatSource(bid.src),
             'params', (params, bid) => {
               switch (bid.bidder) {
                 // specify bidder params we want here
@@ -442,6 +672,13 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
                 }
                 return ['banner'];
               },
+              'gam', () => {
+                if (utils.deepAccess(bid, 'ortb2Imp.ext.data.adserver.name') === 'gam') {
+                  return {adSlot: bid.ortb2Imp.ext.data.adserver.adslot}
+                }
+              },
+              'pbAdSlot', () => utils.deepAccess(bid, 'ortb2Imp.ext.data.pbadslot'),
+              'pattern', () => utils.deepAccess(bid, 'ortb2Imp.ext.data.aupname')
             ])
           ]);
           return memo;
@@ -449,10 +686,17 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         break;
       case BID_RESPONSE:
         let auctionEntry = cache.auctions[args.auctionId];
+
+        if (!auctionEntry.bids[args.requestId] && args.originalRequestId) {
+          auctionEntry.bids[args.requestId] = {...auctionEntry.bids[args.originalRequestId]};
+          auctionEntry.bids[args.requestId].bidId = args.requestId;
+          auctionEntry.bids[args.requestId].bidderDetail = args.targetingBidder;
+        }
+
         let bid = auctionEntry.bids[args.requestId];
         // If floor resolved gptSlot but we have not yet, then update the adUnit to have the adSlot name
-        if (!utils.deepAccess(bid, 'adUnit.adSlot') && utils.deepAccess(args, 'floorData.matchedFields.gptSlot')) {
-          bid.adUnit.adSlot = args.floorData.matchedFields.gptSlot;
+        if (!utils.deepAccess(bid, 'adUnit.gam.adSlot') && utils.deepAccess(args, 'floorData.matchedFields.gptSlot')) {
+          utils.deepSetValue(bid, 'adUnit.gam.adSlot', args.floorData.matchedFields.gptSlot);
         }
         // if we have not set enforcements yet set it
         if (!utils.deepAccess(auctionEntry, 'floorData.enforcements') && utils.deepAccess(args, 'floorData.enforcements')) {
@@ -469,7 +713,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
             delete bid.error; // it's possible for this to be set by a previous timeout
             break;
           case NO_BID:
-            bid.status = args.status === BID_REJECTED ? 'rejected' : 'no-bid';
+            bid.status = args.status === BID_REJECTED ? BID_REJECTED_IPF : 'no-bid';
             delete bid.error;
             break;
           default:
@@ -478,14 +722,26 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
               code: 'request-error'
             };
         }
-        bid.clientLatencyMillis = Date.now() - cache.auctions[args.auctionId].timestamp;
+        bid.clientLatencyMillis = bid.timeToRespond || Date.now() - cache.auctions[args.auctionId].timestamp;
         bid.bidResponse = parseBidResponse(args, bid.bidResponse);
         break;
       case BIDDER_DONE:
+        const serverError = utils.deepAccess(args, 'serverErrors.0');
+        const serverResponseTimeMs = args.serverResponseTimeMs;
         args.bids.forEach(bid => {
           let cachedBid = cache.auctions[bid.auctionId].bids[bid.bidId || bid.requestId];
           if (typeof bid.serverResponseTimeMs !== 'undefined') {
             cachedBid.serverLatencyMillis = bid.serverResponseTimeMs;
+          } else if (serverResponseTimeMs && bid.source === 's2s') {
+            cachedBid.serverLatencyMillis = serverResponseTimeMs;
+          }
+          // if PBS said we had an error, and this bid has not been processed by BID_RESPONSE YET
+          if (serverError && (!cachedBid.status || ['no-bid', 'error'].indexOf(cachedBid.status) !== -1)) {
+            cachedBid.status = 'error';
+            cachedBid.error = {
+              code: pbsErrorMap[serverError.code] || pbsErrorMap[999],
+              description: serverError.message
+            }
           }
           if (!cachedBid.status) {
             cachedBid.status = 'no-bid';
@@ -504,8 +760,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
 
         // check if this BID_WON missed the boat, if so send by itself
         if (auctionCache.sent === true) {
-          sendMessage.call(this, args.auctionId, args.requestId);
-        } else if (Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
+          sendMessage.call(this, args.auctionId, args.requestId, 'soloBidWon');
+        } else if (!rubiConf.waitForGamSlots && Object.keys(auctionCache.bidsWon).reduce((memo, adUnitCode) => {
           // only send if we've received bidWon events for all adUnits in auction
           memo = memo && auctionCache.bidsWon[adUnitCode];
           return memo;
@@ -513,23 +769,36 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
           clearTimeout(cache.timeouts[args.auctionId]);
           delete cache.timeouts[args.auctionId];
 
-          sendMessage.call(this, args.auctionId);
+          sendMessage.call(this, args.auctionId, undefined, 'allBidWons');
         }
         break;
       case AUCTION_END:
-        // start timer to send batched payload just in case we don't hear any BID_WON events
-        cache.timeouts[args.auctionId] = setTimeout(() => {
-          sendMessage.call(this, args.auctionId);
-        }, SEND_TIMEOUT);
+        // see how long it takes for the payload to come fire
+        cache.auctions[args.auctionId].endTs = Date.now();
+
+        const isOnlyInstreamAuction = args.adUnits && args.adUnits.every(adUnit => adUnitIsOnlyInstream(adUnit));
+        // If only instream, do not wait around, just send payload
+        if (isOnlyInstreamAuction) {
+          sendMessage.call(this, args.auctionId, undefined, 'instreamAuction');
+        } else {
+          // start timer to send batched payload just in case we don't hear any BID_WON events
+          cache.timeouts[args.auctionId] = setTimeout(() => {
+            sendMessage.call(this, args.auctionId, undefined, 'auctionEnd');
+          }, rubiConf.analyticsBatchTimeout || SEND_TIMEOUT);
+        }
         break;
       case BID_TIMEOUT:
         args.forEach(badBid => {
           let auctionCache = cache.auctions[badBid.auctionId];
           let bid = auctionCache.bids[badBid.bidId || badBid.requestId];
-          bid.status = 'error';
-          bid.error = {
-            code: 'timeout-error'
-          };
+          // might be set already by bidder-done, so do not overwrite
+          if (bid.status !== 'error') {
+            bid.status = 'error';
+            bid.error = {
+              code: 'timeout-error',
+              message: 'marked by prebid.js as timeout' // will help us diff if timeout was set by PBS or PBJS
+            };
+          }
         });
         break;
     }
@@ -538,7 +807,8 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
 
 adapterManager.registerAnalyticsAdapter({
   adapter: rubiconAdapter,
-  code: 'rubicon'
+  code: 'rubicon',
+  gvlid: RUBICON_GVL_ID
 });
 
 export default rubiconAdapter;
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index ad38a5f3aa2..df6eb2d95f6 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -2,32 +2,29 @@ import * as utils 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 find from 'core-js-pure/features/array/find.js';
+import { Renderer } from '../src/Renderer.js';
+import { getGlobal } from '../src/prebidGlobal.js';
 
 const DEFAULT_INTEGRATION = 'pbjs_lite';
 const DEFAULT_PBS_INTEGRATION = 'pbjs';
+const DEFAULT_RENDERER_URL = 'https://video-outstream.rubiconproject.com/apex-2.0.0.js';
+// renderer code at https://github.com/rubicon-project/apex2
 
-// always use https, regardless of whether or not current page is secure
-export const FASTLANE_ENDPOINT = 'https://fastlane.rubiconproject.com/a/api/fastlane.json';
-export const VIDEO_ENDPOINT = 'https://prebid-server.rubiconproject.com/openrtb2/auction';
-export const SYNC_ENDPOINT = 'https://eus.rubiconproject.com/usync.html';
+let rubiConf = {};
+// we are saving these as global to this module so that if a pub accidentally overwrites the entire
+// rubicon object, then we do not lose other data
+config.getConfig('rubicon', config => {
+  utils.mergeDeep(rubiConf, config.rubicon);
+});
 
 const GVLID = 52;
-const DIGITRUST_PROP_NAMES = {
-  FASTLANE: {
-    id: 'dt.id',
-    keyv: 'dt.keyv',
-    pref: 'dt.pref'
-  },
-  PREBID_SERVER: {
-    id: 'id',
-    keyv: 'keyv'
-  }
-};
 
 var sizeMap = {
   1: '468x60',
   2: '728x90',
   5: '120x90',
+  7: '125x125',
   8: '120x600',
   9: '160x600',
   10: '300x600',
@@ -109,13 +106,17 @@ var sizeMap = {
   274: '1800x200',
   278: '320x500',
   282: '320x400',
-  288: '640x380'
+  288: '640x380',
+  548: '500x1000',
+  550: '980x480',
+  552: '300x200',
+  558: '640x640'
 };
 utils._each(sizeMap, (item, key) => sizeMap[item] = key);
 
 export const spec = {
   code: 'rubicon',
-  aliases: ['rubicon2'],
+  aliases: ['rubicon2', 'rubicon3'],
   gvlid: GVLID,
   supportedMediaTypes: [BANNER, VIDEO],
   /**
@@ -162,9 +163,9 @@ export const spec = {
         source: {
           tid: bidRequest.transactionId
         },
-        tmax: config.getConfig('TTL') || 1000,
+        tmax: bidderRequest.timeout,
         imp: [{
-          exp: 300,
+          exp: config.getConfig('s2sConfig.defaultTtl'),
           id: bidRequest.adUnitCode,
           secure: 1,
           ext: {
@@ -174,9 +175,13 @@ export const spec = {
         }],
         ext: {
           prebid: {
+            channel: {
+              name: 'pbjs',
+              version: $$PREBID_GLOBAL$$.version
+            },
             cache: {
               vastxml: {
-                returnCreative: false // don't return the VAST
+                returnCreative: rubiConf.returnVast === true
               }
             },
             targeting: {
@@ -187,7 +192,7 @@ export const spec = {
             },
             bidders: {
               rubicon: {
-                integration: config.getConfig('rubicon.int_type') || DEFAULT_PBS_INTEGRATION
+                integration: rubiConf.int_type || DEFAULT_PBS_INTEGRATION
               }
             }
           }
@@ -201,13 +206,23 @@ export const spec = {
         }
       }
 
+      let modules = (getGlobal()).installedModules;
+      if (modules && (!modules.length || modules.indexOf('rubiconAnalyticsAdapter') !== -1)) {
+        utils.deepSetValue(data, 'ext.prebid.analytics', {'rubicon': {'client-analytics': true}});
+      }
+
       let bidFloor;
-      if (typeof bidRequest.getFloor === 'function' && !config.getConfig('rubicon.disableFloors')) {
-        let floorInfo = bidRequest.getFloor({
-          currency: 'USD',
-          mediaType: 'video',
-          size: parseSizes(bidRequest, 'video')
-        });
+      if (typeof bidRequest.getFloor === 'function' && !rubiConf.disableFloors) {
+        let floorInfo;
+        try {
+          floorInfo = bidRequest.getFloor({
+            currency: 'USD',
+            mediaType: 'video',
+            size: parseSizes(bidRequest, 'video')
+          });
+        } catch (e) {
+          utils.logError('Rubicon: getFloor threw an error: ', e);
+        }
         bidFloor = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? parseFloat(floorInfo.floor) : undefined;
       } else {
         bidFloor = parseFloat(utils.deepAccess(bidRequest, 'params.floor'));
@@ -222,11 +237,6 @@ export const spec = {
 
       addVideoParameters(data, bidRequest);
 
-      const digiTrust = _getDigiTrustQueryParams(bidRequest, 'PREBID_SERVER');
-      if (digiTrust) {
-        utils.deepSetValue(data, 'user.ext.digitrust', digiTrust);
-      }
-
       if (bidderRequest.gdprConsent) {
         // note - gdprApplies & consentString may be undefined in certain use-cases for consentManagement module
         let gdprApplies;
@@ -242,59 +252,15 @@ export const spec = {
         utils.deepSetValue(data, 'regs.ext.us_privacy', bidderRequest.uspConsent);
       }
 
-      if (bidRequest.userId && typeof bidRequest.userId === 'object' &&
-        (bidRequest.userId.tdid || bidRequest.userId.pubcid || bidRequest.userId.lipb || bidRequest.userId.idl_env)) {
-        utils.deepSetValue(data, 'user.ext.eids', []);
-
-        if (bidRequest.userId.tdid) {
-          data.user.ext.eids.push({
-            source: 'adserver.org',
-            uids: [{
-              id: bidRequest.userId.tdid,
-              ext: {
-                rtiPartner: 'TDID'
-              }
-            }]
-          });
-        }
-
-        if (bidRequest.userId.pubcid) {
-          data.user.ext.eids.push({
-            source: 'pubcommon',
-            uids: [{
-              id: bidRequest.userId.pubcid,
-            }]
-          });
-        }
-
-        // support liveintent ID
-        if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
-          data.user.ext.eids.push({
-            source: 'liveintent.com',
-            uids: [{
-              id: bidRequest.userId.lipb.lipbid
-            }]
-          });
-
-          data.user.ext.tpid = {
-            source: 'liveintent.com',
-            uid: bidRequest.userId.lipb.lipbid
-          };
-
-          if (Array.isArray(bidRequest.userId.lipb.segments) && bidRequest.userId.lipb.segments.length) {
-            utils.deepSetValue(data, 'rp.target.LIseg', bidRequest.userId.lipb.segments);
-          }
-        }
+      const eids = utils.deepAccess(bidderRequest, 'bids.0.userIdAsEids');
+      if (eids && eids.length) {
+        utils.deepSetValue(data, 'user.ext.eids', eids);
+      }
 
-        // support identityLink (aka LiveRamp)
-        if (bidRequest.userId.idl_env) {
-          data.user.ext.eids.push({
-            source: 'liveramp.com',
-            uids: [{
-              id: bidRequest.userId.idl_env
-            }]
-          });
-        }
+      // set user.id value from config value
+      const configUserId = config.getConfig('user.id');
+      if (configUserId) {
+        utils.deepSetValue(data, 'user.id', configUserId);
       }
 
       if (config.getConfig('coppa') === true) {
@@ -305,35 +271,22 @@ export const spec = {
         utils.deepSetValue(data, 'source.ext.schain', bidRequest.schain);
       }
 
-      const siteData = Object.assign({}, bidRequest.params.inventory, config.getConfig('fpd.context'));
-      const userData = Object.assign({}, bidRequest.params.visitor, config.getConfig('fpd.user'));
-      if (!utils.isEmpty(siteData) || !utils.isEmpty(userData)) {
-        const bidderData = {
-          bidders: [ bidderRequest.bidderCode ],
-          config: {
-            fpd: {}
-          }
-        };
+      const multibid = config.getConfig('multibid');
+      if (multibid) {
+        utils.deepSetValue(data, 'ext.prebid.multibid', multibid.reduce((result, i) => {
+          let obj = {};
 
-        if (!utils.isEmpty(siteData)) {
-          bidderData.config.fpd.site = siteData;
-        }
+          Object.keys(i).forEach(key => {
+            obj[key.toLowerCase()] = i[key];
+          });
 
-        if (!utils.isEmpty(userData)) {
-          bidderData.config.fpd.user = userData;
-        }
+          result.push(obj);
 
-        utils.deepSetValue(data, 'ext.prebid.bidderconfig.0', bidderData);
+          return result;
+        }, []));
       }
 
-      /**
-       * Prebid AdSlot
-       * @type {(string|undefined)}
-       */
-      const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-      if (typeof pbAdSlot === 'string' && pbAdSlot) {
-        utils.deepSetValue(data.imp[0].ext, 'context.data.adslot', pbAdSlot);
-      }
+      applyFPD(bidRequest, VIDEO, data);
 
       // if storedAuctionResponse has been set, pass SRID
       if (bidRequest.storedAuctionResponse) {
@@ -345,19 +298,19 @@ export const spec = {
 
       return {
         method: 'POST',
-        url: VIDEO_ENDPOINT,
+        url: `https://${rubiConf.videoHost || 'prebid-server'}.rubiconproject.com/openrtb2/auction`,
         data,
         bidRequest
       }
     });
 
-    if (config.getConfig('rubicon.singleRequest') !== true) {
+    if (rubiConf.singleRequest !== true) {
       // bids are not grouped if single request mode is not enabled
       requests = videoRequests.concat(bidRequests.filter(bidRequest => bidType(bidRequest) === 'banner').map(bidRequest => {
         const bidParams = spec.createSlotParams(bidRequest, bidderRequest);
         return {
           method: 'GET',
-          url: FASTLANE_ENDPOINT,
+          url: `https://${rubiConf.bannerHost || 'fastlane'}.rubiconproject.com/a/api/fastlane.json`,
           data: spec.getOrderedParams(bidParams).reduce((paramString, key) => {
             const propValue = bidParams[key];
             return ((utils.isStr(propValue) && propValue !== '') || utils.isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
@@ -388,7 +341,7 @@ export const spec = {
           // SRA request returns grouped bidRequest arrays not a plain bidRequest
           aggregate.push({
             method: 'GET',
-            url: FASTLANE_ENDPOINT,
+            url: `https://${rubiConf.bannerHost || 'fastlane'}.rubiconproject.com/a/api/fastlane.json`,
             data: spec.getOrderedParams(combinedSlotParams).reduce((paramString, key) => {
               const propValue = combinedSlotParams[key];
               return ((utils.isStr(propValue) && propValue !== '') || utils.isNumber(propValue)) ? `${paramString}${encodeParam(key, propValue)}&` : paramString;
@@ -405,6 +358,7 @@ export const spec = {
   getOrderedParams: function(params) {
     const containsTgV = /^tg_v/
     const containsTgI = /^tg_i/
+    const containsUId = /^eid_|^tpid_/
 
     const orderedParams = [
       'account_id',
@@ -417,17 +371,15 @@ export const spec = {
       'gdpr_consent',
       'us_privacy',
       'rp_schain',
-      'tpid_tdid',
-      'tpid_liveintent.com',
-      'tg_v.LIseg',
-      'dt.id',
-      'dt.keyv',
-      'dt.pref',
-      'rf',
-      'p_geo.latitude',
-      'p_geo.longitude',
-      'kw'
-    ].concat(Object.keys(params).filter(item => containsTgV.test(item)))
+    ].concat(Object.keys(params).filter(item => containsUId.test(item)))
+      .concat([
+        'x_liverampidl',
+        'ppuid',
+        'rf',
+        'p_geo.latitude',
+        'p_geo.longitude',
+        'kw'
+      ]).concat(Object.keys(params).filter(item => containsTgV.test(item)))
       .concat(Object.keys(params).filter(item => containsTgI.test(item)))
       .concat([
         'tk_flint',
@@ -495,17 +447,15 @@ export const spec = {
 
     const [latitude, longitude] = params.latLong || [];
 
-    const configIntType = config.getConfig('rubicon.int_type');
-
     const data = {
       'account_id': params.accountId,
       'site_id': params.siteId,
       'zone_id': params.zoneId,
       'size_id': parsedSizes[0],
       'alt_size_ids': parsedSizes.slice(1).join(',') || undefined,
-      'rp_floor': (params.floor = parseFloat(params.floor)) > 0.01 ? params.floor : 0.01,
+      'rp_floor': (params.floor = parseFloat(params.floor)) >= 0.01 ? params.floor : undefined,
       'rp_secure': '1',
-      'tk_flint': `${configIntType || DEFAULT_INTEGRATION}_v$prebid.version$`,
+      'tk_flint': `${rubiConf.int_type || DEFAULT_INTEGRATION}_v$prebid.version$`,
       'x_source.tid': bidRequest.transactionId,
       'x_source.pchain': params.pchain,
       'p_screen_res': _getScreenResolution(),
@@ -517,12 +467,17 @@ export const spec = {
     };
 
     // If floors module is enabled and we get USD floor back, send it in rp_hard_floor else undfined
-    if (typeof bidRequest.getFloor === 'function' && !config.getConfig('rubicon.disableFloors')) {
-      let floorInfo = bidRequest.getFloor({
-        currency: 'USD',
-        mediaType: 'banner',
-        size: '*'
-      });
+    if (typeof bidRequest.getFloor === 'function' && !rubiConf.disableFloors) {
+      let floorInfo;
+      try {
+        floorInfo = bidRequest.getFloor({
+          currency: 'USD',
+          mediaType: 'banner',
+          size: '*'
+        });
+      } catch (e) {
+        utils.logError('Rubicon: getFloor threw an error: ', e);
+      }
       data['rp_hard_floor'] = typeof floorInfo === 'object' && floorInfo.currency === 'USD' && !isNaN(parseInt(floorInfo.floor)) ? floorInfo.floor : undefined;
     }
 
@@ -530,23 +485,47 @@ export const spec = {
     // For SRA we need to explicitly put empty semi colons so AE treats it as empty, instead of copying the latter value
     data['p_pos'] = (params.position === 'atf' || params.position === 'btf') ? params.position : '';
 
-    if (bidRequest.userId) {
-      if (bidRequest.userId.tdid) {
-        data['tpid_tdid'] = bidRequest.userId.tdid;
-      }
-
-      // support liveintent ID
-      if (bidRequest.userId.lipb && bidRequest.userId.lipb.lipbid) {
-        data['tpid_liveintent.com'] = bidRequest.userId.lipb.lipbid;
-        if (Array.isArray(bidRequest.userId.lipb.segments) && bidRequest.userId.lipb.segments.length) {
-          data['tg_v.LIseg'] = bidRequest.userId.lipb.segments.join(',');
+    // pass publisher provided userId if configured
+    const configUserId = config.getConfig('user.id');
+    if (configUserId) {
+      data['ppuid'] = configUserId;
+    }
+    // loop through userIds and add to request
+    if (bidRequest.userIdAsEids) {
+      bidRequest.userIdAsEids.forEach(eid => {
+        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 === 'sharedid.org') {
+            data['eid_sharedid.org'] = `${eid.uids[0].id}^${eid.uids[0].atype}^${(eid.uids[0].ext && eid.uids[0].ext.third) || ''}`;
+          } 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
+            data[`eid_${eid.source}`] = `${eid.uids[0].id}^${eid.uids[0].atype || ''}`;
+          }
+          // send AE "ppuid" signal if exists, and hasn't already been sent
+          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;
+            }
+          }
+        } catch (e) {
+          utils.logWarn('Rubicon: error reading eid:', eid, e);
         }
-      }
-
-      // support identityLink (aka LiveRamp)
-      if (bidRequest.userId.idl_env) {
-        data['tpid_liveramp.com'] = bidRequest.userId.idl_env;
-      }
+      });
     }
 
     if (bidderRequest.gdprConsent) {
@@ -561,44 +540,9 @@ export const spec = {
       data['us_privacy'] = encodeURIComponent(bidderRequest.uspConsent);
     }
 
-    // visitor properties
-    const visitorData = Object.assign({}, params.visitor, config.getConfig('fpd.user'));
-    Object.keys(visitorData).forEach((key) => {
-      if (visitorData[key] != null && key !== 'keywords') {
-        data[`tg_v.${key}`] = typeof visitorData[key] === 'object' && !Array.isArray(visitorData[key])
-          ? JSON.stringify(visitorData[key])
-          : visitorData[key].toString(); // initialize array;
-      }
-    });
-
-    // inventory properties
-    const inventoryData = Object.assign({}, params.inventory, config.getConfig('fpd.context'));
-    Object.keys(inventoryData).forEach((key) => {
-      if (inventoryData[key] != null && key !== 'keywords') {
-        data[`tg_i.${key}`] = typeof inventoryData[key] === 'object' && !Array.isArray(inventoryData[key])
-          ? JSON.stringify(inventoryData[key])
-          : inventoryData[key].toString();
-      }
-    });
-
-    // keywords
-    const keywords = (params.keywords || []).concat(
-      utils.deepAccess(config.getConfig('fpd.user'), 'keywords') || [],
-      utils.deepAccess(config.getConfig('fpd.context'), 'keywords') || []);
-    data.kw = Array.isArray(keywords) && keywords.length ? keywords.join(',') : '';
-
-    /**
-     * Prebid AdSlot
-     * @type {(string|undefined)}
-     */
-    const pbAdSlot = utils.deepAccess(bidRequest, 'fpd.context.pbAdSlot');
-    if (typeof pbAdSlot === 'string' && pbAdSlot) {
-      data['tg_i.dfp_ad_unit_code'] = pbAdSlot.replace(/^\/+/, '');
-    }
+    data['rp_maxbids'] = bidderRequest.bidLimit || 1;
 
-    // digitrust properties
-    const digitrustParams = _getDigiTrustQueryParams(bidRequest, 'FASTLANE');
-    Object.assign(data, digitrustParams);
+    applyFPD(bidRequest, BANNER, data);
 
     if (config.getConfig('coppa') === true) {
       data['coppa'] = 1;
@@ -666,7 +610,7 @@ export const spec = {
             cpm: bid.price || 0,
             bidderCode: seatbid.seat,
             ttl: 300,
-            netRevenue: config.getConfig('rubicon.netRevenue') !== false, // If anything other than false, netRev is true
+            netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
             width: bid.w || utils.deepAccess(bidRequest, 'mediaTypes.video.w') || utils.deepAccess(bidRequest, 'params.video.playerWidth'),
             height: bid.h || utils.deepAccess(bidRequest, 'mediaTypes.video.h') || utils.deepAccess(bidRequest, 'params.video.playerHeight'),
           };
@@ -679,6 +623,14 @@ export const spec = {
             bidObject.dealId = bid.dealid;
           }
 
+          if (bid.adomain) {
+            utils.deepSetValue(bidObject, 'meta.advertiserDomains', Array.isArray(bid.adomain) ? bid.adomain : [bid.adomain]);
+          }
+
+          if (utils.deepAccess(bid, 'ext.bidder.rp.advid')) {
+            utils.deepSetValue(bidObject, 'meta.advertiserId', bid.ext.bidder.rp.advid);
+          }
+
           let serverResponseTimeMs = utils.deepAccess(responseObj, 'ext.responsetimemillis.rubicon');
           if (bidRequest && serverResponseTimeMs) {
             bidRequest.serverResponseTimeMs = serverResponseTimeMs;
@@ -686,6 +638,7 @@ export const spec = {
 
           if (utils.deepAccess(bid, 'ext.prebid.type') === VIDEO) {
             bidObject.mediaType = VIDEO;
+            utils.deepSetValue(bidObject, 'meta.mediaType', VIDEO);
             const extPrebidTargeting = utils.deepAccess(bid, 'ext.prebid.targeting');
 
             // If ext.prebid.targeting exists, add it as a property value named 'adserverTargeting'
@@ -707,6 +660,11 @@ export const spec = {
             if (bid.adm) { bidObject.vastXml = bid.adm; }
             if (bid.nurl) { bidObject.vastUrl = bid.nurl; }
             if (!bidObject.vastUrl && bid.nurl) { bidObject.vastUrl = bid.nurl; }
+
+            const videoContext = utils.deepAccess(bidRequest, 'mediaTypes.video.context');
+            if (videoContext.toLowerCase() === 'outstream') {
+              bidObject.renderer = outstreamRenderer(bidObject);
+            }
           } else {
             utils.logWarn('Rubicon: video response received non-video media type');
           }
@@ -719,6 +677,8 @@ export const spec = {
     }
 
     let ads = responseObj.ads;
+    let lastImpId;
+    let multibid = 0;
 
     // video ads array is wrapped in an object
     if (typeof bidRequest === 'object' && !Array.isArray(bidRequest) && bidType(bidRequest) === 'video' && typeof ads === 'object') {
@@ -731,12 +691,14 @@ export const spec = {
     }
 
     return ads.reduce((bids, ad, i) => {
+      (ad.impression_id && lastImpId === ad.impression_id) ? multibid++ : lastImpId = ad.impression_id;
+
       if (ad.status !== 'ok') {
         return bids;
       }
 
       // associate bidRequests; assuming ads matches bidRequest
-      const associatedBidRequest = Array.isArray(bidRequest) ? bidRequest[i] : bidRequest;
+      const associatedBidRequest = Array.isArray(bidRequest) ? bidRequest[i - multibid] : bidRequest;
 
       if (associatedBidRequest && typeof associatedBidRequest === 'object') {
         let bid = {
@@ -746,12 +708,12 @@ export const spec = {
           cpm: ad.cpm || 0,
           dealId: ad.deal,
           ttl: 300, // 5 minutes
-          netRevenue: config.getConfig('rubicon.netRevenue') !== false, // If anything other than false, netRev is true
+          netRevenue: rubiConf.netRevenue !== false, // If anything other than false, netRev is true
           rubicon: {
             advertiserId: ad.advertiser, networkId: ad.network
           },
           meta: {
-            advertiserId: ad.advertiser, networkId: ad.network
+            advertiserId: ad.advertiser, networkId: ad.network, mediaType: BANNER
           }
         };
 
@@ -759,6 +721,10 @@ export const spec = {
           bid.mediaType = ad.creative_type;
         }
 
+        if (ad.adomain) {
+          bid.meta.advertiserDomains = Array.isArray(ad.adomain) ? ad.adomain : [ad.adomain];
+        }
+
         if (ad.creative_type === VIDEO) {
           bid.width = associatedBidRequest.params.video.playerWidth;
           bid.height = associatedBidRequest.params.video.playerHeight;
@@ -789,7 +755,7 @@ export const spec = {
   },
   getUserSyncs: function (syncOptions, responses, gdprConsent, uspConsent) {
     if (!hasSynced && syncOptions.iframeEnabled) {
-      // data is only assigned if params are available to pass to SYNC_ENDPOINT
+      // data is only assigned if params are available to pass to syncEndpoint
       let params = '';
 
       if (gdprConsent && typeof gdprConsent.consentString === 'string') {
@@ -808,7 +774,7 @@ export const spec = {
       hasSynced = true;
       return {
         type: 'iframe',
-        url: SYNC_ENDPOINT + params
+        url: `https://${rubiConf.syncHost || 'eus'}.rubiconproject.com/usync.html` + params
       };
     }
   },
@@ -831,38 +797,6 @@ function _getScreenResolution() {
   return [window.screen.width, window.screen.height].join('x');
 }
 
-function _getDigiTrustQueryParams(bidRequest = {}, endpointName) {
-  if (!endpointName || !DIGITRUST_PROP_NAMES[endpointName]) {
-    return null;
-  }
-  const propNames = DIGITRUST_PROP_NAMES[endpointName];
-
-  function getDigiTrustId() {
-    const bidRequestDigitrust = utils.deepAccess(bidRequest, 'userId.digitrustid.data');
-    if (bidRequestDigitrust) {
-      return bidRequestDigitrust;
-    }
-
-    let digiTrustUser = (window.DigiTrust && (config.getConfig('digiTrustId') || window.DigiTrust.getUser({member: 'T9QSFKPDN9'})));
-    return (digiTrustUser && digiTrustUser.success && digiTrustUser.identity) || null;
-  }
-
-  let digiTrustId = getDigiTrustId();
-  // Verify there is an ID and this user has not opted out
-  if (!digiTrustId || (digiTrustId.privacy && digiTrustId.privacy.optout)) {
-    return null;
-  }
-
-  const digiTrustQueryParams = {
-    [propNames.id]: digiTrustId.id,
-    [propNames.keyv]: digiTrustId.keyv
-  };
-  if (propNames.pref) {
-    digiTrustQueryParams[propNames.pref] = 0;
-  }
-  return digiTrustQueryParams;
-}
-
 /**
  * @param {BidRequest} bidRequest
  * @param bidderRequest
@@ -890,6 +824,64 @@ function _renderCreative(script, impId) {
 `;
 }
 
+function hideGoogleAdsDiv(adUnit) {
+  const el = adUnit.querySelector("div[id^='google_ads']");
+  if (el) {
+    el.style.setProperty('display', 'none');
+  }
+}
+
+function hideSmartAdServerIframe(adUnit) {
+  const el = adUnit.querySelector("script[id^='sas_script']");
+  const nextSibling = el && el.nextSibling;
+  if (nextSibling && nextSibling.localName === 'iframe') {
+    nextSibling.style.setProperty('display', 'none');
+  }
+}
+
+function renderBid(bid) {
+  // hide existing ad units
+  const adUnitElement = document.getElementById(bid.adUnitCode);
+  hideGoogleAdsDiv(adUnitElement);
+  hideSmartAdServerIframe(adUnitElement);
+
+  // configure renderer
+  const config = bid.renderer.getConfig();
+  bid.renderer.push(() => {
+    window.MagniteApex.renderAd({
+      width: bid.width,
+      height: bid.height,
+      vastUrl: bid.vastUrl,
+      placement: {
+        attachTo: `#${bid.adUnitCode}`,
+        align: config.align || 'center',
+        position: config.position || 'append'
+      },
+      closeButton: config.closeButton || false,
+      label: config.label || undefined,
+      collapse: config.collapse || true
+    });
+  });
+}
+
+function outstreamRenderer(rtbBid) {
+  const renderer = Renderer.install({
+    id: rtbBid.adId,
+    url: rubiConf.rendererUrl || DEFAULT_RENDERER_URL,
+    config: rubiConf.rendererConfig || {},
+    loaded: false,
+    adUnitCode: rtbBid.adUnitCode
+  });
+
+  try {
+    renderer.setRender(renderBid);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
 function parseSizes(bid, mediaType) {
   let params = bid.params;
   if (mediaType === 'video') {
@@ -977,6 +969,80 @@ function addVideoParameters(data, bidRequest) {
   data.imp[0].video.h = size[1]
 }
 
+function applyFPD(bidRequest, mediaType, data) {
+  const BID_FPD = {
+    user: {ext: {data: {...bidRequest.params.visitor}}},
+    site: {ext: {data: {...bidRequest.params.inventory}}}
+  };
+
+  if (bidRequest.params.keywords) BID_FPD.site.keywords = (utils.isArray(bidRequest.params.keywords)) ? bidRequest.params.keywords.join(',') : bidRequest.params.keywords;
+
+  let fpd = utils.mergeDeep({}, config.getConfig('ortb2') || {}, BID_FPD);
+  let impData = utils.deepAccess(bidRequest.ortb2Imp, 'ext.data') || {};
+  const SEGTAX = {user: [3], site: [1, 2]};
+  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) {
+    if (key === 'data' && Array.isArray(prop)) {
+      return prop.filter(name => name.segment && utils.deepAccess(name, 'ext.segtax') && SEGTAX[parentName] &&
+        SEGTAX[parentName].indexOf(utils.deepAccess(name, 'ext.segtax')) !== -1).map(value => {
+        let segments = value.segment.filter(obj => obj.id).reduce((result, obj) => {
+          result.push(obj.id);
+          return result;
+        }, []);
+        if (segments.length > 0) return segments.toString();
+      }).toString();
+    } else if (typeof prop === 'object' && !Array.isArray(prop)) {
+      utils.logWarn('Rubicon: Filtered FPD key: ', key, ': Expected value to be string, integer, or an array of strings/ints');
+    } else if (typeof prop !== 'undefined') {
+      return (Array.isArray(prop)) ? prop.filter(value => {
+        if (typeof value !== 'object' && typeof value !== 'undefined') return value.toString();
+
+        utils.logWarn('Rubicon: Filtered value: ', value, 'for key', key, ': Expected value to be string, integer, or an array of strings/ints');
+      }).toString() : prop.toString();
+    }
+  };
+  const addBannerData = function(obj, name, key, isParent = true) {
+    let val = validate(obj, key, name);
+    let loc = (MAP[key] && isParent) ? `${MAP[key]}` : (key === 'data') ? `${MAP[name]}iab` : `${MAP[name]}${key}`;
+    data[loc] = (data[loc]) ? data[loc].concat(',', val) : val;
+  }
+
+  Object.keys(impData).forEach((key) => {
+    if (key === 'adserver') {
+      ['name', 'adslot'].forEach(prop => {
+        if (impData[key][prop]) impData[key][prop] = impData[key][prop].toString().replace(/^\/+/, '');
+      });
+    } else if (key === 'pbadslot') {
+      impData[key] = impData[key].toString().replace(/^\/+/, '');
+    }
+  });
+
+  if (mediaType === BANNER) {
+    ['site', 'user'].forEach(name => {
+      Object.keys(fpd[name]).forEach((key) => {
+        if (name === 'site' && key === 'content' && fpd[name][key].data) {
+          addBannerData(fpd[name][key].data, name, 'data');
+        } else if (key !== 'ext') {
+          addBannerData(fpd[name][key], name, key);
+        } else if (fpd[name][key].data) {
+          Object.keys(fpd[name].ext.data).forEach((key) => {
+            addBannerData(fpd[name].ext.data[key], name, key, false);
+          });
+        }
+      });
+    });
+    Object.keys(impData).forEach((key) => {
+      (key === 'adserver') ? addBannerData(impData[key].adslot, name, key) : addBannerData(impData[key], 'site', key);
+    });
+  } else {
+    if (Object.keys(impData).length) {
+      utils.mergeDeep(data.imp[0].ext, {data: impData});
+    }
+
+    utils.mergeDeep(data, fpd);
+  }
+}
+
 /**
  * @param sizes
  * @returns {*}
@@ -1054,6 +1120,7 @@ function bidType(bid, log = false) {
   }
 }
 
+export const resetRubiConf = () => rubiConf = {};
 export function masSizeOrdering(sizes) {
   const MAS_SIZE_PRIORITY = [15, 2, 9];
 
@@ -1123,7 +1190,6 @@ export function hasValidVideoParams(bid) {
   var requiredParams = {
     mimes: arrayType,
     protocols: arrayType,
-    maxduration: numberType,
     linearity: numberType,
     api: arrayType
   }
@@ -1148,7 +1214,7 @@ export function hasValidSupplyChainParams(schain) {
   if (!schain.nodes) return isValid;
   isValid = schain.nodes.reduce((status, node) => {
     if (!status) return status;
-    return requiredFields.every(field => node[field]);
+    return requiredFields.every(field => node.hasOwnProperty(field));
   }, true);
   if (!isValid) utils.logError('Rubicon: required schain params missing');
   return isValid;
diff --git a/modules/rubiconBidAdapter.md b/modules/rubiconBidAdapter.md
index beb29a6baf1..0ef22a81972 100644
--- a/modules/rubiconBidAdapter.md
+++ b/modules/rubiconBidAdapter.md
@@ -70,9 +70,9 @@ globalsupport@rubiconproject.com for more information.
        bids: [{
         bidder: 'rubicon',
         params: {
-            accountId: '7780',
-            siteId: '87184',
-            zoneId: '412394',
+            accountId: 7780,
+            siteId: 87184,
+            zoneId: 412394,
             video: {
                 language: 'en'
             }
diff --git a/modules/s2sTesting.js b/modules/s2sTesting.js
index 98b3b86671c..1f2bb473174 100644
--- a/modules/s2sTesting.js
+++ b/modules/s2sTesting.js
@@ -1,4 +1,3 @@
-import { config } from '../src/config.js';
 import { setS2STestingModule } from '../src/adapterManager.js';
 
 let s2sTesting = {};
@@ -9,39 +8,31 @@ const CLIENT = 'client';
 s2sTesting.SERVER = SERVER;
 s2sTesting.CLIENT = CLIENT;
 
-var testing = false; // whether testing is turned on
-var bidSource = {}; // store bidder sources determined from s2sConfing bidderControl
+s2sTesting.bidSource = {}; // store bidder sources determined from s2sConfig bidderControl
 s2sTesting.globalRand = Math.random(); // if 10% of bidderA and 10% of bidderB should be server-side, make it the same 10%
 
-// load s2sConfig
-config.getConfig('s2sConfig', config => {
-  testing = config.s2sConfig && config.s2sConfig.testing;
-  s2sTesting.calculateBidSources(config.s2sConfig);
-});
-
-s2sTesting.getSourceBidderMap = function(adUnits = []) {
+s2sTesting.getSourceBidderMap = function(adUnits = [], allS2SBidders = []) {
   var sourceBidders = {[SERVER]: {}, [CLIENT]: {}};
 
-  // bail if testing is not turned on
-  if (!testing) {
-    return {[SERVER]: [], [CLIENT]: []};
-  }
-
   adUnits.forEach((adUnit) => {
     // if any adUnit bidders specify a bidSource, include them
     (adUnit.bids || []).forEach((bid) => {
+      // When a s2sConfig does not have testing=true and did not calc bid sources
+      if (allS2SBidders.indexOf(bid.bidder) > -1 && !s2sTesting.bidSource[bid.bidder]) {
+        s2sTesting.bidSource[bid.bidder] = SERVER;
+      }
       // calculate the source once and store on bid object
       bid.calcSource = bid.calcSource || s2sTesting.getSource(bid.bidSource);
       // if no bidSource at bid level, default to bidSource from bidder
-      bid.finalSource = bid.calcSource || bidSource[bid.bidder] || CLIENT; // default to client
+      bid.finalSource = bid.calcSource || s2sTesting.bidSource[bid.bidder] || CLIENT; // default to client
       // add bidder to sourceBidders data structure
       sourceBidders[bid.finalSource][bid.bidder] = true;
     });
   });
 
   // make sure all bidders in bidSource are in sourceBidders
-  Object.keys(bidSource).forEach((bidder) => {
-    sourceBidders[bidSource[bidder]][bidder] = true;
+  Object.keys(s2sTesting.bidSource).forEach((bidder) => {
+    sourceBidders[s2sTesting.bidSource[bidder]][bidder] = true;
   });
 
   // return map of source => array of bidders
@@ -53,18 +44,14 @@ s2sTesting.getSourceBidderMap = function(adUnits = []) {
 
 /**
  * @function calculateBidSources determines the source for each s2s bidder based on bidderControl weightings.  these can be overridden at the adUnit level
- * @param s2sConfig server-to-server configuration
+ * @param s2sConfigs server-to-server configuration
  */
 s2sTesting.calculateBidSources = function(s2sConfig = {}) {
-  // bail if testing is not turned on
-  if (!testing) {
-    return;
-  }
-  bidSource = {}; // reset bid sources
   // calculate bid source (server/client) for each s2s bidder
+
   var bidderControl = s2sConfig.bidderControl || {};
   (s2sConfig.bidders || []).forEach((bidder) => {
-    bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
+    s2sTesting.bidSource[bidder] = s2sTesting.getSource(bidderControl[bidder] && bidderControl[bidder].bidSource) || SERVER; // default to server
   });
 };
 
diff --git a/modules/saambaaBidAdapter.js b/modules/saambaaBidAdapter.js
new file mode 100755
index 00000000000..0e53d2a300d
--- /dev/null
+++ b/modules/saambaaBidAdapter.js
@@ -0,0 +1,401 @@
+import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { VIDEO, BANNER } from '../src/mediaTypes.js';
+import find from 'core-js-pure/features/array/find.js';
+import includes from 'core-js-pure/features/array/includes.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'];
+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 && utils.isEmpty(response) == false) {
+      if (isVideoBid(bidRequest)) {
+        let bidResponse = {
+          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,
+          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 utils.deepAccess(bid, 'mediaTypes.banner') || !isVideoBid(bid);
+}
+
+function isVideoBid(bid) {
+  return utils.deepAccess(bid, 'mediaTypes.video');
+}
+
+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 utils.deepAccess(bid, 'params.video.' + key) || utils.deepAccess(bid, 'params.' + key);
+}
+
+function getBannerBidParam(bid, key) {
+  return utils.deepAccess(bid, 'params.banner.' + key) || utils.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 utils.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(utils.deepAccess(bid, 'mediaTypes.video.playerSize') || bid.sizes);
+}
+
+function getBannerSizes(bid) {
+  return parseSizes(utils.deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
+}
+
+function getTopWindowReferrer() {
+  try {
+    return window.top.document.referrer;
+  } catch (e) {
+    return '';
+  }
+}
+
+function getVideoTargetingParams(bid) {
+  return Object.keys(Object(bid.params.video))
+    .filter(param => includes(VIDEO_TARGETING, param))
+    .reduce((obj, param) => {
+      obj[ param ] = bid.params.video[ param ];
+      return obj;
+    }, {});
+}
+
+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 = [];
+
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getVideoSizes(bid);
+  }
+  const firstSize = getFirstSize(sizes);
+
+  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');
+  let floor = getVideoBidParam(bid, 'floor');
+  if (floor == null) { floor = 0.5; }
+
+  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': utils.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) {
+  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
+  return utils.parseUrl(config.getConfig('pageUrl') || url, { 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 = [];
+  if (typeof paramSize !== 'undefined' && paramSize != '') {
+    sizes = parseSizes(paramSize);
+  } else {
+    sizes = getBannerSizes(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];
+
+    let floor = getBannerBidParam(bid, 'floor');
+    if (floor == null) { floor = 0.1; }
+
+    o.imp.push({
+      'id': '' + j,
+      'displaymanager': '' + BIDDER_CODE,
+      'displaymanagerver': '' + ADAPTER_VERSION,
+      'tagId': placement,
+      'bidfloor': floor,
+      'bidfloorcur': 'USD',
+      'secure': secure,
+      'banner': {
+        'id': utils.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/saambaaBidAdapter.md b/modules/saambaaBidAdapter.md
new file mode 100755
index 00000000000..2d391da7628
--- /dev/null
+++ b/modules/saambaaBidAdapter.md
@@ -0,0 +1,69 @@
+# Overview
+
+```
+Module Name: Saambaa Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: matt.voigt@saambaa.com
+```
+
+# Description
+
+Connects to Saambaa exchange for bids.
+
+Saambaa bid adapter supports Banner and Video ads currently.
+
+For more informatio
+
+# Sample Display Ad Unit: For Publishers
+```javascript
+
+var displayAdUnit = [
+{
+    code: 'display',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250],[320, 50]]
+        }
+    }
+    bids: [{
+        bidder: 'saambaa',
+        params: {
+            pubid: '121ab139faf7ac67428a23f1d0a9a71b',
+			placement: 1234,
+			size: '320x50'
+        }
+    }]
+}];
+```
+
+# Sample Video Ad Unit: For Publishers
+```javascript
+
+var videoAdUnit = {
+	code: 'video',
+	sizes: [320,480],
+	mediaTypes: {
+	  video: {
+	  	playerSize : [[320, 480]], 
+	  	context: 'instream'
+	  }
+	},
+    bids: [
+      {
+      	bidder: 'saambaa',
+      	params: {
+        	pubid: '121ab139faf7ac67428a23f1d0a9a71b',
+			placement: 1234,
+			size: "320x480",
+        	video: {
+            	id: 123,
+            	skip: 1,
+            	mimes : ['video/mp4', 'application/javascript'],
+            	playbackmethod : [2,6],
+            	maxduration: 30
+          	}
+      	}
+      }
+    ]
+  };
+```
\ No newline at end of file
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
index b6acd7214a2..d85ae856317 100755
--- a/modules/seedingAllianceBidAdapter.js
+++ b/modules/seedingAllianceBidAdapter.js
@@ -62,7 +62,6 @@ export const spec = {
     const pt = setOnAny(validBidRequests, 'params.pt') || setOnAny(validBidRequests, 'params.priceType') || 'net';
     const tid = validBidRequests[0].transactionId;
     const cur = [config.getConfig('currency.adServerCurrency') || DEFAULT_CUR];
-    let pubcid = null;
     let url = bidderRequest.refererInfo.referer;
 
     const imp = validBidRequests.map((bid, id) => {
@@ -112,10 +111,6 @@ export const spec = {
       };
     });
 
-    if (validBidRequests[0].crumbs && validBidRequests[0].crumbs.pubcid) {
-      pubcid = validBidRequests[0].crumbs.pubcid;
-    }
-
     const request = {
       id: bidderRequest.auctionId,
       site: {
@@ -126,15 +121,26 @@ export const spec = {
       },
       cur,
       imp,
-      user: {
-        buyeruid: pubcid
+      user: {},
+      regs: {
+        ext: {
+          gdpr: 0
+        }
       }
     };
 
+    if (bidderRequest && bidderRequest.gdprConsent) {
+      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+      utils.deepSetValue(request, 'regs.ext.gdpr', (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean' && bidderRequest.gdprConsent.gdprApplies) ? 1 : 0);
+    }
+
     return {
       method: 'POST',
       url: ENDPOINT_URL,
       data: JSON.stringify(request),
+      options: {
+        contentType: 'application/json'
+      },
       bids: validBidRequests
     };
   },
diff --git a/modules/seedtagBidAdapter.js b/modules/seedtagBidAdapter.js
index 018339fabe4..0acf1a8ff97 100644
--- a/modules/seedtagBidAdapter.js
+++ b/modules/seedtagBidAdapter.js
@@ -6,20 +6,47 @@ 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_PLACEMENTS = {
+  inImage: true,
+  inScreen: true,
+  inArticle: true,
+  banner: true,
+  video: true
+}
 const mediaTypesMap = {
   [BANNER]: 'display',
   [VIDEO]: 'video'
 };
 
+const deviceConnection = {
+  FIXED: 'fixed',
+  MOBILE: 'mobile',
+  UNKNOWN: 'unknown'
+};
+
+const getConnectionType = () => {
+  const connection = navigator.connection || navigator.mozConnection || navigator.webkitConnection || {}
+  switch (connection.type || connection.effectiveType) {
+    case 'wifi':
+    case 'ethernet':
+      return deviceConnection.FIXED
+    case 'cellular':
+    case 'wimax':
+      return deviceConnection.MOBILE
+    default:
+      const isMobile = /iPad|iPhone|iPod/.test(navigator.userAgent) || /android/i.test(navigator.userAgent)
+      return isMobile ? deviceConnection.UNKNOWN : deviceConnection.FIXED
+  }
+};
+
 function mapMediaType(seedtagMediaType) {
   if (seedtagMediaType === 'display') return BANNER;
   if (seedtagMediaType === 'video') return VIDEO;
   else return seedtagMediaType;
 }
 
-function getMediaTypeFromBid(bid) {
-  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0]
+function hasVideoMediaType(bid) {
+  return (!!bid.mediaTypes && !!bid.mediaTypes.video) || (!!bid.params && !!bid.params.video)
 }
 
 function hasMandatoryParams(params) {
@@ -27,57 +54,68 @@ function hasMandatoryParams(params) {
     !!params.publisherId &&
     !!params.adUnitId &&
     !!params.placement &&
-    (params.placement === 'inImage' ||
-      params.placement === 'inScreen' ||
-      params.placement === 'banner' ||
-      params.placement === 'video')
+    !!ALLOWED_PLACEMENTS[params.placement]
   );
 }
 
-function hasVideoMandatoryParams(mediaTypes) {
-  const isVideoInStream =
-    !!mediaTypes.video && mediaTypes.video.context === 'instream';
-  const isPlayerSize =
-    !!utils.deepAccess(mediaTypes, 'video.playerSize') &&
-    utils.isArray(utils.deepAccess(mediaTypes, 'video.playerSize'));
-  return isVideoInStream && isPlayerSize;
-}
+function hasMandatoryVideoParams(bid) {
+  const videoParams = getVideoParams(bid)
 
-function buildBidRequests(validBidRequests) {
-  return utils._map(validBidRequests, function(validBidRequest) {
-    const params = validBidRequest.params;
-    const mediaTypes = utils._map(
-      Object.keys(validBidRequest.mediaTypes),
-      function(pbjsType) {
-        return mediaTypesMap[pbjsType];
-      }
-    );
-    const bidRequest = {
-      id: validBidRequest.bidId,
-      transactionId: validBidRequest.transactionId,
-      sizes: validBidRequest.sizes,
-      supplyTypes: mediaTypes,
-      adUnitId: params.adUnitId,
-      placement: params.placement
-    };
+  return hasVideoMediaType(bid) && !!videoParams.playerSize &&
+    utils.isArray(videoParams.playerSize) &&
+    videoParams.playerSize.length > 0;
+}
 
-    if (params.adPosition) {
-      bidRequest.adPosition = params.adPosition;
+function buildBidRequest(validBidRequest) {
+  const params = validBidRequest.params;
+  const mediaTypes = utils._map(
+    Object.keys(validBidRequest.mediaTypes),
+    function (pbjsType) {
+      return mediaTypesMap[pbjsType];
     }
+  );
 
-    if (params.video) {
-      bidRequest.videoParams = params.video || {};
-      bidRequest.videoParams.w =
-        validBidRequest.mediaTypes.video.playerSize[0][0];
-      bidRequest.videoParams.h =
-        validBidRequest.mediaTypes.video.playerSize[0][1];
-    }
+  const bidRequest = {
+    id: validBidRequest.bidId,
+    transactionId: validBidRequest.transactionId,
+    sizes: validBidRequest.sizes,
+    supplyTypes: mediaTypes,
+    adUnitId: params.adUnitId,
+    placement: params.placement,
+    requestCount: validBidRequest.bidderRequestsCount || 1 // FIXME : in unit test the parameter bidderRequestsCount is undefined
+  };
+
+  if (params.adPosition) {
+    bidRequest.adPosition = params.adPosition;
+  }
 
-    return bidRequest;
+  if (hasVideoMediaType(validBidRequest)) {
+    bidRequest.videoParams = getVideoParams(validBidRequest)
+  }
+
+  return bidRequest;
+}
+
+/**
+ * return video param (global or overrided per bidder)
+ */
+function getVideoParams(validBidRequest) {
+  const videoParams = validBidRequest.mediaTypes.video || {};
+  if (videoParams.playerSize) {
+    videoParams.w = videoParams.playerSize[0][0];
+    videoParams.h = videoParams.playerSize[0][1];
+  }
+
+  const bidderVideoParams = (validBidRequest.params && validBidRequest.params.video) || {}
+  // override video params from seedtag bidder params
+  Object.keys(bidderVideoParams).forEach(key => {
+    videoParams[key] = validBidRequest.params.video[key]
   })
+
+  return videoParams
 }
 
-function buildBid(seedtagBid) {
+function buildBidResponse(seedtagBid) {
   const mediaType = mapMediaType(seedtagBid.mediaType);
   const bid = {
     requestId: seedtagBid.bidId,
@@ -88,8 +126,13 @@ function buildBid(seedtagBid) {
     currency: seedtagBid.currency,
     netRevenue: true,
     mediaType: mediaType,
-    ttl: seedtagBid.ttl
+    ttl: seedtagBid.ttl,
+    nurl: seedtagBid.nurl,
+    meta: {
+      advertiserDomains: seedtagBid && seedtagBid.adomain && seedtagBid.adomain.length > 0 ? seedtagBid.adomain : []
+    }
   };
+
   if (mediaType === VIDEO) {
     bid.vastXml = seedtagBid.content;
   } else {
@@ -116,7 +159,6 @@ export const spec = {
   code: BIDDER_CODE,
   aliases: [SEEDTAG_ALIAS],
   supportedMediaTypes: [BANNER, VIDEO],
-
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -124,8 +166,8 @@ export const spec = {
    * @return boolean True if this is a valid bid, and false otherwise.
    */
   isBidRequestValid(bid) {
-    return getMediaTypeFromBid(bid) === VIDEO
-      ? hasMandatoryParams(bid.params) && hasVideoMandatoryParams(bid.mediaTypes)
+    return hasVideoMediaType(bid)
+      ? hasMandatoryParams(bid.params) && hasMandatoryVideoParams(bid)
       : hasMandatoryParams(bid.params);
   },
 
@@ -142,7 +184,8 @@ export const spec = {
       cmp: !!bidderRequest.gdprConsent,
       timeout: bidderRequest.timeout,
       version: '$prebid.version$',
-      bidRequests: buildBidRequests(validBidRequests)
+      connectionType: getConnectionType(),
+      bidRequests: utils._map(validBidRequests, buildBidRequest)
     };
 
     if (payload.cmp) {
@@ -169,7 +212,7 @@ export const spec = {
     const serverBody = serverResponse.body;
     if (serverBody && serverBody.bids && utils.isArray(serverBody.bids)) {
       return utils._map(serverBody.bids, function(bid) {
-        return buildBid(bid);
+        return buildBidResponse(bid);
       });
     } else {
       return [];
@@ -198,8 +241,18 @@ export const spec = {
    * @param {data} Containing timeout specific data
    */
   onTimeout(data) {
-    getTimeoutUrl(data);
-    utils.triggerPixel(SEEDTAG_SSP_ONTIMEOUT_ENDPOINT);
+    const url = getTimeoutUrl(data);
+    utils.triggerPixel(url);
+  },
+
+  /**
+   * Function to call when the adapter wins the auction
+   * @param {bid} Bid information received from the server
+   */
+  onBidWon: function (bid) {
+    if (bid && bid.nurl) {
+      utils.triggerPixel(bid.nurl);
+    }
   }
 }
 registerBidder(spec);
diff --git a/modules/seedtagBidAdapter.md b/modules/seedtagBidAdapter.md
index 627ff8333ad..f4249fb2e89 100644
--- a/modules/seedtagBidAdapter.md
+++ b/modules/seedtagBidAdapter.md
@@ -46,7 +46,19 @@ var adUnits = [{
   mediaTypes: {
     video: {
       context: 'instream',   // required
-      playerSize: [600, 300] // required
+      playerSize: [600, 300], // required
+      mimes: ['video/mp4'], // recommended
+      minduration: 5,       // optional
+      maxduration: 60,      // optional
+      boxingallowed: 1,     // optional
+      skip: 1,              // optional
+      startdelay: 1,        // optional
+      linearity: 1,         // optional
+      battr: [1, 2],        // optional
+      maxbitrate: 10,       // optional
+      playbackmethod: [1],  // optional
+      delivery: [1],        // optional
+      placement: 1,         // optional
     }
   },
   bids: [
@@ -57,9 +69,10 @@ var adUnits = [{
         adUnitId: '0000',               // required
         placement: 'video',             // required
         adPosition: 0,                  // optional
-        // Video object as specified in OpenRTB 2.5
-        video: {
-          mimes: ['video/mp4'], // recommended
+        video: { // optional
+          context: 'instream',   // optional
+          playerSize: [600, 300], // optional
+          mimes: ['video/mp4'], // optional
           minduration: 5,       // optional
           maxduration: 60,      // optional
           boxingallowed: 1,     // optional
diff --git a/modules/serverbidBidAdapter.md b/modules/serverbidBidAdapter.md
deleted file mode 100644
index 87b51e665e2..00000000000
--- a/modules/serverbidBidAdapter.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Overview
-
-Module Name: Serverbid Bid Adapter
-
-Module Type: Bid Adapter
-
-Maintainer: jgrimes@serverbid.com, jswart@serverbid.com
-
-# Description
-
-Connects to Serverbid for receiving bids from configured demand sources.
-
-# Test Parameters
-```javascript
-    var adUnits = [
-        {
-            code: 'test-ad-1',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: 'serverbid',
-                    params: {
-                        networkId: '9969',
-                        siteId: '980639'
-                    }
-                }
-            ]
-        },
-        {
-            code: 'test-ad-2',
-            sizes: [[300, 250]],
-            bids: [
-                {
-                    bidder: 'serverbid',
-                    params: {
-                        networkId: '9969',
-                        siteId: '980639',
-                        zoneIds: [178503]
-                    }
-                }
-            ]
-        }
-    ];
-```
diff --git a/modules/sharedIdSystem.js b/modules/sharedIdSystem.js
index 5c2a3df0595..defa8d22639 100644
--- a/modules/sharedIdSystem.js
+++ b/modules/sharedIdSystem.js
@@ -8,6 +8,7 @@
 import * as utils from '../src/utils.js'
 import {ajax} from '../src/ajax.js';
 import {submodule} from '../src/hook.js';
+import { uspDataHandler, coppaDataHandler } from '../src/adapterManager.js';
 
 const MODULE_NAME = 'sharedId';
 const ID_SVC = 'https://id.sharedid.org/id';
@@ -21,6 +22,7 @@ const TIME_MAX = Math.pow(2, 48) - 1;
 const TIME_LEN = 10;
 const RANDOM_LEN = 16;
 const id = factory();
+const GVLID = 887;
 /**
  * Constructs cookie value
  * @param value
@@ -275,6 +277,26 @@ function detectPrng(root) {
   return () => Math.random();
 }
 
+/**
+ * Builds and returns the shared Id URL with attached consent data if applicable
+ * @param {Object} consentData
+ * @return {string}
+ */
+function sharedIdUrl(consentData) {
+  const usPrivacyString = uspDataHandler.getConsentData();
+  let sharedIdUrl = ID_SVC;
+  if (usPrivacyString) {
+    sharedIdUrl = `${ID_SVC}?us_privacy=${usPrivacyString}`;
+  }
+  if (!consentData || typeof consentData.gdprApplies !== 'boolean' || !consentData.gdprApplies) return sharedIdUrl;
+  if (usPrivacyString) {
+    sharedIdUrl = `${sharedIdUrl}&gdpr=1&gdpr_consent=${consentData.consentString}`
+    return sharedIdUrl;
+  }
+  sharedIdUrl = `${ID_SVC}?gdpr=1&gdpr_consent=${consentData.consentString}`;
+  return sharedIdUrl
+}
+
 /** @type {Submodule} */
 export const sharedIdSubmodule = {
   /**
@@ -283,6 +305,11 @@ export const sharedIdSubmodule = {
    */
   name: MODULE_NAME,
 
+  /**
+   * Vendor id of Prebid
+   * @type {Number}
+   */
+  gvlid: GVLID,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -296,24 +323,37 @@ export const sharedIdSubmodule = {
   /**
    * performs action to obtain id and return a value.
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData|undefined} consentData
    * @returns {sharedId}
    */
-  getId(configParams) {
+  getId(config, consentData) {
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      utils.logInfo('SharedId: IDs not provided for coppa requests, exiting SharedId');
+      return;
+    }
     const resp = function (callback) {
       utils.logInfo('SharedId: Sharedid doesnt exists, new cookie creation');
-      ajax(ID_SVC, idGenerationCallback(callback), undefined, {method: 'GET', withCredentials: true});
+      ajax(sharedIdUrl(consentData), idGenerationCallback(callback), undefined, {method: 'GET', withCredentials: true});
     };
     return {callback: resp};
   },
 
   /**
    * performs actions even if the id exists and returns a value
-   * @param configParams
+   * @param config
+   * @param consentData
    * @param storedId
    * @returns {{callback: *}}
    */
-  extendId(configParams, storedId) {
+  extendId(config, consentData, storedId) {
+    const coppa = coppaDataHandler.getCoppa();
+    if (coppa) {
+      utils.logInfo('SharedId: IDs not provided for coppa requests, exiting SharedId');
+      return;
+    }
+    const configParams = (config && config.params) || {};
     utils.logInfo('SharedId: Existing shared id ' + storedId.id);
     const resp = function (callback) {
       const needSync = isIdSynced(configParams, storedId);
@@ -322,7 +362,7 @@ export const sharedIdSubmodule = {
         const sharedIdPayload = {};
         sharedIdPayload.sharedId = storedId.id;
         const payloadString = JSON.stringify(sharedIdPayload);
-        ajax(ID_SVC, existingIdCallback(storedId, callback), payloadString, {method: 'POST', withCredentials: true});
+        ajax(sharedIdUrl(consentData), existingIdCallback(storedId, callback), payloadString, {method: 'POST', withCredentials: true});
       }
     };
     return {callback: resp};
diff --git a/modules/sharedIdSystem.md b/modules/sharedIdSystem.md
index acb076ed97f..a4541c16c49 100644
--- a/modules/sharedIdSystem.md
+++ b/modules/sharedIdSystem.md
@@ -13,7 +13,7 @@ ex: $ gulp build --modules=userId,sharedIdSystem
 Individual params may be set for the Shared ID User ID Submodule. 
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: 'sharedId',
             params: {
diff --git a/modules/sharethroughBidAdapter.js b/modules/sharethroughBidAdapter.js
index 0d183be05df..59cf2a3a035 100644
--- a/modules/sharethroughBidAdapter.js
+++ b/modules/sharethroughBidAdapter.js
@@ -1,7 +1,8 @@
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
+import { config } from '../src/config.js';
 
-const VERSION = '3.2.1';
+const VERSION = '3.4.0';
 const BIDDER_CODE = 'sharethrough';
 const STR_ENDPOINT = 'https://btlr.sharethrough.com/WYu2BXv1/v1';
 const DEFAULT_SIZE = [1, 1];
@@ -31,6 +32,8 @@ export const sharethroughAdapterSpec = {
         strVersion: VERSION
       };
 
+      Object.assign(query, handleUniversalIds(bidRequest));
+
       const nonHttp = sharethroughInternal.getProtocol().indexOf('http') < 0;
       query.secure = nonHttp || (sharethroughInternal.getProtocol().indexOf('https') > -1);
 
@@ -46,16 +49,25 @@ export const sharethroughAdapterSpec = {
         query.us_privacy = bidderRequest.uspConsent
       }
 
-      if (bidRequest.userId && bidRequest.userId.tdid) {
-        query.ttduid = bidRequest.userId.tdid;
+      if (config.getConfig('coppa') === true) {
+        query.coppa = true
       }
 
       if (bidRequest.schain) {
         query.schain = JSON.stringify(bidRequest.schain);
       }
 
-      if (bidRequest.bidfloor) {
-        query.bidfloor = parseFloat(bidRequest.bidfloor);
+      const floor = getFloor(bidRequest);
+      if (floor) {
+        query.bidfloor = floor;
+      }
+
+      if (bidRequest.params.badv) {
+        query.badv = bidRequest.params.badv;
+      }
+
+      if (bidRequest.params.bcat) {
+        query.bcat = bidRequest.params.bcat;
       }
 
       // Data that does not need to go to the server,
@@ -67,7 +79,7 @@ export const sharethroughAdapterSpec = {
       };
 
       return {
-        method: 'GET',
+        method: 'POST',
         url: STR_ENDPOINT,
         data: query,
         strData: strData
@@ -98,6 +110,7 @@ export const sharethroughAdapterSpec = {
       currency: 'USD',
       netRevenue: true,
       ttl: 360,
+      meta: { advertiserDomains: creative.creative && creative.creative.adomain ? creative.creative.adomain : [] },
       ad: generateAd(body, req)
     }];
   },
@@ -129,6 +142,36 @@ export const sharethroughAdapterSpec = {
   onSetTargeting: (bid) => {}
 };
 
+function handleUniversalIds(bidRequest) {
+  if (!bidRequest.userId) return {};
+
+  const universalIds = {};
+
+  const ttd = utils.deepAccess(bidRequest, 'userId.tdid');
+  if (ttd) universalIds.ttduid = ttd;
+
+  const pubc = utils.deepAccess(bidRequest, 'userId.pubcid') || utils.deepAccess(bidRequest, 'crumbs.pubcid');
+  if (pubc) universalIds.pubcid = pubc;
+
+  const idl = utils.deepAccess(bidRequest, 'userId.idl_env');
+  if (idl) universalIds.idluid = idl;
+
+  const id5 = utils.deepAccess(bidRequest, 'userId.id5id.uid');
+  if (id5) {
+    universalIds.id5uid = { id: id5 };
+    const id5link = utils.deepAccess(bidRequest, 'userId.id5id.ext.linkType');
+    if (id5link) universalIds.id5uid.linkType = id5link;
+  }
+
+  const lipb = utils.deepAccess(bidRequest, 'userId.lipb.lipbid');
+  if (lipb) universalIds.liuid = lipb;
+
+  const shd = utils.deepAccess(bidRequest, 'userId.sharedid');
+  if (shd) universalIds.shduid = shd; // object with keys: id & third
+
+  return universalIds;
+}
+
 function getLargestSize(sizes) {
   function area(size) {
     return size[0] * size[1];
@@ -250,4 +293,18 @@ function getProtocol() {
   return document.location.protocol;
 }
 
+function getFloor(bid) {
+  if (utils.isFn(bid.getFloor)) {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: 'banner',
+      size: bid.sizes.map(size => ({ w: size[0], h: size[1] }))
+    });
+    if (utils.isPlainObject(floorInfo) && !isNaN(floorInfo.floor) && floorInfo.currency === 'USD') {
+      return parseFloat(floorInfo.floor);
+    }
+  }
+  return null;
+}
+
 registerBidder(sharethroughAdapterSpec);
diff --git a/modules/sharethroughBidAdapter.md b/modules/sharethroughBidAdapter.md
index 2290e370cae..396b8164577 100644
--- a/modules/sharethroughBidAdapter.md
+++ b/modules/sharethroughBidAdapter.md
@@ -29,7 +29,13 @@ Module that connects to Sharethrough's demand sources
             // OPTIONAL - If iframeSize is provided, we'll use this size for the iframe
             // otherwise we'll grab the largest size from the sizes array
             // This is ignored if iframe: false
-            iframeSize: [250, 250]
+            iframeSize: [250, 250],
+
+            // OPTIONAL - Blocked Advertiser Domains
+            badv: ['domain1.com', 'domain2.com'],
+
+            // OPTIONAL - Blocked Categories (IAB codes)
+            bcat: ['IAB1-1', 'IAB1-2'],
           }
         }
       ]
diff --git a/modules/shinezBidAdapter.js b/modules/shinezBidAdapter.js
new file mode 100644
index 00000000000..d5734d23fdc
--- /dev/null
+++ b/modules/shinezBidAdapter.js
@@ -0,0 +1,83 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'shinez';
+const BIDDER_SHORT_CODE = 'shz';
+const ADAPTER_VERSION = '1.0.0';
+
+const TARGET_URL = 'https://shinez-ssp.shinez.workers.dev/prebid';
+
+export const spec = {
+  code: BIDDER_CODE,
+  version: ADAPTER_VERSION,
+  aliases: {
+    code: BIDDER_SHORT_CODE
+  },
+  supportedMediaTypes: [ BANNER ],
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildRequests,
+  interpretResponse: interpretResponse,
+};
+
+export const internal = {
+  TARGET_URL
+}
+
+function isBidRequestValid(bid) {
+  return !!(bid && bid.params &&
+    bid.params.placementId && typeof bid.params.placementId === 'string' &&
+    (bid.params.unit == null || (typeof bid.params.unit === 'string' && bid.params.unit.length > 0))
+  );
+}
+
+function buildRequests(validBidRequests, bidderRequest) {
+  const utcOffset = (new Date()).getTimezoneOffset();
+  const data = [];
+  validBidRequests.forEach(function(bidRequest) {
+    data.push(_buildServerBidRequest(bidRequest, bidderRequest, utcOffset));
+  });
+  const request = {
+    method: 'POST',
+    url: TARGET_URL,
+    data: data
+  };
+  return request;
+}
+
+function interpretResponse(serverResponse, request) {
+  const bids = [];
+  serverResponse.body.forEach(function(serverBid) {
+    bids.push(_convertServerBid(serverBid));
+  });
+  return bids;
+}
+
+function _buildServerBidRequest(bidRequest, bidderRequest, utcOffset) {
+  return {
+    bidId: bidRequest.bidId,
+    transactionId: bidRequest.transactionId,
+    crumbs: bidRequest.crumbs,
+    mediaTypes: bidRequest.mediaTypes,
+    refererInfo: bidderRequest.refererInfo,
+    placementId: bidRequest.params.placementId,
+    utcOffset: utcOffset,
+    adUnitCode: bidRequest.adUnitCode,
+    unit: bidRequest.params.unit
+  }
+}
+
+function _convertServerBid(response) {
+  return {
+    requestId: response.bidId,
+    cpm: response.cpm,
+    currency: response.currency,
+    width: response.width,
+    height: response.height,
+    ad: response.ad,
+    ttl: response.ttl,
+    creativeId: response.creativeId,
+    netRevenue: response.netRevenue
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/shinezBidAdapter.md b/modules/shinezBidAdapter.md
new file mode 100644
index 00000000000..e040cfbf36b
--- /dev/null
+++ b/modules/shinezBidAdapter.md
@@ -0,0 +1,33 @@
+# Overview
+
+```
+Module Name: Shinez Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer:  tech-team@shinez.io
+```
+
+# Description
+
+Connects to shinez.io demand sources.
+
+The Shinez adapter requires setup and approval from the Shinez team.
+Please reach out to tech-team@shinez.io for more information.
+ 
+# Test Parameters
+
+```javascript
+var adUnits = [{
+  code: "test-div",
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250]]
+    }
+  },
+  bids: [{
+    bidder: "shinez",
+    params: {
+      placementId: "00654321"
+    }
+  }]
+}];
+```
\ No newline at end of file
diff --git a/modules/sirdataRtdProvider.js b/modules/sirdataRtdProvider.js
new file mode 100644
index 00000000000..373468b2f14
--- /dev/null
+++ b/modules/sirdataRtdProvider.js
@@ -0,0 +1,402 @@
+/**
+ * This module adds Sirdata provider to the real time data module
+ * The {@link module:modules/realTimeData} module is required
+ * The module will fetch segments (user-centric) and categories (page-centric) from Sirdata server
+ * The module will automatically handle user's privacy and choice in California (IAB TL CCPA Framework) and in Europe (IAB EU TCF FOR GDPR)
+ * @module modules/sirdataRtdProvider
+ * @requires module:modules/realTimeData
+ */
+import {getGlobal} from '../src/prebidGlobal.js';
+import * as utils from '../src/utils.js';
+import {submodule} from '../src/hook.js';
+import {ajax} from '../src/ajax.js';
+import findIndex from 'core-js-pure/features/array/find-index.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import { config } from '../src/config.js';
+
+/** @type {string} */
+const MODULE_NAME = 'realTimeData';
+const SUBMODULE_NAME = 'SirdataRTDModule';
+
+export function getSegmentsAndCategories(reqBidsConfigObj, onDone, moduleConfig, userConsent) {
+  const adUnits = reqBidsConfigObj.adUnits || getGlobal().adUnits;
+  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 (getGlobal().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;
+  }
+
+  // default global endpoint is cookie-based if no rules falls into cookieless or consent has been given or GDPR doesn't apply
+  if (!sirdataDomain || !gdprApplies || (utils.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;
+  }
+
+  var actualUrl = moduleConfig.params.actualUrl || getRefererInfo().referer;
+
+  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=' + actualUrl : '');
+  ajax(url, {
+    success: function (response, req) {
+      if (req.status === 200) {
+        try {
+          const data = JSON.parse(response);
+          if (data && data.segments) {
+            addSegmentData(adUnits, data, moduleConfig, onDone);
+          } else {
+            onDone();
+          }
+        } catch (e) {
+          onDone();
+          utils.logError('unable to parse Sirdata data' + e);
+        }
+      } else if (req.status === 204) {
+        onDone();
+      }
+    },
+    error: function () {
+      onDone();
+      utils.logError('unable to get Sirdata data');
+    }
+  },
+  null,
+  {
+    contentType: 'text/plain',
+    method: 'GET',
+    withCredentials: sendWithCredentials,
+    referrerPolicy: 'unsafe-url',
+    crossOrigin: true
+  });
+}
+
+export function setGlobalOrtb2(segments, categories) {
+  try {
+    let addOrtb2 = {};
+    let testGlobal = getGlobal().getConfig('ortb2') || {};
+    if (!utils.deepAccess(testGlobal, 'user.ext.data.sd_rtd') || !utils.deepEqual(testGlobal.user.ext.data.sd_rtd, segments)) {
+      utils.deepSetValue(addOrtb2, 'user.ext.data.sd_rtd', segments || {});
+    }
+    if (!utils.deepAccess(testGlobal, 'site.ext.data.sd_rtd') || !utils.deepEqual(testGlobal.site.ext.data.sd_rtd, categories)) {
+      utils.deepSetValue(addOrtb2, 'site.ext.data.sd_rtd', categories || {});
+    }
+    if (!utils.isEmpty(addOrtb2)) {
+      let ortb2 = {ortb2: utils.mergeDeep({}, testGlobal, addOrtb2)};
+      getGlobal().setConfig(ortb2);
+    }
+  } catch (e) {
+    utils.logError(e)
+  }
+
+  return true;
+}
+
+export function setBidderOrtb2(bidder, segments, categories) {
+  try {
+    let addOrtb2 = {};
+    let testBidder = utils.deepAccess(config.getBidderConfig(), bidder + '.ortb2') || {};
+    if (!utils.deepAccess(testBidder, 'user.ext.data.sd_rtd') || !utils.deepEqual(testBidder.user.ext.data.sd_rtd, segments)) {
+      utils.deepSetValue(addOrtb2, 'user.ext.data.sd_rtd', segments || {});
+    }
+    if (!utils.deepAccess(testBidder, 'site.ext.data.sd_rtd') || !utils.deepEqual(testBidder.site.ext.data.sd_rtd, categories)) {
+      utils.deepSetValue(addOrtb2, 'site.ext.data.sd_rtd', categories || {});
+    }
+    if (!utils.isEmpty(addOrtb2)) {
+      let ortb2 = {ortb2: utils.mergeDeep({}, testBidder, addOrtb2)};
+      getGlobal().setBidderConfig({ bidders: [bidder], config: ortb2 });
+    }
+  } catch (e) {
+    utils.logError(e)
+  }
+
+  return true;
+}
+
+export function loadCustomFunction (todo, adUnit, list, data, bid) {
+  try {
+    if (typeof todo == 'function') {
+      todo(adUnit, list, data, bid);
+    }
+  } catch (e) { utils.logError(e); }
+  return true;
+}
+
+export function getSegAndCatsArray(data, minScore) {
+  var sirdataData = {'segments': [], 'categories': []};
+  minScore = minScore && typeof minScore == 'number' ? minScore : 30;
+  try {
+    if (data && data.contextual_categories) {
+      for (let catId in data.contextual_categories) {
+        let value = data.contextual_categories[catId];
+        if (value >= minScore && sirdataData.categories.indexOf(catId) === -1) {
+          sirdataData.categories.push(catId.toString());
+        }
+      }
+    }
+  } catch (e) { utils.logError(e); }
+  try {
+    if (data && data.segments) {
+      for (let segId in data.segments) {
+        sirdataData.segments.push(data.segments[segId].toString());
+      }
+    }
+  } catch (e) { utils.logError(e); }
+  return sirdataData;
+}
+
+export function addSegmentData(adUnits, data, moduleConfig, onDone) {
+  moduleConfig = moduleConfig || {};
+  moduleConfig.params = moduleConfig.params || {};
+  const globalMinScore = moduleConfig.params.hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.contextualMinRelevancyScore : 30;
+  var sirdataData = getSegAndCatsArray(data, globalMinScore);
+
+  if (!sirdataData || (sirdataData.segments.length < 1 && sirdataData.categories.length < 1)) { utils.logError('no cats'); onDone(); return adUnits; }
+
+  const sirdataList = sirdataData.segments.concat(sirdataData.categories);
+
+  var curationData = {'segments': [], 'categories': []};
+  var curationId = '1';
+  const biddersParamsExist = (!!(moduleConfig.params && moduleConfig.params.bidders));
+
+  // Global ortb2
+  if (!biddersParamsExist) {
+    setGlobalOrtb2(sirdataData.segments, sirdataData.categories);
+  }
+
+  // Google targeting
+  if (typeof window.googletag !== 'undefined' && (moduleConfig.params.setGptKeyValues || !moduleConfig.params.hasOwnProperty('setGptKeyValues'))) {
+    try {
+      // For curation Google is pid 27449
+      curationId = (moduleConfig.params.gptCurationId ? moduleConfig.params.gptCurationId : '27449');
+      if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+        curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], globalMinScore);
+      }
+      window.googletag.pubads().getSlots().forEach(function(n) {
+        if (typeof n.setTargeting !== 'undefined') {
+          n.setTargeting('sd_rtd', sirdataList.concat(curationData.segments).concat(curationData.categories));
+        }
+      })
+    } catch (e) { utils.logError(e); }
+  }
+
+  // Bid targeting level for FPD non-generic biders
+  var bidderIndex = '';
+  var indexFound = false;
+
+  adUnits.forEach(adUnit => {
+    if (!biddersParamsExist && !utils.deepAccess(adUnit, 'ortb2Imp.ext.data.sd_rtd')) {
+      utils.deepSetValue(adUnit, 'ortb2Imp.ext.data.sd_rtd', sirdataList);
+    }
+
+    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));
+      try {
+        curationData = {'segments': [], 'categories': []};
+        let minScore = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('contextualMinRelevancyScore') ? moduleConfig.params.bidders[bidderIndex].contextualMinRelevancyScore : globalMinScore)
+
+        if (!biddersParamsExist || (indexFound && (!moduleConfig.params.bidders[bidderIndex].hasOwnProperty('adUnitCodes') || moduleConfig.params.bidders[bidderIndex].adUnitCodes.indexOf(adUnit.code) !== -1))) {
+          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':
+              // For curation Xandr is pid 27446
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27446');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                utils.deepSetValue(bid, 'params.keywords.sd_rtd', sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            case 'smartadserver':
+            case 'smart':
+              var target = [];
+              if (bid.hasOwnProperty('params') && bid.params.hasOwnProperty('target')) {
+                target.push(bid.params.target);
+              }
+              // For curation Smart is pid 27440
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27440');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                sirdataList.concat(curationData.segments).concat(curationData.categories).forEach(function(entry) {
+                  if (target.indexOf('sd_rtd=' + entry) === -1) {
+                    target.push('sd_rtd=' + entry);
+                  }
+                });
+                utils.deepSetValue(bid, 'params.target', target.join(';'));
+              }
+              break;
+
+            case 'rubicon':
+              // For curation Magnite is pid 27518
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27452');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                setBidderOrtb2(bid.bidder, data.segments.concat(curationData.segments), sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            case 'ix':
+              var ixConfig = getGlobal().getConfig('ix.firstPartyData.sd_rtd');
+              if (!ixConfig) {
+                // For curation index is pid 27248
+                curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27248');
+                if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                  curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+                }
+                if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                  loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+                } else {
+                  var cappIxCategories = [];
+                  var ixLength = 0;
+                  var ixLimit = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('sizeLimit') ? moduleConfig.params.bidders[bidderIndex].sizeLimit : 1000);
+                  // Push ids For publisher use and for curation if exists but limit size because the bidder uses GET parameters
+                  sirdataList.concat(curationData.segments).concat(curationData.categories).forEach(function(entry) {
+                    if (ixLength < ixLimit) {
+                      cappIxCategories.push(entry);
+                      ixLength += entry.toString().length;
+                    }
+                  });
+                  getGlobal().setConfig({ix: {firstPartyData: {sd_rtd: cappIxCategories}}});
+                }
+              }
+              break;
+
+            case 'proxistore':
+              // For curation Proxistore is pid 27484
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27484');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              } else {
+                data.shared_taxonomy[curationId] = {contextual_categories: {}};
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                utils.deepSetValue(bid, 'ortb2.user.ext.data', {segments: sirdataData.segments.concat(curationData.segments), contextual_categories: {...data.contextual_categories, ...data.shared_taxonomy[curationId].contextual_categories}});
+              }
+              break;
+
+            case 'criteo':
+              // For curation Smart is pid 27443
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27443');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                setBidderOrtb2(bid.bidder, sirdataList.concat(curationData.segments).concat(curationData.categories), sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            case 'triplelift':
+              // For curation Triplelift is pid 27518
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27518');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                setBidderOrtb2(bid.bidder, data.segments.concat(curationData.segments), sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            case 'avct':
+            case 'avocet':
+              // For curation Avocet is pid 27522
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27522');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                setBidderOrtb2(bid.bidder, data.segments.concat(curationData.segments), sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            case 'smaato':
+              // For curation Smaato is pid 27520
+              curationId = (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('curationId') ? moduleConfig.params.bidders[bidderIndex].curationId : '27520');
+              if (data.shared_taxonomy && data.shared_taxonomy[curationId]) {
+                curationData = getSegAndCatsArray(data.shared_taxonomy[curationId], minScore);
+              }
+              if (indexFound && moduleConfig.params.bidders[bidderIndex].hasOwnProperty('customFunction')) {
+                loadCustomFunction(moduleConfig.params.bidders[bidderIndex].customFunction, adUnit, sirdataList.concat(curationData.segments).concat(curationData.categories), data, bid);
+              } else {
+                setBidderOrtb2(bid.bidder, data.segments.concat(curationData.segments), sirdataList.concat(curationData.segments).concat(curationData.categories));
+              }
+              break;
+
+            default:
+              if (!biddersParamsExist || indexFound) {
+                if (!utils.deepAccess(bid, 'ortb2.site.ext.data.sd_rtd')) {
+                  utils.deepSetValue(bid, 'ortb2.site.ext.data.sd_rtd', sirdataData.categories);
+                }
+                if (!utils.deepAccess(bid, 'ortb2.user.ext.data.sd_rtd')) {
+                  utils.deepSetValue(bid, 'ortb2.user.ext.data.sd_rtd', sirdataData.segments);
+                }
+              }
+          }
+        }
+      } catch (e) { utils.logError(e) }
+    })
+  });
+
+  onDone();
+  return adUnits;
+}
+
+export function init(config) {
+  return true;
+}
+
+export const sirdataSubmodule = {
+  name: SUBMODULE_NAME,
+  init: init,
+  getBidRequestData: getSegmentsAndCategories
+};
+
+submodule(MODULE_NAME, sirdataSubmodule);
diff --git a/modules/sirdataRtdProvider.md b/modules/sirdataRtdProvider.md
new file mode 100644
index 00000000000..f67e34db43a
--- /dev/null
+++ b/modules/sirdataRtdProvider.md
@@ -0,0 +1,169 @@
+# Sirdata Real-Time Data Submodule
+
+Module Name: Sirdata Rtd Provider
+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! 
+
+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.
+
+Automatic integration with Google Ad Manager and major bidders like Xandr/Appnexus,
+Smartadserver, Index Exchange, Proxistore, Magnite/Rubicon or Triplelift !
+
+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.
+
+### Publisher Usage
+
+Compile the Sirdata RTD module into your Prebid build:
+
+`gulp build --modules=rtdModule,sirdataRtdProvider`
+
+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. 
+
+```
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "SirdataRTDModule",
+                waitForIt: true,
+                params: {
+                	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)
+                    }]
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### 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 |
+
+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 |
+
+
+### 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.
+
+data Object format for usage in this kind of function :
+{
+	"segments":[111111,222222],
+	"contextual_categories":{"333333":100},
+	"shared_taxonomy":{
+		"27446":{ //CurationId
+			"segments":[444444,555555],
+			"contextual_categories":{"666666":100}
+		}
+	}
+}
+
+```
+function overrideAppnexus (adUnit, segmentsArray, dataObject, bid) {
+	for (var i = 0; i < segmentsArray.length; i++) {
+        if (segmentsArray[i]) {
+            bid.params.user.segments.push(segmentsArray[i]);
+        }
+    }
+}
+
+pbjs.setConfig(
+    ...
+    realTimeData: {
+        auctionDelay: 1000,
+        dataProviders: [
+            {
+                name: "SirdataRTDModule",
+                waitForIt: true,
+                params: {
+                	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
+                    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);
+                        },
+                    }]
+                }
+            }
+        ]
+    }
+    ...
+}
+```
+
+### Testing
+
+To view an example of available segments returned by Sirdata's backends:
+
+`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
diff --git a/modules/sizeMappingV2.js b/modules/sizeMappingV2.js
index 20ab640990b..ffd242e57ac 100644
--- a/modules/sizeMappingV2.js
+++ b/modules/sizeMappingV2.js
@@ -1,6 +1,7 @@
 /**
- * This modules adds support for the new Size Mapping spec described here. https://github.com/prebid/Prebid.js/issues/4129
- * This implementation replaces global sizeConfig with a adUnit/bidder level sizeConfig with support for labels.
+ * This module adds support for the new size mapping spec, Advanced Size Mapping. It's documented here. https://github.com/prebid/Prebid.js/issues/4129
+ * The implementation is an alternative to global sizeConfig. It introduces 'Ad Unit' & 'Bidder' level sizeConfigs and also supports 'labels' for conditional
+ * rendering. Read full API documentation on Prebid.org, http://prebid.org/dev-docs/modules/sizeMappingV2.html
  */
 
 import * as utils from '../src/utils.js';
@@ -8,11 +9,9 @@ import { processNativeAdUnitParams } from '../src/native.js';
 import { adunitCounter } from '../src/adUnits.js';
 import includes from 'core-js-pure/features/array/includes.js';
 import { getHook } from '../src/hook.js';
-import {
-  adUnitSetupChecks
-} from '../src/prebid.js';
+import { adUnitSetupChecks } from '../src/prebid.js';
 
-// allows for sinon.spy, sinon.stub, etc to unit test calls made to these functions internally
+// Allows for stubbing of these functions while writing unit tests.
 export const internal = {
   checkBidderSizeConfigFormat,
   getActiveSizeBucket,
@@ -22,9 +21,12 @@ export const internal = {
   isLabelActivated
 };
 
-// 'sizeMappingInternalStore' contains information whether a particular auction is using size mapping V2 (the new size mapping spec),
-// and it also contains additional information on each adUnit, as such, mediaTypes, activeViewport, etc.
-// This information is required by the 'getBids' function.
+/*
+  'sizeMappingInternalStore' contains information on, whether a particular auction is using size mapping V2 (the new size mapping spec),
+  and it also contains additional information on each adUnit, such as, mediaTypes, activeViewport, etc. This information is required by
+  the 'getBids' function.
+*/
+
 export const sizeMappingInternalStore = createSizeMappingInternalStore();
 
 function createSizeMappingInternalStore() {
@@ -46,8 +48,10 @@ function createSizeMappingInternalStore() {
   }
 }
 
-// returns "true" if atleast one of the adUnit in the adUnits array has declared a Ad Unit or(and) Bidder level sizeConfig
-// returns "false" otherwise
+/*
+  Returns "true" if at least one of the adUnits in the adUnits array is using an Ad Unit and/or Bidder level sizeConfig,
+  otherwise, returns "false."
+*/
 export function isUsingNewSizeMapping(adUnits) {
   let isUsingSizeMappingBool = false;
   adUnits.forEach(adUnit => {
@@ -62,7 +66,7 @@ export function isUsingNewSizeMapping(adUnits) {
       });
 
       // checks for the presence of sizeConfig property at the adUnit.bids[].bidder object
-      adUnit.bids.forEach(bidder => {
+      adUnit.bids && utils.isArray(adUnit.bids) && adUnit.bids.forEach(bidder => {
         if (bidder.sizeConfig) {
           if (isUsingSizeMappingBool === false) {
             isUsingSizeMappingBool = true;
@@ -74,136 +78,179 @@ export function isUsingNewSizeMapping(adUnits) {
   return isUsingSizeMappingBool;
 }
 
-// returns "adUnits" array which have passed sizeConfig validation checks in addition to mediaTypes checks
-// deletes properties from adUnit which fail validation.
+/**
+  This hooked function executes before the function 'checkAdUnitSetup', that is defined in /src/prebid.js. It's necessary to run this funtion before
+  because it applies a series of checks in order to determine the correctness of the 'sizeConfig' array, which, the original 'checkAdUnitSetup' function
+  does not recognize.
+  @params {Array} adUnits
+  @returns {Array} validateAdUnits - Unrecognized properties are deleted.
+*/
 export function checkAdUnitSetupHook(adUnits) {
-  return adUnits.filter(adUnit => {
+  const validateSizeConfig = function (mediaType, sizeConfig, adUnitCode) {
+    let isValid = true;
+    const associatedProperty = {
+      banner: 'sizes',
+      video: 'playerSize',
+      native: 'active'
+    }
+    const propertyName = associatedProperty[mediaType];
+    const conditionalLogMessages = {
+      banner: 'Removing mediaTypes.banner from ad unit.',
+      video: 'Removing mediaTypes.video.sizeConfig from ad unit.',
+      native: 'Removing mediaTypes.native.sizeConfig from ad unit.'
+    }
+    if (Array.isArray(sizeConfig)) {
+      sizeConfig.forEach((config, index) => {
+        const keys = Object.keys(config);
+        /*
+          Check #1 (Applies to 'banner', 'video' and 'native' media types.)
+          Verify that all config objects include 'minViewPort' and 'sizes' property.
+          If they do not, return 'false'.
+        */
+        if (!(includes(keys, 'minViewPort') && includes(keys, propertyName))) {
+          utils.logError(`Ad unit ${adUnitCode}: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+          isValid = false;
+          return;
+        }
+        /*
+          Check #2 (Applies to 'banner', 'video' and 'native' media types.)
+          Verify that 'config.minViewPort' property is in [width, height] format.
+          If not, return false.
+        */
+        if (!utils.isArrayOfNums(config.minViewPort, 2)) {
+          utils.logError(`Ad unit ${adUnitCode}: Invalid declaration of 'minViewPort' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+          isValid = false
+          return;
+        }
+        /*
+          Check #3 (Applies only to 'banner' and 'video' media types.)
+          Verify that 'config.sizes' (in case of banner) or 'config.playerSize' (in case of video)
+          property is in [width, height] format. If not, return 'false'.
+        */
+        if (mediaType === 'banner' || mediaType === 'video') {
+          let showError = false;
+          if (Array.isArray(config[propertyName])) {
+            const validatedSizes = adUnitSetupChecks.validateSizes(config[propertyName]);
+            if (config[propertyName].length > 0 && validatedSizes.length === 0) {
+              isValid = false;
+              showError = true;
+            }
+          } else {
+            // Either 'sizes' or 'playerSize' is not declared as an array, which makes it invalid by default.
+            isValid = false;
+            showError = true;
+          }
+          if (showError) {
+            utils.logError(`Ad unit ${adUnitCode}: Invalid declaration of '${propertyName}' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+            return;
+          }
+        }
+        /*
+          Check #4 (Applies only to 'native' media type)
+          Verify that 'config.active' is a 'boolean'.
+          If not, return 'false'.
+        */
+        if (mediaType === 'native') {
+          if (typeof config[propertyName] !== 'boolean') {
+            utils.logError(`Ad unit ${adUnitCode}: Invalid declaration of 'active' in 'mediaTypes.${mediaType}.sizeConfig[${index}]'. ${conditionalLogMessages[mediaType]}`);
+            isValid = false;
+          }
+        }
+      });
+    } else {
+      utils.logError(`Ad unit ${adUnitCode}: Invalid declaration of 'sizeConfig' in 'mediaTypes.${mediaType}.sizeConfig'. ${conditionalLogMessages[mediaType]}`);
+      isValid = false;
+      return isValid;
+    }
+
+    // If all checks have passed, isValid should equal 'true'
+    return isValid;
+  }
+  const validatedAdUnits = [];
+  adUnits.forEach(adUnit => {
+    const bids = adUnit.bids;
     const mediaTypes = adUnit.mediaTypes;
+    let validatedBanner, validatedVideo, validatedNative;
+
+    if (!bids || !utils.isArray(bids)) {
+      utils.logError(`Detected adUnit.code '${adUnit.code}' did not have 'adUnit.bids' defined or 'adUnit.bids' is not an array. Removing adUnit from auction.`);
+      return;
+    }
+
     if (!mediaTypes || Object.keys(mediaTypes).length === 0) {
       utils.logError(`Detected adUnit.code '${adUnit.code}' did not have a 'mediaTypes' object defined. This is a required field for the auction, so this adUnit has been removed.`);
-      return false;
+      return;
     }
-
     if (mediaTypes.banner) {
-      const banner = mediaTypes.banner;
-      if (banner.sizes) {
-        adUnitSetupChecks.validateBannerMediaType(adUnit);
-      } else if (banner.sizeConfig) {
-        if (Array.isArray(banner.sizeConfig)) {
-          let deleteBannerMediaType = false;
-          banner.sizeConfig.forEach((config, index) => {
-            // verify if all config objects include "minViewPort" and "sizes" property.
-            // if not, remove the mediaTypes.banner object
-            const keys = Object.keys(config);
-            if (!(includes(keys, 'minViewPort') && includes(keys, 'sizes'))) {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] is missing required property minViewPort or sizes or both.`);
-              deleteBannerMediaType = true;
-              return;
-            }
-
-            // check if the config.sizes property is in [w, h] format, if yes, change it to [[w, h]] format.
-            const bannerSizes = adUnitSetupChecks.validateSizes(config.sizes);
-            if (utils.isArrayOfNums(config.minViewPort, 2)) {
-              if (config.sizes.length > 0 && bannerSizes.length > 0) {
-                config.sizes = bannerSizes;
-              } else if (config.sizes.length === 0) {
-                // If a size bucket doesn't have any sizes, sizes is an empty array, i.e. sizes: []. This check takes care of that.
-                config.sizes = [config.sizes];
-              } else {
-                utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] has propery sizes declared with invalid value. Please ensure the sizes are listed like: [[300, 250], ...] or like: [] if no sizes are present for that size bucket.`);
-                deleteBannerMediaType = true;
-              }
-            } else {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig[${index}] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
-              deleteBannerMediaType = true;
+      if (mediaTypes.banner.sizes) {
+        // Ad unit is using 'mediaTypes.banner.sizes' instead of the new property 'sizeConfig'. Apply the old checks!
+        validatedBanner = adUnitSetupChecks.validateBannerMediaType(adUnit);
+      } else if (mediaTypes.banner.sizeConfig) {
+        // Ad unit is using the 'sizeConfig' property, 'mediaTypes.banner.sizeConfig'. Apply the new checks!
+        validatedBanner = utils.deepClone(adUnit);
+        const isBannerValid = validateSizeConfig('banner', mediaTypes.banner.sizeConfig, adUnit.code);
+        if (!isBannerValid) {
+          delete validatedBanner.mediaTypes.banner;
+        } else {
+          /*
+            Make sure 'sizes' field is always an array of arrays. If not, make it so.
+            For example, [] becomes [[]], and [360, 400] becomes [[360, 400]]
+          */
+          validatedBanner.mediaTypes.banner.sizeConfig.forEach(config => {
+            if (!Array.isArray(config.sizes[0])) {
+              config.sizes = [config.sizes];
             }
           });
-          if (deleteBannerMediaType) {
-            utils.logInfo(`Ad Unit: ${adUnit.code}: mediaTypes.banner has been removed due to error in sizeConfig.`);
-            delete adUnit.mediaTypes.banner;
-          }
-        } else {
-          utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.banner.sizeConfig is NOT an Array. Removing the invalid object mediaTypes.banner from Ad Unit.`);
-          delete adUnit.mediaTypes.banner;
         }
       } else {
-        utils.logError('Detected a mediaTypes.banner object did not include required property sizes or sizeConfig. Removing invalid mediaTypes.banner object from Ad Unit.');
-        delete adUnit.mediaTypes.banner;
+        // Ad unit is invalid since it's mediaType property does not have either 'sizes' or 'sizeConfig' declared.
+        utils.logError(`Ad unit ${adUnit.code}: 'mediaTypes.banner' does not contain either 'sizes' or 'sizeConfig' property. Removing 'mediaTypes.banner' from ad unit.`);
+        validatedBanner = utils.deepClone(adUnit);
+        delete validatedBanner.mediaTypes.banner;
       }
     }
 
     if (mediaTypes.video) {
-      const video = mediaTypes.video;
-      if (video.playerSize) {
-        adUnitSetupChecks.validateVideoMediaType(adUnit);
-      } else if (video.sizeConfig) {
-        if (Array.isArray(video.sizeConfig)) {
-          let deleteVideoMediaType = false;
-          video.sizeConfig.forEach((config, index) => {
-            // verify if all config objects include "minViewPort" and "playerSize" property.
-            // if not, remove the mediaTypes.video object
-            const keys = Object.keys(config);
-            if (!(includes(keys, 'minViewPort') && includes(keys, 'playerSize'))) {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] is missing required property minViewPort or playerSize or both. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
-              deleteVideoMediaType = true;
-              return;
-            }
-            // check if the config.playerSize property is in [w, h] format, if yes, change it to [[w, h]] format.
-            let tarPlayerSizeLen = (typeof config.playerSize[0] === 'number') ? 2 : 1;
-            const videoSizes = adUnitSetupChecks.validateSizes(config.playerSize, tarPlayerSizeLen);
-            if (utils.isArrayOfNums(config.minViewPort, 2)) {
-              if (tarPlayerSizeLen === 2) {
-                utils.logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
-              }
-              if (config.playerSize.length > 0 && videoSizes.length > 0) {
-                config.playerSize = videoSizes;
-              } else if (config.playerSize.length === 0) {
-                // If a size bucket doesn't have any playerSize, playerSize is an empty array, i.e. playerSize: []. This check takes care of that.
-                config.playerSize = [config.playerSize];
-              } else {
-                utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] has propery playerSize declared with invalid value. Please ensure the playerSize is listed like: [640, 480] or like: [] if no playerSize is present for that size bucket.`);
-                deleteVideoMediaType = true;
-              }
-            } else {
-              utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig[${index}] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
-              deleteVideoMediaType = true;
+      if (mediaTypes.video.playerSize) {
+        // Ad unit is using 'mediaTypes.video.playerSize' instead of the new property 'sizeConfig'. Apply the old checks!
+        validatedVideo = validatedBanner ? adUnitSetupChecks.validateVideoMediaType(validatedBanner) : adUnitSetupChecks.validateVideoMediaType(adUnit);
+      } else if (mediaTypes.video.sizeConfig) {
+        // Ad unit is using the 'sizeConfig' property, 'mediaTypes.video.sizeConfig'. Apply the new checks!
+        validatedVideo = validatedBanner || utils.deepClone(adUnit);
+        const isVideoValid = validateSizeConfig('video', mediaTypes.video.sizeConfig, adUnit.code);
+        if (!isVideoValid) {
+          delete validatedVideo.mediaTypes.video.sizeConfig;
+        } else {
+          /*
+            Make sure 'playerSize' field is always an array of arrays. If not, make it so.
+            For example, [] becomes [[]], and [640, 400] becomes [[640, 400]]
+          */
+          validatedVideo.mediaTypes.video.sizeConfig.forEach(config => {
+            if (!Array.isArray(config.playerSize[0])) {
+              config.playerSize = [config.playerSize];
             }
           });
-          if (deleteVideoMediaType) {
-            utils.logInfo(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig has been removed due to error in sizeConfig.`);
-            delete adUnit.mediaTypes.video.sizeConfig;
-          }
-        } else {
-          utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.video.sizeConfig is NOT an Array. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
-          return delete adUnit.mediaTypes.video.sizeConfig;
         }
       }
     }
 
     if (mediaTypes.native) {
-      const native = mediaTypes.native;
-      adUnitSetupChecks.validateNativeMediaType(adUnit);
+      // Apply the old native checks
+      validatedNative = validatedVideo ? adUnitSetupChecks.validateNativeMediaType(validatedVideo) : validatedBanner ? adUnitSetupChecks.validateNativeMediaType(validatedBanner) : adUnitSetupChecks.validateNativeMediaType(adUnit);
 
+      // Apply the new checks if 'mediaTypes.native.sizeConfig' detected
       if (mediaTypes.native.sizeConfig) {
-        native.sizeConfig.forEach(config => {
-          // verify if all config objects include "minViewPort" and "active" property.
-          // if not, remove the mediaTypes.native object
-          const keys = Object.keys(config);
-          if (!(includes(keys, 'minViewPort') && includes(keys, 'active'))) {
-            utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.native.sizeConfig is missing required property minViewPort or active or both. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
-            return delete adUnit.mediaTypes.native.sizeConfig;
-          }
-
-          if (!(utils.isArrayOfNums(config.minViewPort, 2) && typeof config.active === 'boolean')) {
-            utils.logError(`Ad Unit: ${adUnit.code}: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
-            return delete adUnit.mediaTypes.native.sizeConfig;
-          }
-        });
+        const isNativeValid = validateSizeConfig('native', mediaTypes.native.sizeConfig, adUnit.code);
+        if (!isNativeValid) {
+          delete validatedNative.mediaTypes.native.sizeConfig;
+        }
       }
     }
 
-    return true;
+    const validatedAdUnit = Object.assign({}, validatedBanner, validatedVideo, validatedNative);
+    validatedAdUnits.push(validatedAdUnit);
   });
+  return validatedAdUnits;
 }
 
 getHook('checkAdUnitSetup').before(function (fn, adUnits) {
diff --git a/modules/smaatoBidAdapter.js b/modules/smaatoBidAdapter.js
new file mode 100644
index 00000000000..719d78892ce
--- /dev/null
+++ b/modules/smaatoBidAdapter.js
@@ -0,0 +1,255 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { config } from '../src/config.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'smaato';
+const SMAATO_ENDPOINT = 'https://prebid.ad.smaato.net/oapi/prebid';
+const SMAATO_CLIENT = 'prebid_js_$prebid.version$_1.2'
+
+const buildOpenRtbBidRequest = (bidRequest, bidderRequest) => {
+  const request = {
+    id: bidderRequest.auctionId,
+    at: 1,
+    imp: [{
+      id: bidRequest.bidId,
+      tagid: utils.deepAccess(bidRequest, 'params.adspaceId')
+    }],
+    cur: ['USD'],
+    tmax: bidderRequest.timeout,
+    site: {
+      id: window.location.hostname,
+      publisher: {
+        id: utils.deepAccess(bidRequest, 'params.publisherId')
+      },
+      domain: window.location.hostname,
+      page: window.location.href,
+      ref: bidderRequest.refererInfo.referer
+    },
+    device: {
+      language: (navigator && navigator.language) ? navigator.language.split('-')[0] : '',
+      ua: navigator.userAgent,
+      dnt: utils.getDNT() ? 1 : 0,
+      h: screen.height,
+      w: screen.width
+    },
+    regs: {
+      coppa: config.getConfig('coppa') === true ? 1 : 0,
+      ext: {}
+    },
+    user: {
+      ext: {}
+    },
+    ext: {
+      client: SMAATO_CLIENT
+    }
+  };
+
+  if (utils.deepAccess(bidRequest, 'mediaTypes.banner')) {
+    const sizes = utils.getAdUnitSizes(bidRequest).map((size) => ({w: size[0], h: size[1]}));
+    request.imp[0].banner = {
+      w: sizes[0].w,
+      h: sizes[0].h,
+      format: sizes
+    }
+  }
+
+  const videoMediaType = utils.deepAccess(bidRequest, 'mediaTypes.video');
+  if (videoMediaType) {
+    request.imp[0].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
+    }
+  }
+
+  let ortb2 = config.getConfig('ortb2') || {};
+  Object.assign(request.user, ortb2.user);
+  Object.assign(request.site, ortb2.site);
+
+  if (bidderRequest.gdprConsent && bidderRequest.gdprConsent.gdprApplies === true) {
+    utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies ? 1 : 0);
+    utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString);
+  }
+
+  if (bidderRequest.uspConsent !== undefined) {
+    utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+  }
+
+  if (utils.deepAccess(bidRequest, 'params.app')) {
+    const geo = utils.deepAccess(bidRequest, 'params.app.geo');
+    utils.deepSetValue(request, 'device.geo', geo);
+    const ifa = utils.deepAccess(bidRequest, 'params.app.ifa')
+    utils.deepSetValue(request, 'device.ifa', ifa);
+  }
+
+  const eids = utils.deepAccess(bidRequest, 'userIdAsEids');
+  if (eids && eids.length) {
+    utils.deepSetValue(request, 'user.ext.eids', eids);
+  }
+
+  return request
+}
+
+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: (bid) => {
+    return typeof bid.params === 'object' &&
+      typeof bid.params.publisherId === 'string' &&
+      typeof bid.params.adspaceId === 'string';
+  },
+
+  buildRequests: (validBidRequests, bidderRequest) => {
+    utils.logInfo('[SMAATO] Client version:', SMAATO_CLIENT);
+
+    return validBidRequests.map((validBidRequest) => {
+      const openRtbBidRequest = buildOpenRtbBidRequest(validBidRequest, bidderRequest);
+      utils.logInfo('[SMAATO] OpenRTB Request:', openRtbBidRequest);
+
+      return {
+        method: 'POST',
+        url: validBidRequest.params.endpoint || SMAATO_ENDPOINT,
+        data: JSON.stringify(openRtbBidRequest),
+        options: {
+          withCredentials: true,
+          crossOrigin: true,
+        }
+      };
+    });
+  },
+  /**
+   * 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, bidRequest) => {
+    // response is empty (HTTP 204)
+    if (utils.isEmpty(serverResponse.body)) {
+      utils.logInfo('[SMAATO] Empty response body HTTP 204, no bids');
+      return []; // no bids
+    }
+
+    let serverResponseHeaders = serverResponse.headers;
+    const smtAdType = serverResponseHeaders.get('X-SMT-ADTYPE');
+
+    const smtExpires = serverResponseHeaders.get('X-SMT-Expires');
+    let ttlSec = 300;
+    utils.logInfo('[SMAATO] Expires:', smtExpires);
+    if (smtExpires) {
+      ttlSec = Math.floor((smtExpires - Date.now()) / 1000);
+    }
+
+    const res = serverResponse.body;
+    utils.logInfo('[SMAATO] OpenRTB Response:', res);
+
+    var bids = [];
+    res.seatbid.forEach(sb => {
+      sb.bid.forEach(b => {
+        let resultingBid = {
+          requestId: b.impid,
+          cpm: b.price || 0,
+          width: b.w,
+          height: b.h,
+          ttl: ttlSec,
+          creativeId: b.crid,
+          dealId: b.dealid || null,
+          netRevenue: utils.deepAccess(b, 'ext.net', true),
+          currency: res.cur,
+          meta: {
+            advertiserDomains: b.adomain,
+            networkName: b.bidderName,
+            agencyId: sb.seat
+          }
+        };
+
+        switch (smtAdType) {
+          case 'Img':
+            resultingBid.ad = createImgAd(b.adm);
+            resultingBid.meta.mediaType = BANNER;
+            bids.push(resultingBid);
+            break;
+          case 'Richmedia':
+            resultingBid.ad = createRichmediaAd(b.adm);
+            resultingBid.meta.mediaType = BANNER;
+            bids.push(resultingBid);
+            break;
+          case 'Video':
+            resultingBid.vastXml = b.adm;
+            resultingBid.meta.mediaType = VIDEO;
+            bids.push(resultingBid);
+            break;
+          default:
+            utils.logInfo('[SMAATO] Invalid ad type:', smtAdType);
+        }
+      });
+    });
+
+    utils.logInfo('[SMAATO] Prebid bids:', 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: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    return [];
+  }
+}
+registerBidder(spec);
+
+const createImgAd = (adm) => {
+  const image = JSON.parse(adm).image;
+
+  let clickEvent = '';
+  image.clicktrackers.forEach(src => {
+    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
+  })
+
+  let markup = `
`;
+
+  image.impressiontrackers.forEach(src => {
+    markup += ``;
+  });
+
+  return markup + '
';
+};
+
+const createRichmediaAd = (adm) => {
+  const rich = JSON.parse(adm).richmedia;
+  let clickEvent = '';
+  rich.clicktrackers.forEach(src => {
+    clickEvent += `fetch(decodeURIComponent('${encodeURIComponent(src)}'), {cache: 'no-cache'});`;
+  })
+
+  let markup = `
${rich.mediadata.content}`;
+
+  rich.impressiontrackers.forEach(src => {
+    markup += ``;
+  });
+
+  return markup + '
';
+};
diff --git a/modules/smaatoBidAdapter.md b/modules/smaatoBidAdapter.md
new file mode 100644
index 00000000000..d26d7ecf64e
--- /dev/null
+++ b/modules/smaatoBidAdapter.md
@@ -0,0 +1,64 @@
+# Overview
+
+```
+Module Name: Smaato Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@smaato.com
+```
+
+# Description
+
+The Smaato adapter requires setup and approval from the Smaato team, even for existing Smaato publishers. Please reach out to your account team or prebid@smaato.com for more information.
+
+# Test Parameters
+
+For banner adunits:
+
+```
+var adUnits = [{
+    "code": "banner-unit",
+    "mediaTypes": {
+        "banner": {
+            "sizes": [320, 50]
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
+
+For video adunits:
+
+```
+var adUnits = [{
+    "code": "video unit",
+    "mediaTypes": {
+        "video": {
+            "context": "instream",
+            "playerSize": [640, 480],
+            "mimes": ["video/mp4"],
+            "minduration": 5,
+            "maxduration": 30,
+            "startdelay": 0,
+            "linearity": 1,
+            "protocols": [7],
+            "skip": 1,
+            "skipmin": 5,
+            "api": [7],
+            "ext": {"rewarded": 0}
+        }
+    },
+    "bids": [{
+        "bidder": "smaato",
+        "params": {
+            "publisherId": "1100042525",
+            "adspaceId": "130563103"
+        }
+    }]
+}];
+```
\ No newline at end of file
diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
index 97dd43fc5ba..54c58084dff 100644
--- a/modules/smartadserverBidAdapter.js
+++ b/modules/smartadserverBidAdapter.js
@@ -13,8 +13,10 @@ import {
   createEidsArray
 } from './userId/eids.js';
 const BIDDER_CODE = 'smartadserver';
+const GVL_ID = 45;
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   aliases: ['smart'], // short code
   supportedMediaTypes: [BANNER, VIDEO],
   /**
@@ -83,21 +85,44 @@ export const spec = {
           w: size[0],
           h: size[1]
         }));
-      } else if (videoMediaType && videoMediaType.context === 'instream') {
+      } else if (videoMediaType && (videoMediaType.context === 'instream' || videoMediaType.context === 'outstream')) {
+        // use IAB ORTB values if the corresponding values weren't already set by bid.params.video
+        // Assign a default protocol, the highest value possible means we are retrocompatible with all older values.
+        var protocol = null;
+        if (bid.params.video && bid.params.video.protocol) {
+          protocol = bid.params.video.protocol;
+        } else if (Array.isArray(videoMediaType.protocols)) {
+          protocol = Math.max.apply(Math, videoMediaType.protocols);
+        }
+
+        // Default value for all exotic cases set to bid.params.video.startDelay midroll hence 2.
+        var startDelay = 2;
+        if (bid.params.video && bid.params.video.startDelay) {
+          startDelay = bid.params.video.startDelay
+        } else if (videoMediaType.startdelay == 0) {
+          startDelay = 1;
+        } else if (videoMediaType.startdelay == -1) {
+          startDelay = 2;
+        } else if (videoMediaType.startdelay == -2) {
+          startDelay = 3;
+        }
+
         // Specific attributes for instream.
         let playerSize = videoMediaType.playerSize[0];
-        payload.isVideo = true;
+        payload.isVideo = videoMediaType.context === 'instream';
+        payload.mediaType = VIDEO;
         payload.videoData = {
-          videoProtocol: bid.params.video.protocol,
+          videoProtocol: protocol,
           playerWidth: playerSize[0],
           playerHeight: playerSize[1],
-          adBreak: bid.params.video.startDelay || 1
+          adBreak: startDelay
         };
       } else {
         return {};
       }
 
       if (bidderRequest && bidderRequest.gdprConsent) {
+        payload.addtl_consent = bidderRequest.gdprConsent.addtlConsent;
         payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
         payload.gdpr = bidderRequest.gdprConsent.gdprApplies; // we're handling the undefined case server side
       }
@@ -131,7 +156,7 @@ export const spec = {
     const bidResponses = [];
     let response = serverResponse.body;
     try {
-      if (response) {
+      if (response && !response.isNoAd) {
         const bidRequest = JSON.parse(bidRequestString.data);
 
         let bidResponse = {
@@ -143,13 +168,16 @@ export const spec = {
           dealId: response.dealId,
           currency: response.currency,
           netRevenue: response.isNetCpm,
-          ttl: response.ttl
+          ttl: response.ttl,
+          dspPixels: response.dspPixels,
+          meta: { advertiserDomains: response.adomain ? response.adomain : [] }
         };
 
-        if (bidRequest.isVideo) {
+        if (bidRequest.mediaType === VIDEO) {
           bidResponse.mediaType = VIDEO;
           bidResponse.vastUrl = response.adUrl;
           bidResponse.vastXml = response.ad;
+          bidResponse.content = response.ad;
         } else {
           bidResponse.adUrl = response.adUrl;
           bidResponse.ad = response.ad;
@@ -177,6 +205,13 @@ export const spec = {
         type: 'iframe',
         url: serverResponses[0].body.cSyncUrl
       });
+    } else if (syncOptions.pixelEnabled && serverResponses.length > 0 && serverResponses[0].body.dspPixels !== undefined) {
+      serverResponses[0].body.dspPixels.forEach(function(pixel) {
+        syncs.push({
+          type: 'image',
+          url: pixel
+        });
+      });
     }
     return syncs;
   }
diff --git a/modules/smartadserverBidAdapter.md b/modules/smartadserverBidAdapter.md
index c6f68363d7c..05e29359fd2 100644
--- a/modules/smartadserverBidAdapter.md
+++ b/modules/smartadserverBidAdapter.md
@@ -94,4 +94,43 @@ Please reach out to your Technical account manager for more information.
             }
         }]
     };
+```
+
+## Outstream Video
+
+```
+    var outstreamVideoAdUnit = {
+			code: 'test-div',
+			mediaTypes: {
+				video: {
+					context: 'outstream',
+					playerSize: [640, 480]
+				}
+			},
+			renderer: {
+				url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+				render: function (bid) {
+					bid.renderer.push(() => { 
+						ANOutstreamVideo.renderAd({ 
+							targetId: bid.adUnitCode,
+							adResponse: bid 
+						}); 
+					});
+				}
+			},
+			bids: [{
+				bidder: "smart",
+				params: {
+					domain: 'https://prg.smartadserver.com',
+					siteId: 207435,
+					pageId: 896536,
+					formatId: 85089,
+					bidfloor: 5,
+                    video: {
+                        protocol: 6,
+                        startDelay: 1
+                    }
+				}
+			}]
+		};
 ```
\ No newline at end of file
diff --git a/modules/smarticoBidAdapter.js b/modules/smarticoBidAdapter.js
new file mode 100644
index 00000000000..9107ce5f908
--- /dev/null
+++ b/modules/smarticoBidAdapter.js
@@ -0,0 +1,116 @@
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER } from '../src/mediaTypes.js';
+import find from 'core-js-pure/features/array/find.js';
+
+const SMARTICO_CONFIG = {
+  bidRequestUrl: 'https://trmads.eu/preBidRequest',
+  widgetUrl: 'https://trmads.eu/get',
+  method: 'POST'
+}
+
+const BIDDER_CODE = 'smartico';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.params && bid.params.token && bid.params.placementId);
+  },
+  buildRequests: function (validBidRequests, bidderRequest) {
+    var i
+    var j
+    var bid
+    var bidParam
+    var bidParams = []
+    var sizes
+    var frameWidth = Math.round(window.screen.width)
+    var frameHeight = Math.round(window.screen.height)
+    for (i = 0; i < validBidRequests.length; i++) {
+      bid = validBidRequests[i]
+      if (bid.sizes) {
+        sizes = bid.sizes
+      } else if (typeof (BANNER) != 'undefined' && bid.mediaTypes && bid.mediaTypes[BANNER] && bid.mediaTypes[BANNER].sizes) {
+        sizes = bid.mediaTypes[BANNER].sizes
+      } else if (frameWidth && frameHeight) {
+        sizes = [[frameWidth, frameHeight]]
+      } else {
+        sizes = []
+      }
+      for (j = 0; j < sizes.length; j++) {
+        bidParam = {
+          token: bid.params.token || '',
+          bidId: bid.bidId,
+          'banner-format-width': sizes[j][0],
+          'banner-format-height': sizes[j][1]
+        }
+        if (bid.params.bannerFormat) {
+          bidParam['banner-format'] = bid.params.bannerFormat
+        }
+        if (bid.params.language) {
+          bidParam.language = bid.params.language
+        }
+        if (bid.params.region) {
+          bidParam.region = bid.params.region
+        }
+        if (bid.params.regions && (bid.params.regions instanceof String || (bid.params.regions instanceof Array && bid.params.regions.length))) {
+          bidParam.regions = bid.params.regions
+          if (bidParam.regions instanceof Array) {
+            bidParam.regions = bidParam.regions.join(',')
+          }
+        }
+        bidParams.push(bidParam)
+      }
+    }
+
+    var ServerRequestObjects = {
+      method: SMARTICO_CONFIG.method,
+      url: SMARTICO_CONFIG.bidRequestUrl,
+      bids: validBidRequests,
+      data: {bidParams: bidParams, auctionId: bidderRequest.auctionId, origin: window.location.origin}
+    }
+
+    return ServerRequestObjects;
+  },
+  interpretResponse: function (serverResponse, bidRequest) {
+    var i
+    var bid
+    var bidObject
+    var url
+    var html
+    var ad
+    var token
+    var language
+    var scriptId
+    var bidResponses = []
+
+    for (i = 0; i < serverResponse.length; i++) {
+      ad = serverResponse[i];
+      bid = find(bidRequest.bids, bid => bid.bidId === ad.bidId)
+      if (bid) {
+        token = bid.params.token || ''
+
+        language = bid.params.language || SMARTICO_CONFIG.language || ''
+
+        scriptId = encodeURIComponent('smartico-widget-' + bid.params.placementId + '-' + i)
+
+        url = SMARTICO_CONFIG.widgetUrl + '?token=' + encodeURIComponent(token) + '&auction-id=' + encodeURIComponent(bid.auctionId) + '&from-auction-buffer=1&own_session=1&ad=' + encodeURIComponent(ad.id) + '&scriptid=' + scriptId + (ad.bannerFormatAlias ? '&banner-format=' + encodeURIComponent(ad.bannerFormatAlias) : '') + (language ? '&language=' + encodeURIComponent(language) : '')
+
+        html = '
+    
+    
+    

+    
+  
+  `;
+
+  return adcode;
+}
+
+const spec = {
+  code: BIDDER_CODE,
+  aliases: [],
+  supportedMediaTypes: [BANNER],
+  isBidRequestValid(bid) {
+    // as per OneCode integration, bids without params are valid
+    return true;
+  },
+  buildRequests(validBidRequests, bidderRequest) {
+    if ((!validBidRequests) || (validBidRequests.length < 1)) {
+      return false;
+    }
+
+    const siteId = setOnAny(validBidRequests, 'params.siteId');
+    const publisherId = setOnAny(validBidRequests, 'params.publisherId');
+    const page = setOnAny(validBidRequests, 'params.page') || bidderRequest.refererInfo.referer;
+    const domain = setOnAny(validBidRequests, 'params.domain') || utils.parseUrl(page).hostname;
+    const tmax = setOnAny(validBidRequests, 'params.tmax') ? parseInt(setOnAny(validBidRequests, 'params.tmax'), 10) : TMAX;
+    const pbver = '$prebid.version$';
+    const testMode = setOnAny(validBidRequests, 'params.test') ? 1 : undefined;
+
+    let ref;
+
+    try {
+      if (W.self === W.top && document.referrer) { ref = document.referrer; }
+    } catch (e) {
+    }
+
+    const payload = {
+      id: bidderRequest.auctionId,
+      site: {
+        id: siteId,
+        publisher: publisherId ? { id: publisherId } : undefined,
+        page,
+        domain,
+        ref
+      },
+      imp: validBidRequests.map(slot => mapImpression(slot)),
+      tmax,
+      user: {},
+      regs: {},
+      test: testMode,
+    };
+
+    applyGdpr(bidderRequest, payload);
+    applyClientHints(payload);
+
+    return {
+      method: 'POST',
+      url: `${BIDDER_URL}?cs=${cookieSupport()}&bdver=${BIDDER_VERSION}&pbver=${pbver}&inver=0`,
+      data: JSON.stringify(payload),
+      bidderRequest,
+    };
+  },
+
+  interpretResponse(serverResponse, request) {
+    const { bidderRequest } = request;
+    const response = serverResponse.body;
+    const bids = [];
+    const site = JSON.parse(request.data).site; // get page and referer data from request
+    site.sn = response.sn || 'mc_adapter'; // WPM site name (wp_sn)
+    let seat;
+
+    if (response.seatbid !== 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 => {
+          // get data from bid response
+          const { adomain, crid = `mcad_${bidderRequest.auctionId}_${site.slot}`, impid, exp = 300, ext, price, w, h } = serverBid;
+
+          const bidRequest = bidderRequest.bids.filter(b => {
+            const { bidId, params = {} } = b;
+            const { id, siteId } = params;
+            const currentBidId = id && siteId ? id : 'bidid-' + bidId;
+            return currentBidId === impid;
+          })[0];
+
+          // get data from linked bidRequest
+          const { bidId, params } = bidRequest || {};
+
+          // get slot id for current bid
+          site.slot = params && params.id;
+
+          if (ext) {
+            /*
+              bid response might include ext object containing siteId / slotId, as detected by OneCode
+              update site / slot data in this case
+            */
+            const { siteid, slotid } = ext;
+            site.id = siteid || site.id;
+            site.slot = slotid || site.slot;
+          }
+
+          if (bidRequest && site.id && !strIncludes(site.id, 'bidid')) {
+            // found a matching request; add this bid
+
+            // store site data for future notification
+            oneCodeDetection[bidId] = [site.id, site.slot];
+
+            const bid = {
+              requestId: bidId,
+              creativeId: crid,
+              cpm: price,
+              currency: response.cur,
+              ttl: exp,
+              width: w,
+              height: h,
+              bidderCode: BIDDER_CODE,
+              mediaType: 'banner',
+              meta: {
+                advertiserDomains: adomain,
+                networkName: seat,
+              },
+              netRevenue: true,
+              ad: renderCreative(site, response.id, serverBid, seat, bidderRequest),
+            };
+
+            if (bid.cpm > 0) {
+              bids.push(bid);
+            }
+          } else {
+            utils.logWarn('Discarding response - no matching request / site id', serverBid.impid);
+          }
+        });
+      });
+    }
+
+    return bids;
+  },
+  getUserSyncs(syncOptions) {
+    if (syncOptions.iframeEnabled && consentApiVersion != 1) {
+      return [{
+        type: 'iframe',
+        url: `${SYNC_URL}?tcf=${consentApiVersion}`,
+      }];
+    } else {
+      utils.logWarn('sspBC adapter requires iframe based user sync.');
+    }
+  },
+
+  onTimeout(timeoutData) {
+    const payload = getNotificationPayload(timeoutData);
+    if (payload) {
+      payload.event = 'timeout';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+
+  onBidWon(bid) {
+    const payload = getNotificationPayload(bid);
+    if (payload) {
+      payload.event = 'bidWon';
+      sendNotification(payload);
+      return payload;
+    }
+  },
+};
+
+registerBidder(spec);
+
+export {
+  spec,
+};
diff --git a/modules/sspBCBidAdapter.md b/modules/sspBCBidAdapter.md
new file mode 100644
index 00000000000..1678f3be594
--- /dev/null
+++ b/modules/sspBCBidAdapter.md
@@ -0,0 +1,46 @@
+# Overview
+
+Module Name: sspBC Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: wojciech.bialy@grupawp.pl
+
+# Description
+
+Module that connects to Wirtualna Polska Media header bidding endpoint to fetch bids.
+Only banner format is supported.
+Supported currencies: USD, EUR, PLN
+
+Required parameters:
+- none
+
+Optional parameters:
+- site id 
+- adslot id
+- publisher id
+- domain
+- page
+- tmax
+- test
+
+# Test Parameters
+```
+var adUnits = [
+   // Banner adUnit
+   {
+      code: 'banner-div',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bids: [{
+         bidder: 'sspBC',
+         params: {
+            id: "006",
+            siteId: "235911",
+            test: 1
+         }
+       }]
+   }
+];
+```
diff --git a/modules/stroeerCoreBidAdapter.js b/modules/stroeerCoreBidAdapter.js
new file mode 100644
index 00000000000..9d10092b2d8
--- /dev/null
+++ b/modules/stroeerCoreBidAdapter.js
@@ -0,0 +1,199 @@
+import {registerBidder} from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+
+const GVL_ID = 136;
+const BIDDER_CODE = 'stroeerCore';
+const DEFAULT_HOST = 'hb.adscale.de';
+const DEFAULT_PATH = '/dsh';
+const DEFAULT_PORT = '';
+const FIVE_MINUTES_IN_SECONDS = 300;
+const USER_SYNC_IFRAME_URL = 'https://js.adscale.de/pbsync.html';
+
+const isSecureWindow = () => utils.getWindowSelf().location.protocol === 'https:';
+const isMainPageAccessible = () => getMostAccessibleTopWindow() === utils.getWindowTop();
+
+function getTopWindowReferrer() {
+  try {
+    return utils.getWindowTop().document.referrer;
+  } catch (e) {
+    return utils.getWindowSelf().referrer;
+  }
+}
+
+function getMostAccessibleTopWindow() {
+  let res = utils.getWindowSelf();
+
+  try {
+    while (utils.getWindowTop().top !== res && res.parent.location.href.length) {
+      res = res.parent;
+    }
+  } catch (ignore) {
+  }
+
+  return res;
+}
+
+function elementInView(elementId) {
+  const resolveElement = (elId) => {
+    const win = utils.getWindowSelf();
+
+    return win.document.getElementById(elId);
+  };
+
+  const visibleInWindow = (el, win) => {
+    const rect = el.getBoundingClientRect();
+    const inView = (rect.top + rect.height >= 0) && (rect.top <= win.innerHeight);
+
+    if (win !== win.parent) {
+      return inView && visibleInWindow(win.frameElement, win.parent);
+    }
+
+    return inView;
+  };
+
+  try {
+    return visibleInWindow(resolveElement(elementId), utils.getWindowSelf());
+  } catch (e) {
+    // old browser, element not found, cross-origin etc.
+  }
+  return undefined;
+}
+
+function buildUrl({host: hostname = DEFAULT_HOST, port = DEFAULT_PORT, securePort, path: pathname = DEFAULT_PATH}) {
+  if (securePort) {
+    port = securePort;
+  }
+
+  return utils.buildUrl({protocol: 'https', hostname, port, pathname});
+}
+
+function getGdprParams(gdprConsent) {
+  if (gdprConsent) {
+    const consentString = encodeURIComponent(gdprConsent.consentString || '')
+    const isGdpr = gdprConsent.gdprApplies ? 1 : 0;
+
+    return `?gdpr=${isGdpr}&gdpr_consent=${consentString}`
+  } else {
+    return '';
+  }
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVL_ID,
+  supportedMediaTypes: [BANNER],
+
+  isBidRequestValid: (function () {
+    const validators = [];
+
+    const createValidator = (checkFn, errorMsgFn) => {
+      return (bidRequest) => {
+        if (checkFn(bidRequest)) {
+          return true;
+        } else {
+          utils.logError(`invalid bid: ${errorMsgFn(bidRequest)}`, 'ERROR');
+          return false;
+        }
+      }
+    };
+
+    function isBanner(bidReq) {
+      return (!bidReq.mediaTypes && !bidReq.mediaType) ||
+        (bidReq.mediaTypes && bidReq.mediaTypes.banner) ||
+        bidReq.mediaType === BANNER;
+    }
+
+    validators.push(createValidator((bidReq) => isBanner(bidReq),
+      bidReq => `bid request ${bidReq.bidId} is not a banner`));
+    validators.push(createValidator((bidReq) => typeof bidReq.params === 'object',
+      bidReq => `bid request ${bidReq.bidId} does not have custom params`));
+    validators.push(createValidator((bidReq) => utils.isStr(bidReq.params.sid),
+      bidReq => `bid request ${bidReq.bidId} does not have a sid string field`));
+
+    return function (bidRequest) {
+      return validators.every(f => f(bidRequest));
+    }
+  }()),
+
+  buildRequests: function (validBidRequests = [], bidderRequest) {
+    const anyBid = bidderRequest.bids[0];
+
+    const payload = {
+      id: bidderRequest.auctionId,
+      bids: [],
+      ref: getTopWindowReferrer(),
+      ssl: isSecureWindow(),
+      mpa: isMainPageAccessible(),
+      timeout: bidderRequest.timeout - (Date.now() - bidderRequest.auctionStart)
+    };
+
+    const userIds = anyBid.userId;
+
+    if (!utils.isEmpty(userIds)) {
+      payload.user = {
+        euids: userIds
+      };
+    }
+
+    const gdprConsent = bidderRequest.gdprConsent;
+
+    if (gdprConsent && gdprConsent.consentString != null && gdprConsent.gdprApplies != null) {
+      payload.gdpr = {
+        consent: bidderRequest.gdprConsent.consentString, applies: bidderRequest.gdprConsent.gdprApplies
+      };
+    }
+
+    function bidSizes(bid) {
+      return utils.deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes /* for prebid < 3 */ || [];
+    }
+
+    validBidRequests.forEach(bid => {
+      payload.bids.push({
+        bid: bid.bidId, sid: bid.params.sid, siz: bidSizes(bid), viz: elementInView(bid.adUnitCode)
+      });
+    });
+
+    return {
+      method: 'POST', url: buildUrl(anyBid.params), data: payload
+    }
+  },
+
+  interpretResponse: function (serverResponse) {
+    const bids = [];
+
+    if (serverResponse.body && typeof serverResponse.body === 'object') {
+      serverResponse.body.bids.forEach(bidResponse => {
+        bids.push({
+          requestId: bidResponse.bidId,
+          cpm: bidResponse.cpm || 0,
+          width: bidResponse.width || 0,
+          height: bidResponse.height || 0,
+          ad: bidResponse.ad,
+          ttl: FIVE_MINUTES_IN_SECONDS,
+          currency: 'EUR',
+          netRevenue: true,
+          creativeId: '',
+          meta: {
+            advertiserDomains: bidResponse.adomain
+          },
+        });
+      });
+    }
+
+    return bids;
+  },
+
+  getUserSyncs: function (syncOptions, serverResponses, gdprConsent) {
+    if (serverResponses.length > 0 && syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_IFRAME_URL + getGdprParams(gdprConsent)
+      }];
+    }
+
+    return [];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/stroeerCoreBidAdapter.md b/modules/stroeerCoreBidAdapter.md
new file mode 100644
index 00000000000..fe6e92057c6
--- /dev/null
+++ b/modules/stroeerCoreBidAdapter.md
@@ -0,0 +1,31 @@
+## Overview
+
+```
+Module Name: Stroeer Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: help@cz.stroeer-labs.com
+```
+
+
+## Ad unit configuration for publishers
+
+```javascript
+const adUnits = [{ 
+    code: 'div-gpt-ad-1460505748561-0',
+    mediaTypes: {
+        banner: {
+            sizes: [[300, 250]],
+        }
+    },
+    bids: [{
+        bidder: 'stroeerCore',
+        params: {
+          sid: "06b782cc-091b-4f53-9cd2-0291679aa1ac"
+        }    
+    }]
+}];
+```
+### Config Notes
+
+* Slot id (`sid`) is required. The adapter will ignore bid requests from prebid if `sid` is not provided. This must be in the decoded form. For example, "1234" as opposed to "MTM0ODA=". 
+* The server ignores dimensions that are not supported by the slot or by the platform (such as 987x123).
diff --git a/modules/sublimeBidAdapter.js b/modules/sublimeBidAdapter.js
index 1f8cb59f442..854f58df8fe 100644
--- a/modules/sublimeBidAdapter.js
+++ b/modules/sublimeBidAdapter.js
@@ -9,7 +9,23 @@ const DEFAULT_CURRENCY = 'EUR';
 const DEFAULT_PROTOCOL = 'https';
 const DEFAULT_TTL = 600;
 const SUBLIME_ANTENNA = 'antenna.ayads.co';
-const SUBLIME_VERSION = '0.5.2';
+const SUBLIME_VERSION = '0.7.2';
+
+/**
+ * Identify the current device type
+ * @returns {string}
+ */
+function detectDevice() {
+  const isMobile = /(?:phone|windowss+phone|ipod|blackberry|Galaxy Nexus|SM-G892A|(?:android|bbd+|meego|silk|googlebot) .+?mobile|palm|windowss+ce|opera mini|avantgo|docomo)/i;
+
+  const isTablet = /(?:ipad|playbook|Tablet|(?:android|bb\\d+|meego|silk)(?! .+? mobile))/i;
+
+  return (
+    (isMobile.test(navigator.userAgent) && 'm') || // mobile
+    (isTablet.test(navigator.userAgent) && 't') || // tablet
+    'd' // desktop
+  );
+}
 
 /**
  * Debug log message
@@ -23,7 +39,8 @@ export function log(msg, obj) {
 // Default state
 export const state = {
   zoneId: '',
-  transactionId: ''
+  transactionId: '',
+  notifyId: ''
 };
 
 /**
@@ -38,8 +55,9 @@ export function setState(value) {
 /**
  * Send pixel to our debug endpoint
  * @param {string} eventName - Event name that will be send in the e= query string
+ * @param {string} [sspName] - The optionnal name of the AD provider
  */
-export function sendEvent(eventName) {
+export function sendEvent(eventName, sspName) {
   const ts = Date.now();
   const eventObject = {
     t: ts,
@@ -47,11 +65,18 @@ export function sendEvent(eventName) {
     z: state.zoneId,
     e: eventName,
     src: 'pa',
-    puid: state.transactionId,
-    trId: state.transactionId,
-    ver: SUBLIME_VERSION,
+    puid: state.transactionId || state.notifyId,
+    trId: state.transactionId || state.notifyId,
+    pbav: SUBLIME_VERSION,
+    pubtimeout: config.getConfig('bidderTimeout'),
+    pubpbv: '$prebid.version$',
+    device: detectDevice(),
   };
 
+  if (eventName === 'bidwon') {
+    eventObject.sspname = sspName || '';
+  }
+
   log('Sending pixel for event: ' + eventName, eventObject);
 
   const queryString = utils.formatQS(eventObject);
@@ -101,6 +126,7 @@ function buildRequests(validBidRequests, bidderRequest) {
 
     setState({
       transactionId: bid.transactionId,
+      notifyId: bid.params.notifyId,
       zoneId: bid.params.zoneId,
       debug: bid.params.debug || false,
     });
@@ -117,6 +143,7 @@ function buildRequests(validBidRequests, bidderRequest) {
         h: size[1],
       })),
       transactionId: bid.transactionId,
+      notifyId: bid.params.notifyId,
       zoneId: bid.params.zoneId,
     };
 
@@ -125,10 +152,10 @@ function buildRequests(validBidRequests, bidderRequest) {
     return {
       method: 'POST',
       url: protocol + '://' + bidHost + '/bid',
-      data: payload,
+      data: JSON.stringify(payload),
       options: {
-        contentType: 'application/json',
-        withCredentials: true
+        contentType: 'text/plain',
+        withCredentials: false
       },
     }
   });
@@ -176,9 +203,16 @@ function interpretResponse(serverResponse, bidRequest) {
       netRevenue: response.netRevenue || true,
       ttl: response.ttl || DEFAULT_TTL,
       ad: response.ad,
-      pbav: SUBLIME_VERSION
+      pbav: SUBLIME_VERSION,
+      sspname: response.sspname || null
     };
 
+    // We don't support advertiserDomains atm
+    if (response.advertiserDomains) {
+      // Creating a stub for Prebid.js 5.0 compliance
+      bidResponse.meta = Object.assign({}, bidResponse.meta, { advertiserDomains: [] });
+    }
+
     bidResponses.push(bidResponse);
   }
 
@@ -191,7 +225,7 @@ function interpretResponse(serverResponse, bidRequest) {
  */
 function onBidWon(bid) {
   log('Bid won', bid);
-  sendEvent('bidwon');
+  sendEvent('bidwon', bid.sspname);
 }
 
 /**
@@ -207,6 +241,7 @@ export const spec = {
   code: BIDDER_CODE,
   gvlid: BIDDER_GVLID,
   aliases: [],
+  sendEvent: sendEvent,
   isBidRequestValid: isBidRequestValid,
   buildRequests: buildRequests,
   interpretResponse: interpretResponse,
diff --git a/modules/sublimeBidAdapter.md b/modules/sublimeBidAdapter.md
index e57f4a1fdb0..5cd1c95b682 100644
--- a/modules/sublimeBidAdapter.md
+++ b/modules/sublimeBidAdapter.md
@@ -9,7 +9,7 @@ Maintainer: pbjs@sublimeskinz.com
 # Description
 
 Connects to Sublime for bids.
-Sublime bid adapter supports Skinz and M-Skinz formats.
+Sublime bid adapter supports Skinz.
 
 # Nota Bene
 
@@ -53,10 +53,13 @@ var adUnits = [{
     bids: [{
         bidder: 'sublime',
         params: {
-            zoneId: 
+            zoneId: ,
+            notifyId: 
         }
     }]
 }];
 ```
 
-Where you replace `` by your Sublime Zone id
+Where you replace:
+- `` by your Sublime Zone id;
+- `` by your Sublime Notify id
diff --git a/modules/synacormediaBidAdapter.js b/modules/synacormediaBidAdapter.js
index 8f069f551ee..7694f5d838e 100644
--- a/modules/synacormediaBidAdapter.js
+++ b/modules/synacormediaBidAdapter.js
@@ -1,18 +1,25 @@
 'use strict';
 
-import { getAdUnitSizes, logWarn } from '../src/utils.js';
+import { getAdUnitSizes, logWarn, deepSetValue } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import includes from 'core-js-pure/features/array/includes.js';
 import {config} from '../src/config.js';
 
-const BID_HOST = 'https://prebid.technoratimedia.com';
+const BID_SCHEME = 'https://';
+const BID_DOMAIN = 'technoratimedia.com';
 const USER_SYNC_HOST = 'https://ad-cdn.technoratimedia.com';
 const VIDEO_PARAMS = [ 'minduration', 'maxduration', 'startdelay', 'placement', 'linearity', 'mimes', 'protocols', 'api' ];
 const BLOCKED_AD_SIZES = [
   '1x1',
   '1x2'
 ];
+const SUPPORTED_USER_ID_SOURCES = [
+  'liveramp.com', // Liveramp IdentityLink
+  'nextroll.com', // NextRoll XID
+  'verizonmedia.com', // Verizon Media ConnectID
+  'pubcid.org' // PubCommon ID
+];
 export const spec = {
   code: 'synacormedia',
   supportedMediaTypes: [ BANNER, VIDEO ],
@@ -23,7 +30,7 @@ export const spec = {
       bid.mediaTypes.hasOwnProperty('video');
   },
   isBidRequestValid: function(bid) {
-    const hasRequiredParams = bid && bid.params && bid.params.hasOwnProperty('placementId') && bid.params.hasOwnProperty('seatId');
+    const hasRequiredParams = bid && bid.params && (bid.params.hasOwnProperty('placementId') || bid.params.hasOwnProperty('tagId')) && bid.params.hasOwnProperty('seatId');
     const hasAdSizes = bid && getAdUnitSizes(bid).filter(size => BLOCKED_AD_SIZES.indexOf(size.join('x')) === -1).length > 0
     return !!(hasRequiredParams && hasAdSizes);
   },
@@ -36,7 +43,7 @@ export const spec = {
     const openRtbBidRequest = {
       id: bidderRequest.auctionId,
       site: {
-        domain: location.hostname,
+        domain: config.getConfig('publisherDomain') || location.hostname,
         page: refererInfo.referer,
         ref: document.referrer
       },
@@ -60,7 +67,7 @@ export const spec = {
       } else {
         seatId = bid.params.seatId;
       }
-      const placementId = bid.params.placementId;
+      const tagIdOrplacementId = bid.params.tagId || bid.params.placementId;
       const bidFloor = bid.params.bidfloor ? parseFloat(bid.params.bidfloor) : null;
       if (isNaN(bidFloor)) {
         logWarn(`Synacormedia: there is an invalid bid floor: ${bid.params.bidfloor}`);
@@ -76,19 +83,32 @@ export const spec = {
 
       let imps = [];
       if (videoOrBannerKey === 'banner') {
-        imps = this.buildBannerImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildBannerImpressions(adSizes, bid, tagIdOrplacementId, pos, bidFloor, videoOrBannerKey);
       } else if (videoOrBannerKey === 'video') {
-        imps = this.buildVideoImpressions(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey);
+        imps = this.buildVideoImpressions(adSizes, bid, tagIdOrplacementId, pos, bidFloor, videoOrBannerKey);
       }
       if (imps.length > 0) {
         imps.forEach(i => openRtbBidRequest.imp.push(i));
       }
     });
 
+    // CCPA
+    if (bidderRequest && bidderRequest.uspConsent) {
+      deepSetValue(openRtbBidRequest, 'regs.ext.us_privacy', bidderRequest.uspConsent);
+    }
+
+    // User ID
+    if (validBidReqs[0] && validBidReqs[0].userIdAsEids && Array.isArray(validBidReqs[0].userIdAsEids)) {
+      const eids = this.processEids(validBidReqs[0].userIdAsEids);
+      if (eids.length) {
+        deepSetValue(openRtbBidRequest, 'user.ext.eids', eids);
+      }
+    }
+
     if (openRtbBidRequest.imp.length && seatId) {
       return {
         method: 'POST',
-        url: `${BID_HOST}/openrtb/bids/${seatId}?src=$$REPO_AND_VERSION$$`,
+        url: `${BID_SCHEME}${seatId}.${BID_DOMAIN}/openrtb/bids/${seatId}?src=$$REPO_AND_VERSION$$`,
         data: openRtbBidRequest,
         options: {
           contentType: 'application/json',
@@ -98,7 +118,17 @@ export const spec = {
     }
   },
 
-  buildBannerImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  processEids: function(userIdAsEids) {
+    const eids = [];
+    userIdAsEids.forEach(function(eid) {
+      if (SUPPORTED_USER_ID_SOURCES.indexOf(eid.source) > -1) {
+        eids.push(eid);
+      }
+    });
+    return eids;
+  },
+
+  buildBannerImpressions: function (adSizes, bid, tagIdOrPlacementId, pos, bidFloor, videoOrBannerKey) {
     let format = [];
     let imps = [];
     adSizes.forEach((size, i) => {
@@ -119,7 +149,7 @@ export const spec = {
           format,
           pos
         },
-        tagid: placementId,
+        tagid: tagIdOrPlacementId,
       };
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
@@ -129,7 +159,7 @@ export const spec = {
     return imps;
   },
 
-  buildVideoImpressions: function(adSizes, bid, placementId, pos, bidFloor, videoOrBannerKey) {
+  buildVideoImpressions: function(adSizes, bid, tagIdOrPlacementId, pos, bidFloor, videoOrBannerKey) {
     let imps = [];
     adSizes.forEach((size, i) => {
       if (!size || size.length != 2) {
@@ -139,7 +169,7 @@ export const spec = {
       const size1 = size[1];
       const imp = {
         id: `${videoOrBannerKey.substring(0, 1)}${bid.bidId}-${size0}x${size1}`,
-        tagid: placementId
+        tagid: tagIdOrPlacementId
       };
       if (bidFloor !== null && !isNaN(bidFloor)) {
         imp.bidfloor = bidFloor;
@@ -151,6 +181,9 @@ export const spec = {
         pos
       };
       if (bid.mediaTypes.video) {
+        if (!bid.params.video) {
+          bid.params.video = {};
+        }
         this.setValidVideoParams(bid.mediaTypes.video, bid.params.video);
       }
       if (bid.params.video) {
@@ -167,7 +200,7 @@ export const spec = {
       .filter(param => includes(VIDEO_PARAMS, param) && sourceObj[param] !== null && (!isNaN(parseInt(sourceObj[param], 10)) || !(sourceObj[param].length < 1)))
       .forEach(param => destObj[param] = Array.isArray(sourceObj[param]) ? sourceObj[param] : parseInt(sourceObj[param], 10));
   },
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function(serverResponse, bidRequest) {
     const updateMacros = (bid, r) => {
       return r ? r.replace(/\${AUCTION_PRICE}/g, bid.price) : r;
     };
@@ -176,7 +209,6 @@ export const spec = {
       logWarn('Synacormedia: server returned empty/non-json response: ' + JSON.stringify(serverResponse.body));
       return;
     }
-
     const {id, seatbid: seatbids} = serverResponse.body;
     let bids = [];
     if (id && seatbids) {
@@ -184,11 +216,35 @@ export const spec = {
         seatbid.bid.forEach(bid => {
           const creative = updateMacros(bid, bid.adm);
           const nurl = updateMacros(bid, bid.nurl);
-          const [, impType, impid, width, height] = bid.impid.match(/^([vb])(.*)-(.*)x(.*)$/);
-          const isVideo = impType == 'v';
+          const [, impType, impid] = bid.impid.match(/^([vb])([\w\d]+)/);
+          let height = bid.h;
+          let width = bid.w;
+          const isVideo = impType === 'v';
+          const isBanner = impType === 'b';
+          if ((!height || !width) && bidRequest.data && bidRequest.data.imp && bidRequest.data.imp.length > 0) {
+            bidRequest.data.imp.forEach(req => {
+              if (bid.impid === req.id) {
+                if (isVideo) {
+                  height = req.video.h;
+                  width = req.video.w;
+                } else if (isBanner) {
+                  let bannerHeight = 1;
+                  let bannerWidth = 1;
+                  if (req.banner.format && req.banner.format.length > 0) {
+                    bannerHeight = req.banner.format[0].h;
+                    bannerWidth = req.banner.format[0].w;
+                  }
+                  height = bannerHeight;
+                  width = bannerWidth;
+                } else {
+                  height = 1;
+                  width = 1;
+                }
+              }
+            });
+          }
           const bidObj = {
             requestId: impid,
-            adId: bid.id.replace(/~/g, '-'),
             cpm: parseFloat(bid.price),
             width: parseInt(width, 10),
             height: parseInt(height, 10),
@@ -199,6 +255,11 @@ export const spec = {
             ad: creative,
             ttl: 60
           };
+
+          if (bid.adomain != undefined || bid.adomain != null) {
+            bidObj.meta = { advertiserDomains: bid.adomain };
+          }
+
           if (isVideo) {
             const [, uuid] = nurl.match(/ID=([^&]*)&?/);
             if (!config.getConfig('cache.url')) {
diff --git a/modules/synacormediaBidAdapter.md b/modules/synacormediaBidAdapter.md
index fd71f07b3a3..523c66fd1d9 100644
--- a/modules/synacormediaBidAdapter.md
+++ b/modules/synacormediaBidAdapter.md
@@ -33,7 +33,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.10,
               pos: 1
           }
@@ -52,7 +52,7 @@ https://track.technoratimedia.com/openrtb/tags?ID=%%PATTERN:hb_cache_id_synacorm
           bidder: "synacormedia",
           params: {
               seatId: "prebid",
-              placementId: "demo1",
+              tagId: "demo1",
               bidfloor: 0.20,
               pos: 1,
               video: {
diff --git a/modules/tapadIdSystem.js b/modules/tapadIdSystem.js
new file mode 100644
index 00000000000..a49d62897ad
--- /dev/null
+++ b/modules/tapadIdSystem.js
@@ -0,0 +1,61 @@
+import { uspDataHandler } from '../src/adapterManager.js';
+import { submodule } from '../src/hook.js';
+import * as ajax from '../src/ajax.js'
+import * as utils from '../src/utils.js';
+
+export const graphUrl = 'https://rtga.tapad.com/v1/graph';
+
+export const tapadIdSubmodule = {
+  name: 'tapadId',
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{tapadId: string} | undefined}
+   */
+  decode(id) {
+    return { tapadId: id };
+  },
+  /*
+   * @function
+   * @summary initiate Real Time Graph
+   * @param {SubmoduleParams} [configParams]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse }}
+   */
+  getId(config) {
+    const uspData = uspDataHandler.getConsentData();
+    if (uspData && uspData !== '1---') {
+      return { id: undefined };
+    }
+    const configParams = config.params || {};
+
+    if (configParams.companyId == null || isNaN(Number(configParams.companyId))) {
+      utils.logMessage('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+    }
+
+    return {
+      callback: (complete) => {
+        ajax.ajaxBuilder(10000)(
+          `${graphUrl}?company_id=${configParams.companyId}&tapad_id_type=TAPAD_ID`,
+          {
+            success: (response) => {
+              const responseJson = JSON.parse(response);
+              if (responseJson.hasOwnProperty('tapadId')) {
+                complete(responseJson.tapadId);
+              }
+            },
+            error: (_, e) => {
+              if (e.status === 404) {
+                complete(undefined);
+              }
+              if (e.status === 403) {
+                utils.logMessage('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+              }
+            }
+          }
+        );
+      }
+    }
+  }
+}
+submodule('userId', tapadIdSubmodule);
diff --git a/modules/tapadIdSystem.md b/modules/tapadIdSystem.md
new file mode 100644
index 00000000000..4bab1b4689d
--- /dev/null
+++ b/modules/tapadIdSystem.md
@@ -0,0 +1,43 @@
+### Tapad ID
+
+Tapad's ID module provides access to a universal identifier that publishers, ad tech platforms and advertisers can use for data collection and collation without reliance on third-party cookies.
+Tapad's ID module is free to use and promotes collaboration across the industry by facilitating interoperability between DSPs, SSPs and publishers.
+
+To register as an authorized user of the Tapad ID module, or for more information, documentation and access to Tapad’s Terms and Conditions please contact  [prebid@tapad.com](mailto:prebid@tapad.com).
+
+Tapad’s Privacy landing page containing links to region-specific Privacy Notices may be found here: [https://tapad.com/privacy.html](https://tapad.com/privacy.html).
+
+Add it to your Prebid.js package with:
+
+
+`gulp build --modules=userId,tapadIdSystem`
+
+#### Tapad ID Configuration
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | `"tapadId"` | `"tapadId"` |
+| params | Required | Object | Details for Tapad initialization. | |
+| params.company_id | Required | Number | Tapad Company Id provided by Tapad | 1234567890 |
+
+#### Tapad ID Example
+
+```js
+pbjs.setConfig({
+    userSync: {
+        userIds: [
+            {
+                name: "tapadId",
+                params: {
+                    companyId: 1234567890
+                },
+                storage: {
+                    type: "cookie",
+                    name: "tapad_id",
+                    expires: 1
+                }
+            }
+        ]
+    }
+});
+```
diff --git a/modules/tappxBidAdapter.js b/modules/tappxBidAdapter.js
new file mode 100644
index 00000000000..ff7cffdb021
--- /dev/null
+++ b/modules/tappxBidAdapter.js
@@ -0,0 +1,492 @@
+'use strict';
+
+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';
+
+const BIDDER_CODE = 'tappx';
+const TTL = 360;
+const CUR = 'USD';
+const TAPPX_BIDDER_VERSION = '0.1.10610';
+const TYPE_CNN = 'prebidjs';
+const LOG_PREFIX = '[TAPPX]: ';
+const VIDEO_SUPPORT = ['instream'];
+
+const DATA_TYPES = {
+  'NUMBER': 'number',
+  'STRING': 'string',
+  'BOOLEAN': 'boolean',
+  'ARRAY': 'array',
+  'OBJECT': 'object'
+};
+const VIDEO_CUSTOM_PARAMS = {
+  '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,
+  'minbitrate': DATA_TYPES.NUMBER,
+  'maxbitrate': DATA_TYPES.NUMBER,
+  'skip': DATA_TYPES.NUMBER
+}
+
+var hostDomain;
+
+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) {
+    return validBasic(bid) && validMediaType(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.
+   */
+  buildRequests: function(validBidRequests, bidderRequest) {
+    let requests = [];
+    validBidRequests.forEach(oneValidRequest => {
+      requests.push(buildOneRequest(oneValidRequest, bidderRequest));
+    });
+    return requests;
+  },
+
+  /**
+   * Parse the response and generate one or more bid objects.
+   *
+   * @param {*} serverResponse
+   * @param {*} originalRequest
+   */
+  interpretResponse: function(serverResponse, originalRequest) {
+    const responseBody = serverResponse.body;
+    if (!serverResponse.body) {
+      utils.logWarn(LOG_PREFIX, 'Empty response body HTTP 204, no bids');
+      return [];
+    }
+
+    const bids = [];
+    responseBody.seatbid.forEach(serverSeatBid => {
+      serverSeatBid.bid.forEach(serverBid => {
+        bids.push(interpretBid(serverBid, originalRequest));
+      });
+    });
+
+    return bids;
+  },
+
+  /**
+   * If the publisher allows user-sync activity, the platform will call this function and the adapter may register pixels and/or iframe user syncs.
+   *
+   * @param {*} syncOptions
+   * @param {*} serverResponses
+   * @param {*} gdprConsent
+   */
+  getUserSyncs: (syncOptions, serverResponses, gdprConsent, uspConsent) => {
+    let url = `https://${hostDomain}/cs/usersync.php?`;
+
+    // GDPR & CCPA
+    if (gdprConsent) {
+      url += '&gdpr_optin=' + (gdprConsent.gdprApplies ? 1 : 0);
+      url += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+    if (uspConsent) {
+      url += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // SyncOptions
+    if (syncOptions.iframeEnabled) {
+      url += '&type=iframe'
+      return [{
+        type: 'iframe',
+        url: url
+      }];
+    } else {
+      url += '&type=img'
+      return [{
+        type: 'image',
+        url: url
+      }];
+    }
+  }
+}
+
+function validBasic(bid) {
+  if (bid.params == null) {
+    utils.logWarn(LOG_PREFIX, 'Please review the mandatory Tappx parameters.');
+    return false;
+  }
+
+  if (bid.params.tappxkey == null) {
+    utils.logWarn(LOG_PREFIX, 'Please review the mandatory Tappxkey parameter.');
+    return false;
+  }
+
+  if (bid.params.host == null) {
+    utils.logWarn(LOG_PREFIX, 'Please review the mandatory Host parameter.');
+    return false;
+  }
+
+  let classicEndpoint = true
+  if ((new RegExp(`^(vz.*|zz.*)\\.*$`, 'i')).test(bid.params.host)) {
+    classicEndpoint = false
+  }
+
+  if (classicEndpoint && bid.params.endpoint == null) {
+    utils.logWarn(LOG_PREFIX, 'Please review the mandatory endpoint Tappx parameters.');
+    return false;
+  }
+
+  return true;
+}
+
+function validMediaType(bid) {
+  const video = utils.deepAccess(bid, 'mediaTypes.video');
+
+  // Video validations
+  if (typeof video != 'undefined') {
+    if (VIDEO_SUPPORT.indexOf(video.context) === -1) {
+      utils.logWarn(LOG_PREFIX, 'Please review the mandatory Tappx parameters for Video. Only "instream" is suported.');
+      return false;
+    }
+    if (typeof video.mimes == 'undefined') {
+      utils.logWarn(LOG_PREFIX, 'Please review the mandatory Tappx parameters for Video. Mimes param is mandatory.');
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * Parse the response and generate one bid object.
+ *
+ * @param {object} serverBid Bid by OpenRTB 2.5
+ * @returns {object} Prebid banner bidObject
+ */
+function interpretBid(serverBid, request) {
+  let bidReturned = {
+    requestId: request.bids.bidId,
+    cpm: serverBid.price,
+    currency: serverBid.cur ? serverBid.cur : CUR,
+    width: serverBid.w,
+    height: serverBid.h,
+    ttl: TTL,
+    creativeId: serverBid.crid,
+    netRevenue: true,
+  }
+
+  if (typeof serverBid.dealId != 'undefined') { bidReturned.dealId = serverBid.dealId }
+
+  if (typeof request.bids.mediaTypes != 'undefined' && typeof request.bids.mediaTypes.video != 'undefined') {
+    bidReturned.vastXml = serverBid.adm;
+    bidReturned.vastUrl = serverBid.lurl;
+    bidReturned.ad = serverBid.adm;
+    bidReturned.mediaType = VIDEO;
+  } else {
+    bidReturned.ad = serverBid.adm;
+    bidReturned.mediaType = BANNER;
+  }
+
+  if (typeof bidReturned.adomain != 'undefined' || bidReturned.adomain != null) {
+    bidReturned.meta = { advertiserDomains: request.bids.adomain };
+  }
+
+  return bidReturned;
+}
+
+/**
+* Build and makes the request
+*
+* @param {*} validBidRequests
+* @param {*} bidderRequest
+* @return response ad
+*/
+function buildOneRequest(validBidRequests, bidderRequest) {
+  let hostInfo = _getHostInfo(validBidRequests);
+  const ENDPOINT = hostInfo.endpoint;
+  hostDomain = hostInfo.domain;
+
+  const TAPPXKEY = utils.deepAccess(validBidRequests, 'params.tappxkey');
+  const BIDFLOOR = utils.deepAccess(validBidRequests, 'params.bidfloor');
+  const BIDEXTRA = utils.deepAccess(validBidRequests, 'params.ext');
+  const bannerMediaType = utils.deepAccess(validBidRequests, 'mediaTypes.banner');
+  const videoMediaType = utils.deepAccess(validBidRequests, 'mediaTypes.video');
+  const { refererInfo } = bidderRequest;
+
+  // let requests = [];
+  let payload = {};
+  let publisher = {};
+  let tagid;
+  let api = {};
+
+  // > App/Site object
+  if (utils.deepAccess(validBidRequests, 'params.app')) {
+    let app = {};
+    app.name = utils.deepAccess(validBidRequests, 'params.app.name');
+    app.bundle = utils.deepAccess(validBidRequests, 'params.app.bundle');
+    app.domain = utils.deepAccess(validBidRequests, 'params.app.domain');
+    publisher.name = utils.deepAccess(validBidRequests, 'params.app.publisher.name');
+    publisher.domain = utils.deepAccess(validBidRequests, 'params.app.publisher.domain');
+    tagid = `${app.name}_typeAdBanVid_${getOs()}`;
+    payload.app = app;
+    api[0] = utils.deepAccess(validBidRequests, 'params.api') ? utils.deepAccess(validBidRequests, 'params.api') : [3, 5];
+  } else {
+    let site = {};
+    site.name = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    site.bundle = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    site.domain = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    publisher.name = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    publisher.domain = (bidderRequest && refererInfo) ? utils.parseUrl(refererInfo.referer).hostname : window.location.hostname;
+    tagid = `${site.name}_typeAdBanVid_${getOs()}`;
+    payload.site = site;
+  }
+  // < App/Site object
+
+  // > Imp object
+  let imp = {};
+  let w;
+  let h;
+
+  if (bannerMediaType) {
+    let banner = {};
+    w = bannerMediaType.sizes[0][0];
+    h = bannerMediaType.sizes[0][1];
+    banner.w = w;
+    banner.h = h;
+    if (
+      ((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
+      ((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
+      banner.pos = 7
+    } else {
+      banner.pos = 4
+    }
+
+    banner.api = api;
+
+    let format = {};
+    format[0] = {};
+    format[0].w = w;
+    format[0].h = h;
+    banner.format = format;
+
+    imp.banner = banner;
+  }
+
+  if (videoMediaType) {
+    let video = {};
+
+    let videoParams = utils.deepAccess(validBidRequests, 'params.video');
+    for (var key in VIDEO_CUSTOM_PARAMS) {
+      if (videoParams.hasOwnProperty(key)) {
+        video[key] = _checkParamDataType(key, videoParams[key], VIDEO_CUSTOM_PARAMS[key]);
+      }
+    }
+
+    if ((video.w === undefined || video.w == null || video.w <= 0) ||
+        (video.h === undefined || video.h == null || video.h <= 0)) {
+      w = videoMediaType.playerSize[0][0];
+      h = videoMediaType.playerSize[0][1];
+      video.w = w;
+      video.h = h;
+    }
+
+    video.mimes = videoMediaType.mimes;
+
+    imp.video = video;
+  }
+
+  imp.id = validBidRequests.bidId;
+  imp.tagid = tagid;
+  imp.secure = 1;
+
+  imp.bidfloor = utils.deepAccess(validBidRequests, 'params.bidfloor');
+  if (utils.isFn(validBidRequests.getFloor)) {
+    try {
+      let floor = validBidRequests.getFloor({
+        currency: CUR,
+        mediaType: '*',
+        size: '*'
+      });
+      if (utils.isPlainObject(floor) && !isNaN(floor.floor) && floor.currency === 'USD') {
+        imp.bidfloor = floor.floor;
+      } else {
+        utils.logWarn(LOG_PREFIX, 'Currency not valid. Use only USD with Tappx.');
+      }
+    } catch (e) {
+      utils.logWarn(LOG_PREFIX, e);
+      imp.bidfloor = utils.deepAccess(validBidRequests, 'params.bidfloor'); // Be sure that we have an imp.bidfloor
+    }
+  }
+
+  let bidder = {};
+  bidder.tappxkey = TAPPXKEY;
+  bidder.endpoint = ENDPOINT;
+  bidder.host = hostInfo.url;
+  bidder.bidfloor = BIDFLOOR;
+  bidder.ext = (typeof BIDEXTRA == 'object') ? BIDEXTRA : undefined;
+
+  imp.ext = {};
+  imp.ext.bidder = bidder;
+  // < Imp object
+
+  // > Device object
+  let device = {};
+  // Mandatory
+  device.os = getOs();
+  device.ip = 'peer';
+  device.ua = navigator.userAgent;
+  device.ifa = validBidRequests.ifa;
+
+  // Optional
+  device.h = screen.height;
+  device.w = screen.width;
+  device.dnt = utils.getDNT() ? 1 : 0;
+  device.language = getLanguage();
+  device.make = navigator.vendor ? navigator.vendor : '';
+
+  let geo = {};
+  geo.country = utils.deepAccess(validBidRequests, 'params.geo.country');
+  // < Device object
+
+  // > Params
+  let params = {};
+  params.host = 'tappx.com';
+  params.bidfloor = BIDFLOOR;
+  // < Params
+
+  // > GDPR
+
+  // Universal ID
+  let eidsArr = utils.deepAccess(validBidRequests, 'userIdAsEids');
+  if (typeof eidsArr !== 'undefined') {
+    eidsArr = eidsArr.filter(
+      uuid =>
+        uuid !== null &&
+          (uuid.source !== undefined && uuid.source !== null && typeof uuid.uids[0].id == 'string') &&
+          (uuid.uids[0].id !== undefined && uuid.uids[0].id !== null && typeof uuid.uids[0].id == 'string')
+    )
+  }
+  payload.user = {
+    ext: {
+      eids: eidsArr
+    }
+  };
+
+  let regs = {};
+  regs.gdpr = 0;
+  if (!(bidderRequest.gdprConsent == null)) {
+    if (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') { regs.gdpr = bidderRequest.gdprConsent.gdprApplies; }
+    if (regs.gdpr) { payload.user.ext.consent = bidderRequest.gdprConsent.consentString; }
+  }
+
+  // CCPA
+  regs.ext = {};
+  if (!(bidderRequest.uspConsent == null)) {
+    regs.ext.us_privacy = bidderRequest.uspConsent;
+  }
+
+  // COPPA compliance
+  if (config.getConfig('coppa') === true) {
+    regs.coppa = config.getConfig('coppa') === true ? 1 : 0;
+  }
+  // < GDPR
+
+  // > Payload
+  payload.id = validBidRequests.auctionId;
+  payload.test = utils.deepAccess(validBidRequests, 'params.test') ? 1 : 0;
+  payload.at = 1;
+  payload.tmax = bidderRequest.timeout ? bidderRequest.timeout : 600;
+  payload.bidder = BIDDER_CODE;
+  payload.imp = [imp];
+
+  payload.device = device;
+  payload.params = params;
+  payload.regs = regs;
+  // < Payload
+
+  let pbjsv = ($$PREBID_GLOBAL$$.version != null) ? encodeURIComponent($$PREBID_GLOBAL$$.version) : -1;
+
+  return {
+    method: 'POST',
+    url: `${hostInfo.url}?type_cnn=${TYPE_CNN}&v=${TAPPX_BIDDER_VERSION}&pbjsv=${pbjsv}`,
+    data: JSON.stringify(payload),
+    bids: validBidRequests
+  };
+}
+
+function getLanguage() {
+  const language = navigator.language ? 'language' : 'userLanguage';
+  return navigator[language].split('-')[0];
+}
+
+function getOs() {
+  let ua = navigator.userAgent;
+  if (ua == null) { return 'unknown'; } else if (ua.match(/(iPhone|iPod|iPad)/)) { return 'ios'; } else if (ua.match(/Android/)) { return 'android'; } else if (ua.match(/Window/)) { return 'windows'; } else { return 'unknown'; }
+}
+
+export function _getHostInfo(validBidRequests) {
+  let domainInfo = {};
+  let endpoint = utils.deepAccess(validBidRequests, 'params.endpoint');
+  let hostParam = utils.deepAccess(validBidRequests, 'params.host');
+
+  domainInfo.domain = hostParam.split('/', 1)[0];
+
+  let regexNewEndpoints = new RegExp(`^(vz.*|zz.*)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
+  let regexClassicEndpoints = new RegExp(`^([a-z]{3}|testing)\\.[a-z]{3}\\.tappx\\.com$`, 'i');
+
+  if (regexNewEndpoints.test(domainInfo.domain)) {
+    domainInfo.newEndpoint = true;
+    domainInfo.endpoint = domainInfo.domain.split('.', 1)[0]
+    domainInfo.url = `https://${hostParam}`
+  } else if (regexClassicEndpoints.test(domainInfo.domain)) {
+    domainInfo.newEndpoint = false;
+    domainInfo.endpoint = endpoint
+    domainInfo.url = `https://${hostParam}${endpoint}`
+  }
+
+  return domainInfo;
+}
+
+export function _checkParamDataType(key, value, datatype) {
+  var errMsg = 'Ignoring param key: ' + key + ', expects ' + datatype + ', found ' + typeof value;
+  var functionToExecute;
+  switch (datatype) {
+    case DATA_TYPES.BOOLEAN:
+      functionToExecute = utils.isBoolean;
+      break;
+    case DATA_TYPES.NUMBER:
+      functionToExecute = utils.isNumber;
+      break;
+    case DATA_TYPES.STRING:
+      functionToExecute = utils.isStr;
+      break;
+    case DATA_TYPES.ARRAY:
+      functionToExecute = utils.isArray;
+      break;
+  }
+  if (functionToExecute(value)) {
+    return value;
+  }
+  utils.logWarn(LOG_PREFIX, errMsg);
+  return undefined;
+}
+
+registerBidder(spec);
diff --git a/modules/tappxBidAdapter.md b/modules/tappxBidAdapter.md
new file mode 100644
index 00000000000..ca9b2b97035
--- /dev/null
+++ b/modules/tappxBidAdapter.md
@@ -0,0 +1,84 @@
+# Overview
+```
+Module Name: Tappx Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@tappx.com
+```
+
+# Description
+Module that connects to :tappx demand sources.
+Suppots Banner and Instream Video.
+Please use ```tappx``` as the bidder code.
+Ads sizes available: [300,250], [320,50], [320,480], [480,320], [728,90], [768,1024], [1024,768]
+
+# Banner Test Parameters
+```
+    var adUnits = [
+            {
+                code: 'banner-ad-div',
+                mediaTypes: {
+                    banner: {
+                        sizes: [[320,50]]
+                    }
+                },
+                bids: [
+                    {
+                        bidder: "tappx",
+                        params: {
+                            host: "testing.ssp.tappx.com/rtb/v2/",
+                            tappxkey: "pub-1234-android-1234",
+                            endpoint: "ZZ1234PBJS",
+                            bidfloor: 0.005,
+                            test: true // Optional for testing purposes
+                        }
+                    }
+                ]
+            }
+    ];
+```
+
+
+# Video Test Parameters
+```
+    var adUnits = [
+        {
+            code: 'video-ad-div',
+            renderer: {
+                options: {
+                    text: "Tappx instream Video"
+                    }
+            },
+            mediaTypes: {
+                video: {
+                    context: "instream",
+                    mimes : [ "video/mp4", "application/javascript" ],
+                    playerSize: [320, 250]
+                }
+            },
+            bids: [{
+                bidder: 'tappx',
+                params: {
+                    host: "testing.ssp.tappx.com/rtb/v2/",
+                    tappxkey: "pub-1234-desktop-1234",
+                    endpoint: "VZ12TESTCTV",
+                    bidfloor: 0.005,
+                    test: true,
+                    video: {
+                        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
+                    }
+                }
+            }]
+        }
+    ];
+```
diff --git a/modules/teadsBidAdapter.js b/modules/teadsBidAdapter.js
index e5ec891c435..54f189ff78e 100644
--- a/modules/teadsBidAdapter.js
+++ b/modules/teadsBidAdapter.js
@@ -1,6 +1,7 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 const utils = require('../src/utils.js');
 const BIDDER_CODE = 'teads';
+const GVL_ID = 132;
 const ENDPOINT_URL = 'https://a.teads.tv/hb/bid-request';
 const gdprStatus = {
   GDPR_APPLIES_PUBLISHER: 12,
@@ -11,6 +12,7 @@ const gdprStatus = {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVL_ID,
   supportedMediaTypes: ['video', 'banner'],
   /**
    * Determines whether or not the given bid request is valid.
@@ -43,6 +45,7 @@ export const spec = {
       referrer: getReferrerInfo(bidderRequest),
       pageReferrer: document.referrer,
       networkBandwidth: getConnectionDownLink(window.navigator),
+      timeToFirstByte: getTimeToFirstByte(window),
       data: bids,
       deviceWidth: screen.width,
       hb_version: '$prebid.version$'
@@ -96,6 +99,9 @@ export const spec = {
           currency: bid.currency,
           netRevenue: true,
           ttl: bid.ttl,
+          meta: {
+            advertiserDomains: bid && bid.adomain ? bid.adomain : []
+          },
           ad: bid.ad,
           requestId: bid.bidId,
           creativeId: bid.creativeId,
@@ -123,6 +129,35 @@ function getConnectionDownLink(nav) {
   return nav && nav.connection && nav.connection.downlink >= 0 ? nav.connection.downlink.toString() : '';
 }
 
+function getTimeToFirstByte(win) {
+  const performance = win.performance || win.webkitPerformance || win.msPerformance || win.mozPerformance;
+
+  const ttfbWithTimingV2 = performance &&
+    typeof performance.getEntriesByType === 'function' &&
+    Object.prototype.toString.call(performance.getEntriesByType) === '[object Function]' &&
+    performance.getEntriesByType('navigation')[0] &&
+    performance.getEntriesByType('navigation')[0].responseStart &&
+    performance.getEntriesByType('navigation')[0].requestStart &&
+    performance.getEntriesByType('navigation')[0].responseStart > 0 &&
+    performance.getEntriesByType('navigation')[0].requestStart > 0 &&
+    Math.round(
+      performance.getEntriesByType('navigation')[0].responseStart - performance.getEntriesByType('navigation')[0].requestStart
+    );
+
+  if (ttfbWithTimingV2) {
+    return ttfbWithTimingV2.toString();
+  }
+
+  const ttfbWithTimingV1 = performance &&
+    performance.timing.responseStart &&
+    performance.timing.requestStart &&
+    performance.timing.responseStart > 0 &&
+    performance.timing.requestStart > 0 &&
+    performance.timing.responseStart - performance.timing.requestStart;
+
+  return ttfbWithTimingV1 ? ttfbWithTimingV1.toString() : '';
+}
+
 function findGdprStatus(gdprApplies, gdprData, apiVersion) {
   let status = gdprStatus.GDPR_APPLIES_PUBLISHER
   if (gdprApplies) {
diff --git a/modules/telariaBidAdapter.js b/modules/telariaBidAdapter.js
index 74c97f34b74..b2904045144 100644
--- a/modules/telariaBidAdapter.js
+++ b/modules/telariaBidAdapter.js
@@ -124,7 +124,7 @@ function getDefaultSrcPageUrl() {
 }
 
 function getEncodedValIfNotEmpty(val) {
-  return !utils.isEmpty(val) ? encodeURIComponent(val) : '';
+  return (val !== '' && val !== undefined) ? encodeURIComponent(val) : '';
 }
 
 /**
@@ -276,7 +276,6 @@ function createBid(status, reqBid, response, width, height, bidderCode) {
       width: width,
       height: height,
       bidderCode: bidderCode,
-      adId: response.id,
       currency: 'USD',
       netRevenue: true,
       ttl: 300,
@@ -284,6 +283,11 @@ function createBid(status, reqBid, response, width, height, bidderCode) {
     });
   }
 
+  bid.meta = bid.meta || {};
+  if (response && response.adomain && response.adomain.length > 0) {
+    bid.meta.advertiserDomains = response.adomain;
+  }
+
   return bid;
 }
 
diff --git a/modules/temedyaBidAdapter.js b/modules/temedyaBidAdapter.js
new file mode 100644
index 00000000000..4577fb295cd
--- /dev/null
+++ b/modules/temedyaBidAdapter.js
@@ -0,0 +1,144 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { BANNER, NATIVE } from '../src/mediaTypes.js';
+
+const BIDDER_CODE = 'temedya';
+const ENDPOINT_URL = 'https://adm.vidyome.com/';
+const ENDPOINT_METHOD = 'GET';
+const CURRENCY = 'TRY';
+
+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.
+  */
+  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.
+  */
+  buildRequests: function (validBidRequests, bidderRequest) {
+    return validBidRequests.map(req => {
+      const mediaType = this._isBannerRequest(req) ? 'display' : NATIVE;
+      const data = {
+        wid: req.params.widgetId,
+        type: mediaType,
+        count: (req.params.count > 6 ? 6 : req.params.count) || 1,
+        mediaType: mediaType,
+        requestid: req.bidId
+      };
+      if (mediaType === 'display') {
+        data.sizes = utils.parseSizesInput(
+          req.mediaTypes && req.mediaTypes.banner && req.mediaTypes.banner.sizes
+        ).join('|')
+      }
+      /** @type {ServerRequest} */
+      return {
+        method: ENDPOINT_METHOD,
+        url: ENDPOINT_URL,
+        data: utils.parseQueryStringParameters(data),
+        options: { withCredentials: false, requestId: req.bidId, mediaType: mediaType }
+      };
+    });
+  },
+  /**
+  * 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;
+      const bidResponses = [];
+      if (bidResponse && bidRequest.options.mediaType == NATIVE) {
+        bidResponse.ads.forEach(function(ad) {
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: 320,
+            height: 240,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            mediaType: NATIVE,
+            ttl: 360,
+            native: {
+              title: ad.assets.title,
+              body: ad.assets.body || '',
+              icon: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              image: {
+                url: ad.assets.files[0],
+                width: 320,
+                height: 240
+              },
+              privacyLink: '',
+              clickUrl: ad.assets.click_url,
+              displayUrl: ad.assets.click_url,
+              cta: '',
+              sponsoredBy: ad.assets.sponsor || '',
+              impressionTrackers: [bidResponse.base.widget.impression + '&ids=' + ad.id + ':' + ad.assets.id],
+            },
+          });
+        });
+      } else if (bidResponse && bidRequest.options.mediaType == 'display') {
+        bidResponse.ads.forEach(function(ad) {
+          let w = ad.assets.width || 300;
+          let h = ad.assets.height || 250;
+          let htmlTag = '';
+          htmlTag += '';
+          bidResponses.push({
+            requestId: bidRequest.options.requestId,
+            cpm: parseFloat(ad.assets.cpm) || 1,
+            width: w,
+            height: h,
+            creativeId: ad.assets.id,
+            currency: ad.currency || CURRENCY,
+            netRevenue: false,
+            ttl: 360,
+            mediaType: BANNER,
+            ad: htmlTag
+          });
+        });
+      }
+      return bidResponses;
+    } catch (err) {
+      utils.logError(err);
+      return [];
+    }
+  },
+  /**
+   * @param {BidRequest} req
+   * @return {boolean}
+   * @private
+   */
+  _isBannerRequest(req) {
+    return !!(req.mediaTypes && req.mediaTypes.banner);
+  }
+}
+registerBidder(spec);
diff --git a/modules/temedyaBidAdapter.md b/modules/temedyaBidAdapter.md
new file mode 100644
index 00000000000..31ac4f3689b
--- /dev/null
+++ b/modules/temedyaBidAdapter.md
@@ -0,0 +1,64 @@
+# Overview
+
+Module Name: TE Medya Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: prebid@temedya.com
+
+# Description
+
+Module that connects to TE Medya's demand sources.
+
+TE Medya supports Native and Banner. 
+
+
+# Test Parameters
+# Native
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                native: {
+                    title: {
+                        required: true
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497,
+                        count: 1
+                    }
+                }
+            ]
+        }
+    ];
+```
+# Test Parameters
+# Banner
+```
+
+    var adUnits = [
+        {
+            code:'tme_div_id',
+            mediaTypes:{
+                banner: {
+                    banner: {
+                        sizes:[300, 250]
+                    }
+                }
+            },
+            bids:[
+                {
+                    bidder: 'temedya',
+                    params: {
+                        widgetId: 753497
+                    }
+                }
+            ]
+        }
+    ];
+```
\ No newline at end of file
diff --git a/modules/trionBidAdapter.js b/modules/trionBidAdapter.js
index 37d54e60cd2..e9e030ce33f 100644
--- a/modules/trionBidAdapter.js
+++ b/modules/trionBidAdapter.js
@@ -53,6 +53,9 @@ export const spec = {
         bid.creativeId = result.creativeId;
         bid.currency = result.currency;
         bid.netRevenue = result.netRevenue;
+        if (result.adomain) {
+          bid.meta = {advertiserDomains: result.adomain}
+        }
         bidResponses.push(bid);
       }
     }
diff --git a/modules/tripleliftBidAdapter.js b/modules/tripleliftBidAdapter.js
index af904aedc11..e8d248eea03 100644
--- a/modules/tripleliftBidAdapter.js
+++ b/modules/tripleliftBidAdapter.js
@@ -1,19 +1,20 @@
-import { BANNER } from '../src/mediaTypes.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import * as utils from '../src/utils.js';
 import { config } from '../src/config.js';
 
+const GVLID = 28;
 const BIDDER_CODE = 'triplelift';
 const STR_ENDPOINT = 'https://tlx.3lift.com/header/auction?';
 let gdprApplies = true;
 let consentString = null;
 
 export const tripleliftAdapterSpec = {
-
+  gvlid: GVLID,
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-  isBidRequestValid: function(bid) {
-    return (typeof bid.params.inventoryCode !== 'undefined');
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid: function (bid) {
+    return typeof bid.params.inventoryCode !== 'undefined';
   },
 
   buildRequests: function(bidRequests, bidderRequest) {
@@ -107,21 +108,31 @@ function _getSyncType(syncOptions) {
 function _buildPostBody(bidRequests) {
   let data = {};
   let { schain } = bidRequests[0];
-  data.imp = bidRequests.map(function(bid, index) {
-    return {
+  const globalFpd = _getGlobalFpd();
+
+  data.imp = bidRequests.map(function(bidRequest, index) {
+    let imp = {
       id: index,
-      tagid: bid.params.inventoryCode,
-      floor: _getFloor(bid),
-      banner: {
-        format: _sizes(bid.sizes)
-      }
+      tagid: bidRequest.params.inventoryCode,
+      floor: _getFloor(bidRequest)
+    };
+    // remove the else to support multi-imp
+    if (_isInstreamBidRequest(bidRequest)) {
+      imp.video = _getORTBVideo(bidRequest);
+    } else if (bidRequest.mediaTypes.banner) {
+      imp.banner = { format: _sizes(bidRequest.sizes) };
     };
+    if (!utils.isEmpty(bidRequest.ortb2Imp)) {
+      imp.fpd = _getAdUnitFpd(bidRequest.ortb2Imp);
+    }
+    return imp;
   });
 
   let eids = [
-    ...getUnifiedIdEids(bidRequests),
-    ...getIdentityLinkEids(bidRequests),
-    ...getCriteoEids(bidRequests)
+    ...getUnifiedIdEids([bidRequests[0]]),
+    ...getIdentityLinkEids([bidRequests[0]]),
+    ...getCriteoEids([bidRequests[0]]),
+    ...getPubCommonEids([bidRequests[0]])
   ];
 
   if (eids.length > 0) {
@@ -130,21 +141,42 @@ function _buildPostBody(bidRequests) {
     };
   }
 
-  if (schain) {
-    data.ext = {
-      schain
-    }
+  let ext = _getExt(schain, globalFpd);
+
+  if (!utils.isEmpty(ext)) {
+    data.ext = ext;
   }
   return data;
 }
 
+function _isInstreamBidRequest(bidRequest) {
+  if (!bidRequest.mediaTypes.video) return false;
+  if (!bidRequest.mediaTypes.video.context) return false;
+  if (bidRequest.mediaTypes.video.context.toLowerCase() === 'instream') {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+function _getORTBVideo(bidRequest) {
+  // give precedent to mediaTypes.video
+  let video = { ...bidRequest.params.video, ...bidRequest.mediaTypes.video };
+  if (!video.w) video.w = video.playerSize[0][0];
+  if (!video.h) video.h = video.playerSize[0][1];
+  if (video.context === 'instream') video.placement = 1;
+  // clean up oRTB object
+  delete video.playerSize;
+  return video;
+}
+
 function _getFloor (bid) {
   let floor = null;
   if (typeof bid.getFloor === 'function') {
     const floorInfo = bid.getFloor({
       currency: 'USD',
-      mediaType: 'banner',
-      size: _sizes(bid.sizes)
+      mediaType: _isInstreamBidRequest(bid) ? 'video' : 'banner',
+      size: '*'
     });
     if (typeof floorInfo === 'object' &&
     floorInfo.currency === 'USD' && !isNaN(parseFloat(floorInfo.floor))) {
@@ -154,20 +186,79 @@ function _getFloor (bid) {
   return floor !== null ? floor : bid.params.floor;
 }
 
-function getUnifiedIdEids(bidRequests) {
-  return getEids(bidRequests, 'tdid', 'adserver.org', 'TDID');
+function _getGlobalFpd() {
+  const fpd = {};
+  const context = {}
+  const user = {};
+  const ortbData = config.getLegacyFpd(config.getConfig('ortb2')) || {};
+
+  const fpdContext = Object.assign({}, ortbData.context);
+  const fpdUser = Object.assign({}, ortbData.user);
+
+  _addEntries(context, fpdContext);
+  _addEntries(user, fpdUser);
+
+  if (!utils.isEmpty(context)) {
+    fpd.context = context;
+  }
+  if (!utils.isEmpty(user)) {
+    fpd.user = user;
+  }
+  return fpd;
 }
 
-function getIdentityLinkEids(bidRequests) {
-  return getEids(bidRequests, 'idl_env', 'liveramp.com', 'idl');
+function _getAdUnitFpd(adUnitFpd) {
+  const fpd = {};
+  const context = {};
+
+  _addEntries(context, adUnitFpd.ext);
+
+  if (!utils.isEmpty(context)) {
+    fpd.context = context;
+  }
+
+  return fpd;
 }
 
-function getCriteoEids(bidRequests) {
-  return getEids(bidRequests, 'criteoId', 'criteo.com', 'criteoId');
+function _addEntries(target, source) {
+  if (!utils.isEmpty(source)) {
+    Object.keys(source).forEach(key => {
+      if (source[key] != null) {
+        target[key] = source[key];
+      }
+    });
+  }
+}
+
+function _getExt(schain, fpd) {
+  let ext = {};
+  if (!utils.isEmpty(schain)) {
+    ext.schain = { ...schain };
+  }
+  if (!utils.isEmpty(fpd)) {
+    ext.fpd = { ...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 getEids(bidRequests, type, source, rtiPartner) {
-  return bidRequests
+function getCriteoEids(bidRequest) {
+  return getEids(bidRequest, 'criteoId', 'criteo.com', 'criteoId');
+}
+
+function getPubCommonEids(bidRequest) {
+  return getEids(bidRequest, 'pubcid', 'pubcid.org', 'pubcid');
+}
+
+function getEids(bidRequest, type, source, rtiPartner) {
+  return bidRequest
     .map(getUserId(type)) // bids -> userIds of a certain type
     .filter((x) => !!x) // filter out null userIds
     .map(formatEid(source, rtiPartner)); // userIds -> eid objects
@@ -207,10 +298,11 @@ function _buildResponseObject(bidderRequest, bid) {
   let height = bid.height || 1;
   let dealId = bid.deal_id || '';
   let creativeId = bid.crid || '';
+  let breq = bidderRequest.bids[bid.imp_id];
 
   if (bid.cpm != 0 && bid.ad) {
     bidResponse = {
-      requestId: bidderRequest.bids[bid.imp_id].bidId,
+      requestId: breq.bidId,
       cpm: bid.cpm,
       width: width,
       height: height,
@@ -221,7 +313,29 @@ function _buildResponseObject(bidderRequest, bid) {
       currency: 'USD',
       ttl: 300,
       tl_source: bid.tl_source,
+      meta: {}
+    };
+
+    if (_isInstreamBidRequest(breq)) {
+      bidResponse.vastXml = bid.ad;
+      bidResponse.mediaType = 'video';
     };
+
+    if (bid.advertiser_name) {
+      bidResponse.meta.advertiserName = bid.advertiser_name;
+    }
+
+    if (bid.adomain && bid.adomain.length) {
+      bidResponse.meta.advertiserDomains = bid.adomain;
+    }
+
+    if (bid.tl_source && bid.tl_source == 'hdx') {
+      bidResponse.meta.mediaType = 'banner';
+    }
+
+    if (bid.tl_source && bid.tl_source == 'tlx') {
+      bidResponse.meta.mediaType = 'native';
+    }
   };
   return bidResponse;
 }
diff --git a/modules/tripleliftBidAdapter.md b/modules/tripleliftBidAdapter.md
index d5f88a2bece..03dcee3b980 100644
--- a/modules/tripleliftBidAdapter.md
+++ b/modules/tripleliftBidAdapter.md
@@ -58,5 +58,25 @@ var adUnits = [{
            floor: 0
         }
     }]
+}, {
+    code: 'instream-div-1',
+    mediaTypes: {
+        video: {
+            playerSize: [640, 480],
+            context: 'instream',
+        }
+    },
+    bids: [
+    {
+        bidder: 'triplelift',
+        params: {
+            inventoryCode: 'instream_test',
+            video: {
+                mimes: ['video/mp4'],
+                w: 640,
+                h: 480,
+          },
+        }
+    }]
 }];
 ```
diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
new file mode 100755
index 00000000000..92f9cc9951e
--- /dev/null
+++ b/modules/truereachBidAdapter.js
@@ -0,0 +1,148 @@
+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';
+
+const SUPPORTED_AD_TYPES = [BANNER];
+const BIDDER_CODE = 'truereach';
+const BIDDER_URL = 'https://ads.momagic.com/exchange/openrtb25/';
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: SUPPORTED_AD_TYPES,
+
+  isBidRequestValid: function (bidRequest) {
+    return (bidRequest.params.site_id && bidRequest.params.bidfloor &&
+    utils.deepAccess(bidRequest, 'mediaTypes.banner') && (utils.deepAccess(bidRequest, 'mediaTypes.banner.sizes.length') > 0));
+  },
+
+  buildRequests: function (validBidRequests, bidderRequest) {
+    if (validBidRequests.length === 0) {
+      return [];
+    }
+
+    let queryParams = buildCommonQueryParamsFromBids(validBidRequests, bidderRequest);
+
+    let siteId = utils.deepAccess(validBidRequests[0], 'params.site_id');
+
+    let url = BIDDER_URL + siteId + '?hb=1&transactionId=' + validBidRequests[0].transactionId;
+
+    return {
+      method: 'POST',
+      url: url,
+      data: queryParams,
+      options: { withCredentials: true }
+    };
+  },
+
+  interpretResponse: function ({ body: serverResponse }, serverRequest) {
+    const bidResponses = [];
+
+    if ((!serverResponse || !serverResponse.id) ||
+      (!serverResponse.seatbid || serverResponse.seatbid.length === 0 || !serverResponse.seatbid[0].bid || serverResponse.seatbid[0].bid.length === 0)) {
+      return bidResponses;
+    }
+
+    let adUnits = serverResponse.seatbid[0].bid;
+    let bidderBid = adUnits[0];
+
+    let responseCPM = parseFloat(bidderBid.price);
+    if (responseCPM === 0) {
+      return bidResponses;
+    }
+
+    let responseAd = bidderBid.adm;
+
+    if (bidderBid.nurl) {
+      let responseNurl = '';
+      responseAd += responseNurl;
+    }
+
+    const bidResponse = {
+      requestId: bidderBid.impid,
+      cpm: responseCPM,
+      currency: serverResponse.cur || 'USD',
+      width: parseInt(bidderBid.w),
+      height: parseInt(bidderBid.h),
+      ad: decodeURIComponent(responseAd),
+      ttl: 180,
+      creativeId: bidderBid.crid,
+      netRevenue: false
+    };
+    if (bidderBid.adomain && bidderBid.adomain.length) {
+      bidResponse.meta = {
+        advertiserDomains: bidderBid.adomain,
+      };
+    }
+
+    bidResponses.push(bidResponse);
+
+    return bidResponses;
+  },
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = []
+
+    var gdprParams = '';
+    if (gdprConsent) {
+      if (typeof gdprConsent.gdprApplies === 'boolean') {
+        gdprParams = `?gdpr=${Number(gdprConsent.gdprApplies)}&gdpr_consent=${gdprConsent.consentString}`;
+      } else {
+        gdprParams = `?gdpr_consent=${gdprConsent.consentString}`;
+      }
+    }
+
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: 'http://ads.momagic.com/jsp/usersync.jsp' + gdprParams
+      });
+    }
+    return syncs;
+  }
+
+};
+
+function buildCommonQueryParamsFromBids(validBidRequests, bidderRequest) {
+  let adW = 0;
+  let adH = 0;
+  let adSizes = Array.isArray(validBidRequests[0].params.sizes) ? validBidRequests[0].params.sizes : validBidRequests[0].sizes;
+  let sizeArrayLength = adSizes.length;
+  if (sizeArrayLength === 2 && typeof adSizes[0] === 'number' && typeof adSizes[1] === 'number') {
+    adW = adSizes[0];
+    adH = adSizes[1];
+  } else {
+    adW = adSizes[0][0];
+    adH = adSizes[0][1];
+  }
+
+  let bidFloor = Number(utils.deepAccess(validBidRequests[0], 'params.bidfloor'));
+
+  let domain = window.location.host;
+  let page = window.location.host + window.location.pathname + location.search + location.hash;
+
+  let defaultParams = {
+    id: utils.getUniqueIdentifierStr(),
+    imp: [
+      {
+        id: validBidRequests[0].bidId,
+        banner: {
+          w: adW,
+          h: adH
+        },
+        bidfloor: bidFloor
+      }
+    ],
+    site: {
+      domain: domain,
+      page: page
+    },
+    device: {
+      ua: window.navigator.userAgent
+    },
+    tmax: config.getConfig('bidderTimeout')
+  };
+
+  return defaultParams;
+}
+
+registerBidder(spec);
diff --git a/modules/truereachBidAdapter.md b/modules/truereachBidAdapter.md
new file mode 100644
index 00000000000..8a926565092
--- /dev/null
+++ b/modules/truereachBidAdapter.md
@@ -0,0 +1,44 @@
+# Overview
+
+```
+Module Name: TrueReach Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: mm.github@momagic.com
+```
+
+# Description
+
+Module that connects to TrueReach's demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: 'test-banner',
+        mediaTypes: {
+             banner: {
+                sizes: [[300, 250]]
+             }
+        },
+        bids: [{
+            bidder: 'truereach',
+            params: {
+                site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+                bidfloor: 0.1
+            }
+        }]
+    }];
+```
+
+# Bid Parameters
+
+`mediaTypes -> banner -> sizes` must be `defined`.
+
+Also, the following parameters are `required` to be set-
+
+| Name | Type | Description
+| ---- | ---- | -----------
+| `site_id` | String | TrueReach provided site ID 
+| `bidfloor` | Number | Minimum price (CPM) in USD. Must be greater than 0.
+
+# Additional Details
+[TrueReach Ads](http://doc.truereach.co.in/docs/prebid/js-bidder-adapter.html)
diff --git a/modules/trustxBidAdapter.js b/modules/trustxBidAdapter.js
index f412fa21a05..247a1f6d048 100644
--- a/modules/trustxBidAdapter.js
+++ b/modules/trustxBidAdapter.js
@@ -2,9 +2,12 @@ import * as utils from '../src/utils.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import { Renderer } from '../src/Renderer.js';
 import { VIDEO, BANNER } from '../src/mediaTypes.js';
+import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'trustx';
 const ENDPOINT_URL = 'https://sofia.trustx.org/hb';
+const NEW_ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson?sp=trustx';
+const ADDITIONAL_SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
 const ADAPTER_SYNC_URL = 'https://sofia.trustx.org/push_sync';
 const RENDERER_URL = 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js';
@@ -40,98 +43,30 @@ export const spec = {
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const auids = [];
-    const bidsMap = {};
-    const slotsMapByUid = {};
-    const sizeMap = {};
     const bids = validBidRequests || [];
-    let priceType = 'net';
-    let pageKeywords;
-    let reqId;
-
+    const newFormatBids = [];
+    const oldFormatBids = [];
+    const requests = [];
     bids.forEach(bid => {
-      if (bid.params.priceType === 'gross') {
-        priceType = 'gross';
-      }
-      reqId = bid.bidderRequestId;
-      const {params: {uid}, adUnitCode} = bid;
-      auids.push(uid);
-      const sizesId = utils.parseSizesInput(bid.sizes);
-
-      if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
-        const keywords = utils.transformBidderParamKeywords(bid.params.keywords);
-
-        if (keywords.length > 0) {
-          keywords.forEach(deleteValues);
-        }
-        pageKeywords = keywords;
-      }
-
-      if (!slotsMapByUid[uid]) {
-        slotsMapByUid[uid] = {};
-      }
-      const slotsMap = slotsMapByUid[uid];
-      if (!slotsMap[adUnitCode]) {
-        slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
+      if (bid.params.useNewFormat) {
+        newFormatBids.push(bid);
       } else {
-        slotsMap[adUnitCode].bids.push(bid);
+        oldFormatBids.push(bid);
       }
-      const slot = slotsMap[adUnitCode];
-
-      sizesId.forEach((sizeId) => {
-        sizeMap[sizeId] = true;
-        if (!bidsMap[uid]) {
-          bidsMap[uid] = {};
-        }
-
-        if (!bidsMap[uid][sizeId]) {
-          bidsMap[uid][sizeId] = [slot];
-        } else {
-          bidsMap[uid][sizeId].push(slot);
-        }
-        slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
-      });
     });
-
-    const payload = {
-      pt: priceType,
-      auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
-      r: reqId,
-      wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
-    };
-
-    if (pageKeywords) {
-      payload.keywords = JSON.stringify(pageKeywords);
-    }
-
-    if (bidderRequest) {
-      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
-        payload.u = bidderRequest.refererInfo.referer;
+    if (newFormatBids.length) {
+      const newFormatRequests = newFormatRequest(newFormatBids, bidderRequest);
+      if (newFormatRequests) {
+        requests.push(newFormatRequests);
       }
-      if (bidderRequest.timeout) {
-        payload.wtimeout = bidderRequest.timeout;
-      }
-      if (bidderRequest.gdprConsent) {
-        if (bidderRequest.gdprConsent.consentString) {
-          payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
-        }
-        payload.gdpr_applies =
-          (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
-            ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
-      }
-      if (bidderRequest.uspConsent) {
-        payload.us_privacy = bidderRequest.uspConsent;
+    }
+    if (oldFormatBids.length) {
+      const oldFormatRequests = oldFormatRequest(oldFormatBids, bidderRequest);
+      if (oldFormatRequests) {
+        requests.push(oldFormatRequests);
       }
     }
-
-    return {
-      method: 'GET',
-      url: ENDPOINT_URL,
-      data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
-      bidsMap: bidsMap,
-    };
+    return requests;
   },
   /**
    * Unpack the response from the server into a list of bids.
@@ -143,8 +78,6 @@ export const spec = {
   interpretResponse: function(serverResponse, bidRequest, RendererConst = Renderer) {
     serverResponse = serverResponse && serverResponse.body;
     const bidResponses = [];
-    const bidsMap = bidRequest.bidsMap;
-    const priceType = bidRequest.data.pt;
 
     let errorMessage;
 
@@ -155,18 +88,38 @@ export const spec = {
 
     if (!errorMessage && serverResponse.seatbid) {
       serverResponse.seatbid.forEach(respItem => {
-        _addBidResponse(_getBidFromResponse(respItem), bidsMap, priceType, bidResponses, RendererConst);
+        _addBidResponse(_getBidFromResponse(respItem), bidRequest, bidResponses, RendererConst);
       });
     }
     if (errorMessage) utils.logError(errorMessage);
     return bidResponses;
   },
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, responses, gdprConsent, uspConsent) {
     if (syncOptions.pixelEnabled) {
-      return [{
+      const syncsPerBidder = config.getConfig('userSync.syncsPerBidder');
+      let params = [];
+      if (gdprConsent && typeof gdprConsent.consentString === 'string') {
+        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.push(`us_privacy=${uspConsent}`);
+      }
+      const stringParams = params.join('&');
+      const syncs = [{
         type: 'image',
-        url: ADAPTER_SYNC_URL
+        url: ADAPTER_SYNC_URL + (stringParams ? `?${stringParams}` : '')
       }];
+      if (syncsPerBidder > 1) {
+        syncs.push({
+          type: 'image',
+          url: ADDITIONAL_SYNC_URL + (stringParams ? `&${stringParams}` : '')
+        });
+      }
+      return syncs;
     }
   }
 }
@@ -192,67 +145,78 @@ function _getBidFromResponse(respItem) {
   return respItem && respItem.bid && respItem.bid[0];
 }
 
-function _addBidResponse(serverBid, bidsMap, priceType, bidResponses, RendererConst) {
+function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst) {
   if (!serverBid) return;
   let errorMessage;
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
   if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const awaitingBids = bidsMap[serverBid.auid];
-    if (awaitingBids) {
-      const sizeId = `${serverBid.w}x${serverBid.h}`;
-      if (awaitingBids[sizeId]) {
-        const slot = awaitingBids[sizeId][0];
-
-        const bid = slot.bids.shift();
-        const bidResponse = {
-          requestId: bid.bidId, // bid.bidderRequestId,
-          bidderCode: spec.code,
-          cpm: serverBid.price,
-          width: serverBid.w,
-          height: serverBid.h,
-          creativeId: serverBid.auid, // bid.bidId,
-          currency: 'USD',
-          netRevenue: priceType !== 'gross',
-          ttl: TIME_TO_LIVE,
-          dealId: serverBid.dealid
-        };
-        if (serverBid.content_type === 'video') {
-          bidResponse.vastXml = serverBid.adm;
-          bidResponse.mediaType = VIDEO;
-          bidResponse.adResponse = {
-            content: bidResponse.vastXml
-          };
-          if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
-            bidResponse.renderer = createRenderer(bidResponse, {
-              id: bid.bidId,
-              url: RENDERER_URL
-            }, RendererConst);
-          }
-        } else {
-          bidResponse.ad = serverBid.adm;
-          bidResponse.mediaType = BANNER;
+    const { bidsMap, priceType, newFormat } = bidRequest;
+    let bid;
+    let slot;
+    if (newFormat) {
+      bid = bidsMap[serverBid.impid];
+    } else {
+      const awaitingBids = bidsMap[serverBid.auid];
+      if (awaitingBids) {
+        const sizeId = `${serverBid.w}x${serverBid.h}`;
+        if (awaitingBids[sizeId]) {
+          slot = awaitingBids[sizeId][0];
+          bid = slot.bids.shift();
         }
+      } else {
+        errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
+      }
+    }
 
-        bidResponses.push(bidResponse);
-
-        if (!slot.bids.length) {
-          slot.parents.forEach(({parent, key, uid}) => {
-            const index = parent[key].indexOf(slot);
-            if (index > -1) {
-              parent[key].splice(index, 1);
-            }
-            if (!parent[key].length) {
-              delete parent[key];
-              if (!utils.getKeys(parent).length) {
-                delete bidsMap[uid];
-              }
-            }
-          });
+    if (!errorMessage && bid) {
+      const bidResponse = {
+        requestId: bid.bidId, // bid.bidderRequestId,
+        cpm: serverBid.price,
+        width: serverBid.w,
+        height: serverBid.h,
+        creativeId: serverBid.auid, // bid.bidId,
+        currency: 'USD',
+        netRevenue: newFormat ? false : priceType !== 'gross',
+        ttl: TIME_TO_LIVE,
+        dealId: serverBid.dealid,
+        meta: {
+          advertiserDomains: serverBid.adomain ? serverBid.adomain : []
+        },
+      };
+      if (serverBid.content_type === 'video') {
+        bidResponse.vastXml = serverBid.adm;
+        bidResponse.mediaType = VIDEO;
+        bidResponse.adResponse = {
+          content: bidResponse.vastXml
+        };
+        if (!bid.renderer && (!bid.mediaTypes || !bid.mediaTypes.video || bid.mediaTypes.video.context === 'outstream')) {
+          bidResponse.renderer = createRenderer(bidResponse, {
+            id: bid.bidId,
+            url: RENDERER_URL
+          }, RendererConst);
         }
+      } else {
+        bidResponse.ad = serverBid.adm;
+        bidResponse.mediaType = BANNER;
       }
-    } else {
-      errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
+
+      bidResponses.push(bidResponse);
+    }
+
+    if (slot && !slot.bids.length) {
+      slot.parents.forEach(({parent, key, uid}) => {
+        const index = parent[key].indexOf(slot);
+        if (index > -1) {
+          parent[key].splice(index, 1);
+        }
+        if (!parent[key].length) {
+          delete parent[key];
+          if (!utils.getKeys(parent).length) {
+            delete bidsMap[uid];
+          }
+        }
+      });
     }
   }
   if (errorMessage) {
@@ -285,4 +249,343 @@ function createRenderer (bid, rendererParams, RendererConst) {
   return rendererInst;
 }
 
+function createVideoRequest(bid, mediaType) {
+  const {playerSize, mimes, durationRangeSec, protocols} = mediaType;
+  const size = (playerSize || bid.sizes || [])[0];
+  if (!size) return;
+
+  let result = utils.parseGPTSingleSizeArrayToRtbSize(size);
+
+  if (mimes) {
+    result.mimes = mimes;
+  }
+
+  if (durationRangeSec && durationRangeSec.length === 2) {
+    result.minduration = durationRangeSec[0];
+    result.maxduration = durationRangeSec[1];
+  }
+
+  if (protocols && protocols.length) {
+    result.protocols = protocols;
+  }
+
+  return result;
+}
+
+function createBannerRequest(bid, mediaType) {
+  const sizes = mediaType.sizes || bid.sizes;
+  if (!sizes || !sizes.length) return;
+
+  let format = sizes.map((size) => utils.parseGPTSingleSizeArrayToRtbSize(size));
+  let result = utils.parseGPTSingleSizeArrayToRtbSize(sizes[0]);
+
+  if (format.length) {
+    result.format = format
+  }
+  return result;
+}
+
+/**
+ * Gets bidfloor
+ * @param {Object} mediaTypes
+ * @param {Object} bid
+ * @returns {Number} floor
+ */
+function _getFloor (mediaTypes, bid) {
+  const curMediaType = mediaTypes.video ? 'video' : 'banner';
+  let floor = bid.params.bidFloor || 0;
+
+  if (typeof bid.getFloor === 'function') {
+    const floorInfo = bid.getFloor({
+      currency: 'USD',
+      mediaType: curMediaType,
+      size: bid.sizes.map(([w, h]) => ({w, h}))
+    });
+
+    if (typeof floorInfo === 'object' &&
+      floorInfo.currency === 'USD' &&
+      !isNaN(parseFloat(floorInfo.floor))) {
+      floor = Math.max(floor, parseFloat(floorInfo.floor));
+    }
+  }
+
+  return floor;
+}
+
+function newFormatRequest(validBidRequests, bidderRequest) {
+  if (!validBidRequests.length) {
+    return null;
+  }
+  let pageKeywords = null;
+  let jwpseg = null;
+  let content = null;
+  let schain = null;
+  let userId = null;
+  let userIdAsEids = null;
+  let user = null;
+  let userExt = null;
+  let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
+
+  const referer = refererInfo ? encodeURIComponent(refererInfo.referer) : '';
+  const imp = [];
+  const bidsMap = {};
+
+  validBidRequests.forEach((bid) => {
+    if (!bidderRequestId) {
+      bidderRequestId = bid.bidderRequestId;
+    }
+    if (!auctionId) {
+      auctionId = bid.auctionId;
+    }
+    if (!schain) {
+      schain = bid.schain;
+    }
+    if (!userId) {
+      userId = bid.userId;
+    }
+    if (!userIdAsEids) {
+      userIdAsEids = bid.userIdAsEids;
+    }
+    const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
+    bidsMap[bidId] = bid;
+    if (!pageKeywords && !utils.isEmpty(keywords)) {
+      pageKeywords = utils.transformBidderParamKeywords(keywords);
+    }
+    const bidFloor = _getFloor(mediaTypes || {}, bid);
+    const jwTargeting = rtd && rtd.jwplayer && rtd.jwplayer.targeting;
+    if (jwTargeting) {
+      if (!jwpseg && jwTargeting.segments) {
+        jwpseg = jwTargeting.segments;
+      }
+      if (!content && jwTargeting.content) {
+        content = jwTargeting.content;
+      }
+    }
+    let impObj = {
+      id: bidId,
+      tagid: uid.toString(),
+      ext: {
+        divid: adUnitCode
+      }
+    };
+
+    if (bidFloor) {
+      impObj.bidfloor = bidFloor;
+    }
+
+    if (!mediaTypes || mediaTypes[BANNER]) {
+      const banner = createBannerRequest(bid, mediaTypes ? mediaTypes[BANNER] : {});
+      if (banner) {
+        impObj.banner = banner;
+      }
+    }
+    if (mediaTypes && mediaTypes[VIDEO]) {
+      const video = createVideoRequest(bid, mediaTypes[VIDEO]);
+      if (video) {
+        impObj.video = video;
+      }
+    }
+
+    if (impObj.banner || impObj.video) {
+      imp.push(impObj);
+    }
+  });
+
+  const source = {
+    tid: auctionId,
+    ext: {
+      wrapper: 'Prebid_js',
+      wrapper_version: '$prebid.version$'
+    }
+  };
+
+  if (schain) {
+    source.ext.schain = schain;
+  }
+
+  const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+  const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+
+  let request = {
+    id: bidderRequestId,
+    site: {
+      page: referer
+    },
+    tmax,
+    source,
+    imp
+  };
+
+  if (content) {
+    request.site.content = content;
+  }
+
+  if (jwpseg && jwpseg.length) {
+    user = {
+      data: [{
+        name: 'iow_labs_pub_data',
+        segment: jwpseg.map((seg) => {
+          return {name: 'jwpseg', value: seg};
+        })
+      }]
+    };
+  }
+
+  if (gdprConsent && gdprConsent.consentString) {
+    userExt = {consent: gdprConsent.consentString};
+  }
+
+  if (userIdAsEids && userIdAsEids.length) {
+    userExt = userExt || {};
+    userExt.eids = [...userIdAsEids];
+  }
+
+  if (userExt && Object.keys(userExt).length) {
+    user = user || {};
+    user.ext = userExt;
+  }
+
+  if (user) {
+    request.user = user;
+  }
+
+  const configKeywords = utils.transformBidderParamKeywords({
+    'user': utils.deepAccess(config.getConfig('ortb2.user'), 'keywords') || null,
+    'context': utils.deepAccess(config.getConfig('ortb2.site'), 'keywords') || null
+  });
+
+  if (configKeywords.length) {
+    pageKeywords = (pageKeywords || []).concat(configKeywords);
+  }
+
+  if (pageKeywords && pageKeywords.length > 0) {
+    pageKeywords.forEach(deleteValues);
+  }
+
+  if (pageKeywords) {
+    request.ext = {
+      keywords: pageKeywords
+    };
+  }
+
+  if (gdprConsent && gdprConsent.gdprApplies) {
+    request.regs = {
+      ext: {
+        gdpr: gdprConsent.gdprApplies ? 1 : 0
+      }
+    }
+  }
+
+  if (uspConsent) {
+    if (!request.regs) {
+      request.regs = {ext: {}};
+    }
+    request.regs.ext.us_privacy = uspConsent;
+  }
+
+  return {
+    method: 'POST',
+    url: NEW_ENDPOINT_URL,
+    data: JSON.stringify(request),
+    newFormat: true,
+    bidsMap
+  };
+}
+
+function oldFormatRequest(validBidRequests, bidderRequest) {
+  const auids = [];
+  const bidsMap = {};
+  const slotsMapByUid = {};
+  const sizeMap = {};
+  const bids = validBidRequests || [];
+  let priceType = 'net';
+  let pageKeywords;
+  let reqId;
+
+  bids.forEach(bid => {
+    if (bid.params.priceType === 'gross') {
+      priceType = 'gross';
+    }
+    reqId = bid.bidderRequestId;
+    const {params: {uid}, adUnitCode} = bid;
+    auids.push(uid);
+    const sizesId = utils.parseSizesInput(bid.sizes);
+
+    if (!pageKeywords && !utils.isEmpty(bid.params.keywords)) {
+      const keywords = utils.transformBidderParamKeywords(bid.params.keywords);
+
+      if (keywords.length > 0) {
+        keywords.forEach(deleteValues);
+      }
+      pageKeywords = keywords;
+    }
+
+    if (!slotsMapByUid[uid]) {
+      slotsMapByUid[uid] = {};
+    }
+    const slotsMap = slotsMapByUid[uid];
+    if (!slotsMap[adUnitCode]) {
+      slotsMap[adUnitCode] = {adUnitCode, bids: [bid], parents: []};
+    } else {
+      slotsMap[adUnitCode].bids.push(bid);
+    }
+    const slot = slotsMap[adUnitCode];
+
+    sizesId.forEach((sizeId) => {
+      sizeMap[sizeId] = true;
+      if (!bidsMap[uid]) {
+        bidsMap[uid] = {};
+      }
+
+      if (!bidsMap[uid][sizeId]) {
+        bidsMap[uid][sizeId] = [slot];
+      } else {
+        bidsMap[uid][sizeId].push(slot);
+      }
+      slot.parents.push({parent: bidsMap[uid], key: sizeId, uid});
+    });
+  });
+
+  const payload = {
+    pt: priceType,
+    auids: auids.join(','),
+    sizes: utils.getKeys(sizeMap).join(','),
+    r: reqId,
+    wrapperType: 'Prebid_js',
+    wrapperVersion: '$prebid.version$'
+  };
+
+  if (pageKeywords) {
+    payload.keywords = JSON.stringify(pageKeywords);
+  }
+
+  if (bidderRequest) {
+    if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
+      payload.u = bidderRequest.refererInfo.referer;
+    }
+    if (bidderRequest.timeout) {
+      payload.wtimeout = bidderRequest.timeout;
+    }
+    if (bidderRequest.gdprConsent) {
+      if (bidderRequest.gdprConsent.consentString) {
+        payload.gdpr_consent = bidderRequest.gdprConsent.consentString;
+      }
+      payload.gdpr_applies =
+        (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean')
+          ? Number(bidderRequest.gdprConsent.gdprApplies) : 1;
+    }
+    if (bidderRequest.uspConsent) {
+      payload.us_privacy = bidderRequest.uspConsent;
+    }
+  }
+
+  return {
+    method: 'GET',
+    url: ENDPOINT_URL,
+    data: utils.parseQueryStringParameters(payload).replace(/\&$/, ''),
+    bidsMap,
+    priceType
+  };
+}
+
 registerBidder(spec);
diff --git a/modules/trustxBidAdapter.md b/modules/trustxBidAdapter.md
index a72f1ba85aa..e891df8f161 100644
--- a/modules/trustxBidAdapter.md
+++ b/modules/trustxBidAdapter.md
@@ -52,6 +52,18 @@ TrustX Bid Adapter supports Banner and Video (instream and outstream).
                        }
                    }
                ]
+           },{
+               code: 'test-div',
+               sizes: [[300, 250]],
+               bids: [
+                   {
+                       bidder: "trustx",
+                       params: {
+                           uid: '58851',
+                           useNewFormat: true
+                       }
+                   }
+               ]
            }
        ];
-```
\ No newline at end of file
+```
diff --git a/modules/ucfunnelBidAdapter.js b/modules/ucfunnelBidAdapter.js
index f9982edef36..14702977467 100644
--- a/modules/ucfunnelBidAdapter.js
+++ b/modules/ucfunnelBidAdapter.js
@@ -1,12 +1,14 @@
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO, NATIVE} from '../src/mediaTypes.js';
 import { getStorageManager } from '../src/storageManager.js';
+import { config } from '../src/config.js';
 import * as utils from '../src/utils.js';
 const storage = getStorageManager();
 const COOKIE_NAME = 'ucf_uid';
 const VER = 'ADGENT_PREBID-2018011501';
 const BIDDER_CODE = 'ucfunnel';
-
+const GVLID = 607;
+const CURRENCY = 'USD';
 const VIDEO_CONTEXT = {
   INSTREAM: 0,
   OUSTREAM: 2
@@ -14,6 +16,7 @@ const VIDEO_CONTEXT = {
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   ENDPOINT: 'https://hb.aralego.com/header',
   supportedMediaTypes: [BANNER, VIDEO, NATIVE],
   /**
@@ -65,11 +68,12 @@ export const spec = {
     let bid = {
       requestId: bidRequest.bidId,
       cpm: ad.cpm || 0,
-      creativeId: ad.ad_id || bidRequest.params.adid,
+      creativeId: ad.crid || ad.ad_id || bidRequest.params.adid,
       dealId: ad.deal || null,
-      currency: 'USD',
+      currency: ad.currency || 'USD',
       netRevenue: true,
-      ttl: 1800
+      ttl: 1800,
+      meta: {}
     };
 
     if (bidRequest.params && bidRequest.params.bidfloor && ad.cpm && ad.cpm < bidRequest.params.bidfloor) {
@@ -77,6 +81,10 @@ export const spec = {
     }
     if (ad.creative_type) {
       bid.mediaType = ad.creative_type;
+      bid.meta.mediaType = ad.creative_type;
+    }
+    if (ad.adomain) {
+      bid.meta.advertiserDomains = ad.adomain;
     }
 
     switch (ad.creative_type) {
@@ -124,16 +132,19 @@ export const spec = {
     return [bid];
   },
 
-  getUserSyncs: function(syncOptions) {
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent = {}, uspConsent) {
+    let gdprApplies = (gdprConsent && gdprConsent.gdprApplies) ? '1' : '';
+    let apiVersion = (gdprConsent) ? gdprConsent.apiVersion : '';
+    let consentString = (gdprConsent) ? gdprConsent.consentString : '';
     if (syncOptions.iframeEnabled) {
       return [{
         type: 'iframe',
-        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html'
+        url: 'https://cdn.aralego.net/ucfad/cookie/sync.html' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     } else if (syncOptions.pixelEnabled) {
       return [{
         type: 'image',
-        url: 'https://sync.aralego.com/idSync'
+        url: 'https://sync.aralego.com/idSync' + getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent)
       }];
     }
   }
@@ -146,6 +157,22 @@ function transformSizes(requestSizes) {
   }
 }
 
+function getCookieSyncParameter(gdprApplies, apiVersion, consentString, uspConsent) {
+  let param = '?';
+  if (gdprApplies == '1') {
+    param = param + 'gdpr=1&';
+  }
+  if (apiVersion == 1) {
+    param = param + 'euconsent=' + consentString + '&';
+  } else if (apiVersion == 2) {
+    param = param + 'euconsent-v2=' + consentString + '&';
+  }
+  if (uspConsent) {
+    param = param + 'usprivacy=' + uspConsent;
+  }
+  return (param == '?') ? '' : param;
+}
+
 function parseSizes(bid) {
   let params = bid.params;
   if (bid.mediaType === VIDEO) {
@@ -184,12 +211,41 @@ function getSupplyChain(schain) {
   return supplyChain;
 }
 
+function getMediaType(mediaTypes) {
+  if (mediaTypes != null && mediaTypes.banner) {
+    return 'banner';
+  } else if (mediaTypes != null && mediaTypes.video) {
+    return 'video';
+  } else if (mediaTypes != null && mediaTypes.native) {
+    return 'native'
+  }
+  return 'banner';
+}
+
+function getFloor(bid, size, mediaTypes) {
+  if (bid.params.bidfloor) {
+    return bid.params.bidfloor;
+  }
+  if (typeof bid.getFloor === 'function') {
+    var bidFloor = bid.getFloor({
+      currency: CURRENCY,
+      mediaType: getMediaType(mediaTypes),
+      size: (size) ? [ size[0], size[1] ] : '*',
+    });
+    if (bidFloor.currency === CURRENCY) {
+      return bidFloor.floor;
+    }
+  }
+  return undefined;
+}
+
 function getRequestData(bid, bidderRequest) {
   const size = parseSizes(bid);
   const language = navigator.language;
   const dnt = (navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0;
   const userIdTdid = (bid.userId && bid.userId.tdid) ? bid.userId.tdid : '';
   const supplyChain = getSupplyChain(bid.schain);
+  const bidFloor = getFloor(bid, size, bid.mediaTypes);
   // general bid data
   let bidData = {
     ver: VER,
@@ -199,10 +255,40 @@ function getRequestData(bid, bidderRequest) {
     dnt: dnt,
     adid: bid.params.adid,
     tdid: userIdTdid,
-    schain: supplyChain,
-    fp: bid.params.bidfloor
+    schain: supplyChain
   };
 
+  if (bidFloor) {
+    bidData.fp = bidFloor;
+  }
+
+  addUserId(bidData, bid.userId);
+  try {
+    bidData.host = window.top.location.hostname;
+    bidData.u = config.getConfig('publisherDomain') || window.top.location.href;
+    bidData.xr = 0;
+  } catch (e) {
+    bidData.host = window.location.hostname;
+    bidData.u = config.getConfig('publisherDomain') || bidderRequest.refererInfo.referrer || document.referrer || window.location.href;
+    bidData.xr = 1;
+  }
+
+  if (window.location.ancestorOrigins && window.location.ancestorOrigins.length > 0) {
+    bidData.ao = window.location.ancestorOrigins[window.location.ancestorOrigins.length - 1];
+  }
+
+  if (storage.cookiesAreEnabled()) {
+    let ucfUid = '';
+    if (storage.getCookie(COOKIE_NAME) != undefined) {
+      ucfUid = storage.getCookie(COOKIE_NAME);
+      bidData.ucfUid = ucfUid;
+    } else {
+      ucfUid = utils.generateUUID();
+      bidData.ucfUid = ucfUid;
+      storage.setCookie(COOKIE_NAME, ucfUid);
+    }
+  }
+
   try {
     bidData.host = window.top.location.hostname;
     bidData.u = window.top.location.href;
@@ -253,11 +339,83 @@ function getRequestData(bid, bidderRequest) {
   }
 
   if (bidderRequest && bidderRequest.gdprConsent) {
-    Object.assign(bidData, {
-      gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
-      euconsent: bidderRequest.gdprConsent.consentString
-    });
+    if (bidderRequest.gdprConsent.apiVersion == 1) {
+      Object.assign(bidData, {
+        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+        euconsent: bidderRequest.gdprConsent.consentString
+      });
+    } else if (bidderRequest.gdprConsent.apiVersion == 2) {
+      Object.assign(bidData, {
+        gdpr: bidderRequest.gdprConsent.gdprApplies ? 1 : 0,
+        'euconsent-v2': bidderRequest.gdprConsent.consentString
+      });
+    }
   }
 
+  if (config.getConfig('coppa')) {
+    bidData.coppa = true;
+  }
+
+  return bidData;
+}
+
+function addUserId(bidData, userId) {
+  bidData['eids'] = '';
+  utils._each(userId, (userIdObjectOrValue, userIdProviderKey) => {
+    switch (userIdProviderKey) {
+      case 'sharedid':
+        if (userIdObjectOrValue.id) {
+          bidData[userIdProviderKey + '_id'] = userIdObjectOrValue.id;
+        }
+        if (userIdObjectOrValue.third) {
+          bidData[userIdProviderKey + '_third'] = userIdObjectOrValue.third;
+        }
+        break;
+      case 'haloId':
+        if (userIdObjectOrValue.haloId) {
+          bidData[userIdProviderKey + 'haloId'] = userIdObjectOrValue.haloId;
+        }
+        if (userIdObjectOrValue.auSeg) {
+          bidData[userIdProviderKey + '_auSeg'] = userIdObjectOrValue.auSeg;
+        }
+        break;
+      case 'parrableId':
+        if (userIdObjectOrValue.eid) {
+          bidData[userIdProviderKey + '_eid'] = userIdObjectOrValue.eid;
+        }
+        break;
+      case 'id5id':
+        if (userIdObjectOrValue.uid) {
+          bidData[userIdProviderKey + '_uid'] = userIdObjectOrValue.uid;
+        }
+        if (userIdObjectOrValue.ext && userIdObjectOrValue.ext.linkType) {
+          bidData[userIdProviderKey + '_linkType'] = userIdObjectOrValue.ext.linkType;
+        }
+        break;
+      case 'uid2':
+        if (userIdObjectOrValue.id) {
+          bidData['eids'] = (bidData['eids'].length > 0)
+            ? (bidData['eids'] + '!' + userIdProviderKey + ',' + userIdObjectOrValue.id)
+            : (userIdProviderKey + ',' + userIdObjectOrValue.id);
+        }
+        break;
+      case 'connectid':
+        if (userIdObjectOrValue) {
+          bidData['eids'] = (bidData['eids'].length > 0)
+            ? (bidData['eids'] + '!verizonMediaId,' + userIdObjectOrValue)
+            : ('verizonMediaId,' + userIdObjectOrValue);
+        }
+        break;
+      case 'flocId':
+        if (userIdObjectOrValue.id) {
+          bidData['cid'] = userIdObjectOrValue.id;
+        }
+        break;
+      default:
+        bidData[userIdProviderKey] = userIdObjectOrValue;
+        break;
+    }
+  });
+
   return bidData;
 }
diff --git a/modules/uid2IdSystem.js b/modules/uid2IdSystem.js
new file mode 100644
index 00000000000..053b57cb76d
--- /dev/null
+++ b/modules/uid2IdSystem.js
@@ -0,0 +1,97 @@
+/**
+ * This module adds uid2 ID support to the User ID module
+ * The {@link module:modules/userId} module is required.
+ * @module modules/uid2IdSystem
+ * @requires module:modules/userId
+ */
+
+import * as utils from '../src/utils.js'
+import {submodule} from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const MODULE_NAME = 'uid2';
+const GVLID = 887;
+const LOG_PRE_FIX = 'UID2: ';
+const ADVERTISING_COOKIE = '__uid2_advertising_token';
+
+function readCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie(ADVERTISING_COOKIE) : null;
+}
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ADVERTISING_COOKIE) : null;
+}
+
+function getStorage() {
+  return getStorageManager(GVLID, MODULE_NAME);
+}
+
+const storage = getStorage();
+
+const logInfo = createLogInfo(LOG_PRE_FIX);
+
+function createLogInfo(prefix) {
+  return function (...strings) {
+    utils.logInfo(prefix + ' ', ...strings);
+  }
+}
+
+/**
+ * Encode the id
+ * @param value
+ * @returns {string|*}
+ */
+function encodeId(value) {
+  const result = {};
+  if (value) {
+    const bidIds = {
+      id: value
+    }
+    result.uid2 = bidIds;
+    logInfo('Decoded value ' + JSON.stringify(result));
+    return result;
+  }
+  return undefined;
+}
+
+/** @type {Submodule} */
+export const uid2IdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+
+  /**
+   * Vendor id of Prebid
+   * @type {Number}
+   */
+  gvlid: GVLID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param {string} value
+   * @returns {{uid2:{ id: string }} or undefined if value doesn't exists
+   */
+  decode(value) {
+    return (value) ? encodeId(value) : undefined;
+  },
+
+  /**
+   * performs action to obtain id and return a value.
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData|undefined} consentData
+   * @returns {uid2Id}
+   */
+  getId(config, consentData) {
+    logInfo('Creating UID 2.0');
+    let value = readCookie() || readFromLocalStorage();
+    logInfo('The advertising token: ' + value);
+    return {id: value}
+  },
+
+};
+
+// Register submodule for userId
+submodule('userId', uid2IdSubmodule);
diff --git a/modules/uid2IdSystem.md b/modules/uid2IdSystem.md
new file mode 100644
index 00000000000..fa596b17584
--- /dev/null
+++ b/modules/uid2IdSystem.md
@@ -0,0 +1,24 @@
+## UID 2.0 User ID Submodule
+
+UID 2.0 ID Module.
+
+### Prebid Params
+
+Individual params may be set for the UID 2.0 Submodule. At least one identifier must be set in the params.
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'uid2'
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the UID 2.0 User ID Module integration.
+
+| Param under userSync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the UID20 module - `"uid2"` | `"uid2"` |
+| value | Optional | Object | Used only if the page has a separate mechanism for storing the UID 2.0 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 | `{"uid2": { "id": "eb33b0cb-8d35-4722-b9c0-1a31d4064888"}}` |
diff --git a/modules/underdogmediaBidAdapter.js b/modules/underdogmediaBidAdapter.js
index 8368077a627..6268774bc12 100644
--- a/modules/underdogmediaBidAdapter.js
+++ b/modules/underdogmediaBidAdapter.js
@@ -120,6 +120,9 @@ export const spec = {
           currency: 'USD',
           netRevenue: false,
           ttl: mid.ttl || 60,
+          meta: {
+            advertiserDomains: mid.advertiser_domains || []
+          }
         };
 
         if (bidResponse.cpm <= 0) {
diff --git a/modules/undertoneBidAdapter.js b/modules/undertoneBidAdapter.js
index 6ead453b622..14a765206b6 100644
--- a/modules/undertoneBidAdapter.js
+++ b/modules/undertoneBidAdapter.js
@@ -2,8 +2,9 @@
  * Adapter to send bids to Undertone
  */
 
-import { parseUrl } from '../src/utils.js';
+import { deepAccess, parseUrl } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
 const BIDDER_CODE = 'undertone';
 const URL = 'https://hb.undertone.com/hb';
@@ -73,6 +74,7 @@ function getBannerCoords(id) {
 
 export const spec = {
   code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
     if (bid && bid.params && bid.params.publisherId) {
       bid.params.publisherId = parseInt(bid.params.publisherId);
@@ -120,8 +122,20 @@ export const spec = {
         sizes: bidReq.sizes,
         params: bidReq.params
       };
+      const videoMediaType = deepAccess(bidReq, 'mediaTypes.video');
+      if (videoMediaType) {
+        bid.video = {
+          playerSize: deepAccess(bidReq, 'mediaTypes.video.playerSize') || null,
+          streamType: deepAccess(bidReq, 'mediaTypes.video.context') || null,
+          playbackMethod: deepAccess(bidReq, 'params.video.playbackMethod') || null,
+          maxDuration: deepAccess(bidReq, 'params.video.maxDuration') || null,
+          skippable: deepAccess(bidReq, 'params.video.skippable') || null
+        };
+        bid.mediaType = 'video';
+      }
       payload['x-ut-hb-params'].push(bid);
     });
+
     return {
       method: 'POST',
       url: reqUrl,
@@ -145,8 +159,14 @@ export const spec = {
             currency: bidRes.currency,
             netRevenue: bidRes.netRevenue,
             ttl: bidRes.ttl || 360,
-            ad: bidRes.ad
+            meta: { advertiserDomains: bidRes.adomain ? bidRes.adomain : [] }
           };
+          if (bidRes.mediaType && bidRes.mediaType === 'video') {
+            bid.vastXml = bidRes.ad;
+            bid.mediaType = bidRes.mediaType;
+          } else {
+            bid.ad = bidRes.ad
+          }
           bids.push(bid);
         }
       });
diff --git a/modules/unicornBidAdapter.js b/modules/unicornBidAdapter.js
index 33e60ad2789..2d4b5b53966 100644
--- a/modules/unicornBidAdapter.js
+++ b/modules/unicornBidAdapter.js
@@ -8,6 +8,7 @@ const BIDDER_CODE = 'unicorn';
 const UNICORN_ENDPOINT = 'https://ds.uncn.jp/pb/0/bid.json';
 const UNICORN_DEFAULT_CURRENCY = 'JPY';
 const UNICORN_PB_COOKIE_KEY = '__pb_unicorn_aud';
+const UNICORN_PB_VERSION = '1.0';
 
 /**
  * Placement ID and Account ID are required.
@@ -47,12 +48,12 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     bidderRequest
   );
   const imp = validBidRequests.map(br => {
-    const sizes = utils.parseSizesInput(br.sizes)[0];
     return {
       id: br.bidId,
       banner: {
-        w: sizes.split('x')[0],
-        h: sizes.split('x')[1]
+        format: makeFormat(br.sizes),
+        w: br.sizes[0][0],
+        h: br.sizes[0][1],
       },
       tagid: utils.deepAccess(br, 'params.placementId') || br.adUnitCode,
       secure: 1,
@@ -84,7 +85,8 @@ function buildOpenRtbBidRequestPayload(validBidRequests, bidderRequest) {
     source: {
       ext: {
         stype: 'prebid_uncn',
-        bidder: BIDDER_CODE
+        bidder: BIDDER_CODE,
+        prebid_version: UNICORN_PB_VERSION
       }
     },
     ext: {
@@ -138,6 +140,14 @@ const getUid = () => {
   }
 };
 
+/**
+ * Make imp.banner.format
+ * @param {Array} arr
+ */
+const makeFormat = arr => arr.map((s) => {
+  return { w: s[0], h: s[1] };
+});
+
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['uncn'],
diff --git a/modules/unifiedIdSystem.js b/modules/unifiedIdSystem.js
index f916030d643..bc033f37992 100644
--- a/modules/unifiedIdSystem.js
+++ b/modules/unifiedIdSystem.js
@@ -18,6 +18,10 @@ export const unifiedIdSubmodule = {
    * @type {string}
    */
   name: MODULE_NAME,
+  /**
+   * required for the gdpr enforcement module
+   */
+  gvlid: 21,
   /**
    * decode the stored id value for passing to bid requests
    * @function
@@ -30,10 +34,11 @@ export const unifiedIdSubmodule = {
   /**
    * performs action to obtain id and return a value in the callback's response argument
    * @function
-   * @param {SubmoduleParams} [configParams]
+   * @param {SubmoduleConfig} [config]
    * @returns {IdResponse|undefined}
    */
-  getId(configParams) {
+  getId(config) {
+    const configParams = (config && config.params) || {};
     if (!configParams || (typeof configParams.partner !== 'string' && typeof configParams.url !== 'string')) {
       utils.logError('User ID - unifiedId submodule requires either partner or url to be defined');
       return;
diff --git a/modules/unrulyBidAdapter.js b/modules/unrulyBidAdapter.js
index 15fe0fefe8b..36a156d5c66 100644
--- a/modules/unrulyBidAdapter.js
+++ b/modules/unrulyBidAdapter.js
@@ -31,6 +31,7 @@ const serverResponseToBid = (bid, rendererInstance) => ({
   netRevenue: true,
   creativeId: bid.bidId,
   ttl: 360,
+  meta: { advertiserDomains: bid && bid.adomain ? bid.adomain : [] },
   currency: 'USD',
   renderer: rendererInstance,
   mediaType: VIDEO
diff --git a/modules/userId/eids.js b/modules/userId/eids.js
index 1261e2ea7d9..2bf1fe895bc 100644
--- a/modules/userId/eids.js
+++ b/modules/userId/eids.js
@@ -5,6 +5,15 @@ const USER_IDS_CONFIG = {
 
   // key-name : {config}
 
+  // intentIqId
+  'intentIqId': {
+    source: 'intentiq.com',
+    atype: 1,
+    getValue: function(data) {
+      return data.RESULT;
+    }
+  },
+
   // pubCommonId
   'pubcid': {
     source: 'pubcid.org',
@@ -24,20 +33,48 @@ const USER_IDS_CONFIG = {
 
   // id5Id
   'id5id': {
+    getValue: function(data) {
+      return data.uid
+    },
     source: 'id5-sync.com',
-    atype: 1
+    atype: 1,
+    getUidExt: function(data) {
+      if (data.ext) {
+        return data.ext;
+      }
+    }
   },
 
   // parrableId
-  'parrableid': {
+  'parrableId': {
     source: 'parrable.com',
-    atype: 1
+    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 = utils.pick(parrableId, [
+        'ibaOptout',
+        'ccpaOptout'
+      ]);
+      if (Object.keys(extendedData).length) {
+        return extendedData;
+      }
+    }
   },
 
   // identityLink
   'idl_env': {
     source: 'liveramp.com',
-    atype: 1
+    atype: 3
   },
 
   // liveIntentId
@@ -46,7 +83,7 @@ const USER_IDS_CONFIG = {
       return data.lipbid;
     },
     source: 'liveintent.com',
-    atype: 1,
+    atype: 3,
     getEidExt: function(data) {
       if (Array.isArray(data.segments) && data.segments.length) {
         return {
@@ -59,7 +96,13 @@ const USER_IDS_CONFIG = {
   // britepoolId
   'britepoolid': {
     source: 'britepool.com',
-    atype: 1
+    atype: 3
+  },
+
+  // dmdId
+  'dmdId': {
+    source: 'hcn.health',
+    atype: 3
   },
 
   // lotamePanoramaId
@@ -68,25 +111,26 @@ const USER_IDS_CONFIG = {
     atype: 1,
   },
 
-  // DigiTrust
-  'digitrustid': {
-    getValue: function (data) {
-      var id = null;
-      if (data && data.data && data.data.id != null) {
-        id = data.data.id;
-      }
-      return id;
-    },
-    source: 'digitru.st',
-    atype: 1
-  },
-
   // criteo
   'criteoId': {
     source: 'criteo.com',
     atype: 1
   },
 
+  // merkleId
+  'merkleId': {
+    source: 'merkleinc.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    },
+    getUidExt: function(data) {
+      return (data && data.keyID) ? {
+        keyID: data.keyID
+      } : undefined;
+    }
+  },
+
   // NetId
   'netId': {
     source: 'netid.de',
@@ -104,6 +148,84 @@ const USER_IDS_CONFIG = {
         third: data.third
       } : undefined;
     }
+  },
+
+  // zeotapIdPlus
+  'IDP': {
+    source: 'zeotap.com',
+    atype: 1,
+    getValue: function getValue(data) {
+      return data.id;
+    }
+  },
+
+  // haloId
+  'haloId': {
+    source: 'audigent.com',
+    atype: 1
+  },
+
+  // quantcastId
+  'quantcastId': {
+    source: 'quantcast.com',
+    atype: 1
+  },
+
+  // nextroll
+  'nextrollId': {
+    source: 'nextroll.com',
+    atype: 1
+  },
+
+  // IDx
+  'idx': {
+    source: 'idx.lat',
+    atype: 1
+  },
+
+  // Verizon Media ConnectID
+  'connectid': {
+    source: 'verizonmedia.com',
+    atype: 3
+  },
+
+  // Neustar Fabrick
+  'fabrickId': {
+    source: 'neustar.biz',
+    atype: 1
+  },
+  // MediaWallah OpenLink
+  'mwOpenLinkId': {
+    source: 'mediawallahscript.com',
+    atype: 1
+  },
+  'tapadId': {
+    source: 'tapad.com',
+    atype: 1
+  },
+  // Novatiq Snowflake
+  'novatiq': {
+    getValue: function(data) {
+      return data.snowflake
+    },
+    source: 'novatiq.com',
+    atype: 1
+  },
+  'uid2': {
+    source: 'uidapi.com',
+    atype: 3,
+    getValue: function(data) {
+      return data.id;
+    }
+  },
+  'deepintentId': {
+    source: 'deepintent.com',
+    atype: 3
+  },
+  // Admixer Id
+  'admixerId': {
+    source: 'admixer.net',
+    atype: 3
   }
 };
 
@@ -144,11 +266,37 @@ export function createEidsArray(bidRequestUserId) {
   let eids = [];
   for (const subModuleKey in bidRequestUserId) {
     if (bidRequestUserId.hasOwnProperty(subModuleKey)) {
-      const eid = createEidObject(bidRequestUserId[subModuleKey], subModuleKey);
-      if (eid) {
-        eids.push(eid);
+      if (subModuleKey === 'pubProvidedId') {
+        eids = eids.concat(bidRequestUserId['pubProvidedId']);
+      } else {
+        const eid = createEidObject(bidRequestUserId[subModuleKey], subModuleKey);
+        if (eid) {
+          eids.push(eid);
+        }
       }
     }
   }
   return eids;
 }
+
+/**
+ * @param {SubmoduleContainer[]} submodules
+ */
+export function buildEidPermissions(submodules) {
+  let eidPermissions = [];
+  submodules.filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .forEach(i => {
+      Object.keys(i.idObj).forEach(key => {
+        if (utils.deepAccess(i, 'config.bidders') && Array.isArray(i.config.bidders) &&
+          utils.deepAccess(USER_IDS_CONFIG, key + '.source')) {
+          eidPermissions.push(
+            {
+              source: USER_IDS_CONFIG[key].source,
+              bidders: i.config.bidders
+            }
+          );
+        }
+      });
+    });
+  return eidPermissions;
+}
diff --git a/modules/userId/eids.md b/modules/userId/eids.md
index 60f450e9328..7b7ce107085 100644
--- a/modules/userId/eids.md
+++ b/modules/userId/eids.md
@@ -1,7 +1,8 @@
 ## Example of eids array generated by UserId Module.
+
 ```
 userIdAsEids = [
-	{
+    {
         source: 'pubcid.org',
         uids: [{
             id: 'some-random-id-value',
@@ -21,10 +22,37 @@ userIdAsEids = [
     },
 
     {
-        source: 'id5-sync.com',
+        source: 'neustar.biz',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
+        },
+        ext: {
+            linkType: 2
+        }]
+    },
+
+    {
+        source: 'id5-sync.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+                linkType: 2,
+                abTestingControlGroup: false
+            }
+        }]
+    },
+
+    {
+        source: 'id5-sync.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+                linkType: 2,
+                abTestingControlGroup: false
+            }
         }]
     },
 
@@ -56,7 +84,7 @@ userIdAsEids = [
     },
 
     {
-        source: 'britepool.com',
+        source: 'merkleinc.com',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
@@ -64,13 +92,21 @@ userIdAsEids = [
     },
 
     {
-        source: 'digitru.st',
+        source: 'britepool.com',
         uids: [{
             id: 'some-random-id-value',
             atype: 1
         }]
     },
 
+    {
+        source: 'hcn.health',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
+    },
+
     {
         source: 'criteo.com',
         uids: [{
@@ -91,10 +127,92 @@ userIdAsEids = [
         uids: [{
             id: 'some-random-id-value',
             atype: 1,
-            ext: { 
+            ext: {
                 third: 'some-random-id-value'
              }
          }]
+    },
+
+    {
+        source: 'zeotap.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'nextroll.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'audigent.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'quantcast.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+
+    {
+        source: 'verizonmedia.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'mediawallahscript.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'tapad.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'novatiq.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+        }]
+    },
+    {
+        source: 'uidapi.com',
+        uids: [{
+            id: 'some-random-id-value',
+             atype: 3
+        }]
+    },
+    {
+        source: 'admixer.net',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
+    },
+    {
+        source: 'deepintent.com',
+        uids: [{
+            id: 'some-random-id-value',
+            atype: 3
+        }]
     }
 ]
 ```
diff --git a/modules/userId/index.js b/modules/userId/index.js
index 4733be2686c..2c93010b2d0 100644
--- a/modules/userId/index.js
+++ b/modules/userId/index.js
@@ -14,7 +14,7 @@
  *  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
- * @param {SubmoduleParams} configParams
+ * @param {SubmoduleConfig} config
  * @param {ConsentData|undefined} consentData
  * @param {(Object|undefined)} cacheIdObj
  * @return {(IdResponse|undefined)} A response object that contains id and/or callback.
@@ -27,7 +27,8 @@
  *  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
- * @param {SubmoduleParams} configParams
+ * @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.
  */
@@ -37,7 +38,7 @@
  * @summary decode a stored value for passing to bid requests
  * @name Submodule#decode
  * @param {Object|string} value
- * @param {SubmoduleParams|undefined} configParams
+ * @param {SubmoduleConfig|undefined} config
  * @return {(Object|undefined)}
  */
 
@@ -48,6 +49,20 @@
  * @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}
+ */
+
 /**
  * @typedef {Object} SubmoduleConfig
  * @property {string} name - the User ID submodule name (used to link submodule with config)
@@ -83,8 +98,10 @@
  * @property {(string|undefined)} publisherId - the unique identifier of the publisher in question
  * @property {(string|undefined)} ajaxTimeout - the number of milliseconds a resolution request can take before automatically being terminated
  * @property {(array|undefined)} identifiersToResolve - the identifiers from either ls|cookie to be attached to the getId query
- * @property {(string|undefined)} providedIdentifierName - defines the name of an identifier that can be found in local storage or in the cookie jar that can be sent along with the getId request. This parameter should be used whenever a customer is able to provide the most stable identifier possible
  * @property {(LiveIntentCollectConfig|undefined)} liCollectConfig - the config for LiveIntent's collect requests
+ * @property {(string|undefined)} pd - publisher provided data for reconciling ID5 IDs
+ * @property {(string|undefined)} emailHash - if provided, the hashed email address of a user
+ * @property {(string|undefined)} notUse3P - use to retrieve envelope from 3p endpoint
  */
 
 /**
@@ -108,22 +125,37 @@
  * @property {(function|undefined)} callback - function that will return an id
  */
 
+/**
+  * @typedef {Object} RefreshUserIdsOptions
+  * @property {(string[]|undefined)} submoduleNames - submodules to refresh
+  */
+
 import find from 'core-js-pure/features/array/find.js';
-import {config} from '../../src/config.js';
+import { config } from '../../src/config.js';
 import events from '../../src/events.js';
 import * as utils from '../../src/utils.js';
-import {getGlobal} from '../../src/prebidGlobal.js';
-import {gdprDataHandler} from '../../src/adapterManager.js';
+import { getGlobal } from '../../src/prebidGlobal.js';
+import { gdprDataHandler } from '../../src/adapterManager.js';
 import CONSTANTS from '../../src/constants.json';
-import {module, hook} from '../../src/hook.js';
-import {createEidsArray} from './eids.js';
+import { module, hook } from '../../src/hook.js';
+import { createEidsArray, buildEidPermissions } from './eids.js';
 import { getCoreStorageManager } from '../../src/storageManager.js';
+import {getPrebidInternal} from '../../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
+import MD5 from 'crypto-js/md5.js';
+import SHA1 from 'crypto-js/sha1.js';
+import SHA256 from 'crypto-js/sha256.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
 const LOCAL_STORAGE = 'html5';
 const DEFAULT_SYNC_DELAY = 500;
 const NO_AUCTION_DELAY = 0;
+const CONSENT_DATA_COOKIE_STORAGE_CONFIG = {
+  name: '_pbjs_userid_consent_data',
+  expires: 30 // 30 days expiration, which should match how often consent is refreshed by CMPs
+};
+export const PBJS_USER_ID_OPTOUT_NAME = '_pbjs_id_optout';
 export const coreStorage = getCoreStorageManager('userid');
 
 /** @type {string[]} */
@@ -138,6 +170,9 @@ let submodules = [];
 /** @type {SubmoduleContainer[]} */
 let initializedSubmodules;
 
+/** @type {boolean} */
+let initializedSubmodulesUpdated = false;
+
 /** @type {SubmoduleConfig[]} */
 let configRegistry = [];
 
@@ -153,23 +188,31 @@ export let syncDelay;
 /** @type {(number|undefined)} */
 export let auctionDelay;
 
+/** @type {(Object|undefined)} */
+let userIdentity;
 /** @param {Submodule[]} submodules */
 export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
 }
 
 /**
- * @param {SubmoduleStorage} storage
+ * @param {SubmoduleContainer} submodule
  * @param {(Object|string)} value
  */
-function setStoredValue(storage, value) {
+export function setStoredValue(submodule, value) {
+  /**
+   * @type {SubmoduleStorage}
+   */
+  const storage = submodule.config.storage;
+  const domainOverride = (typeof submodule.submodule.domainOverride === 'function') ? submodule.submodule.domainOverride() : null;
+
   try {
     const valueStr = utils.isPlainObject(value) ? JSON.stringify(value) : value;
     const expiresStr = (new Date(Date.now() + (storage.expires * (60 * 60 * 24 * 1000)))).toUTCString();
     if (storage.type === COOKIE) {
-      coreStorage.setCookie(storage.name, valueStr, expiresStr, 'Lax');
+      coreStorage.setCookie(storage.name, valueStr, expiresStr, 'Lax', domainOverride);
       if (typeof storage.refreshInSeconds === 'number') {
-        coreStorage.setCookie(`${storage.name}_last`, new Date().toUTCString(), expiresStr);
+        coreStorage.setCookie(`${storage.name}_last`, new Date().toUTCString(), expiresStr, 'Lax', domainOverride);
       }
     } else if (storage.type === LOCAL_STORAGE) {
       coreStorage.setDataInLocalStorage(`${storage.name}_exp`, expiresStr);
@@ -183,6 +226,14 @@ function setStoredValue(storage, value) {
   }
 }
 
+function setPrebidServerEidPermissions(initializedSubmodules) {
+  let setEidPermissions = getPrebidInternal().setEidPermissions;
+  if (typeof setEidPermissions === 'function' && utils.isArray(initializedSubmodules)) {
+    setEidPermissions(buildEidPermissions(initializedSubmodules));
+  }
+}
+
+/**
 /**
  * @param {SubmoduleStorage} storage
  * @param {String|undefined} key optional key of the value
@@ -206,7 +257,7 @@ function getStoredValue(storage, key = undefined) {
       }
     }
     // support storing a string or a stringified object
-    if (typeof storedValue === 'string' && storedValue.charAt(0) === '{') {
+    if (typeof storedValue === 'string' && storedValue.trim().charAt(0) === '{') {
       storedValue = JSON.parse(storedValue);
     }
   } catch (e) {
@@ -215,6 +266,70 @@ function getStoredValue(storage, key = undefined) {
   return storedValue;
 }
 
+/**
+ * makes an object that can be stored with only the keys we need to check.
+ * excluding the vendorConsents object since the consentString is enough to know
+ * if consent has changed without needing to have all the details in an object
+ * @param consentData
+ * @returns {{apiVersion: number, gdprApplies: boolean, consentString: string}}
+ */
+function makeStoredConsentDataHash(consentData) {
+  const storedConsentData = {
+    consentString: '',
+    gdprApplies: false,
+    apiVersion: 0
+  };
+
+  if (consentData) {
+    storedConsentData.consentString = consentData.consentString;
+    storedConsentData.gdprApplies = consentData.gdprApplies;
+    storedConsentData.apiVersion = consentData.apiVersion;
+  }
+
+  return utils.cyrb53Hash(JSON.stringify(storedConsentData));
+}
+
+/**
+ * puts the current consent data into cookie storage
+ * @param consentData
+ */
+export function setStoredConsentData(consentData) {
+  try {
+    const expiresStr = (new Date(Date.now() + (CONSENT_DATA_COOKIE_STORAGE_CONFIG.expires * (60 * 60 * 24 * 1000)))).toUTCString();
+    coreStorage.setCookie(CONSENT_DATA_COOKIE_STORAGE_CONFIG.name, makeStoredConsentDataHash(consentData), expiresStr, 'Lax');
+  } catch (error) {
+    utils.logError(error);
+  }
+}
+
+/**
+ * get the stored consent data from local storage, if any
+ * @returns {string}
+ */
+function getStoredConsentData() {
+  try {
+    return coreStorage.getCookie(CONSENT_DATA_COOKIE_STORAGE_CONFIG.name);
+  } catch (e) {
+    utils.logError(e);
+  }
+}
+
+/**
+ * test if the consent object stored locally matches the current consent data. if they
+ * don't match or there is nothing stored locally, it means a refresh of the user id
+ * submodule is needed
+ * @param storedConsentData
+ * @param consentData
+ * @returns {boolean}
+ */
+function storedConsentDataMatchesConsentData(storedConsentData, consentData) {
+  return (
+    typeof storedConsentData !== 'undefined' &&
+    storedConsentData !== null &&
+    storedConsentData === makeStoredConsentDataHash(consentData)
+  );
+}
+
 /**
  * test if consent module is present, applies, and is valid for local storage or cookies (purpose 1)
  * @param {ConsentData} consentData
@@ -235,21 +350,81 @@ function hasGDPRConsent(consentData) {
   return true;
 }
 
+/**
+   * Find the root domain
+   * @param {string|undefined} fullDomain
+   * @return {string}
+   */
+export function findRootDomain(fullDomain = window.location.hostname) {
+  if (!coreStorage.cookiesAreEnabled()) {
+    return fullDomain;
+  }
+
+  const domainParts = fullDomain.split('.');
+  if (domainParts.length == 2) {
+    return fullDomain;
+  }
+  let rootDomain;
+  let continueSearching;
+  let startIndex = -2;
+  const TEST_COOKIE_NAME = `_rdc${Date.now()}`;
+  const TEST_COOKIE_VALUE = 'writeable';
+  do {
+    rootDomain = domainParts.slice(startIndex).join('.');
+    let expirationDate = new Date(utils.timestamp() + 10 * 1000).toUTCString();
+
+    // Write a test cookie
+    coreStorage.setCookie(
+      TEST_COOKIE_NAME,
+      TEST_COOKIE_VALUE,
+      expirationDate,
+      'Lax',
+      rootDomain,
+      undefined
+    );
+
+    // See if the write was successful
+    const value = coreStorage.getCookie(TEST_COOKIE_NAME, undefined);
+    if (value === TEST_COOKIE_VALUE) {
+      continueSearching = false;
+      // Delete our test cookie
+      coreStorage.setCookie(
+        TEST_COOKIE_NAME,
+        '',
+        'Thu, 01 Jan 1970 00:00:01 GMT',
+        undefined,
+        rootDomain,
+        undefined
+      );
+    } else {
+      startIndex += -1;
+      continueSearching = Math.abs(startIndex) <= domainParts.length;
+    }
+  } while (continueSearching);
+  return rootDomain;
+}
+
 /**
  * @param {SubmoduleContainer[]} submodules
  * @param {function} cb - callback for after processing is done.
  */
 function processSubmoduleCallbacks(submodules, cb) {
-  const done = cb ? utils.delayExecution(cb, submodules.length) : function() { };
-  submodules.forEach(function(submodule) {
+  let done = () => {};
+  if (cb) {
+    done = utils.delayExecution(() => {
+      clearTimeout(timeoutID);
+      cb();
+    }, submodules.length);
+  }
+  submodules.forEach(function (submodule) {
     submodule.callback(function callbackCompleted(idObj) {
       // if valid, id data should be saved to cookie/html storage
       if (idObj) {
         if (submodule.config.storage) {
-          setStoredValue(submodule.config.storage, idObj);
+          setStoredValue(submodule, idObj);
         }
         // cache decoded value (this is copied to every adUnit bid)
-        submodule.idObj = submodule.submodule.decode(idObj);
+        submodule.idObj = submodule.submodule.decode(idObj, submodule.config);
       } else {
         utils.logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
@@ -259,7 +434,6 @@ function processSubmoduleCallbacks(submodules, cb) {
     // clear callback, this prop is used to test if all submodule callbacks are complete below
     submodule.callback = undefined;
   });
-  clearTimeout(timeoutID);
 }
 
 /**
@@ -280,6 +454,26 @@ function getCombinedSubmoduleIds(submodules) {
   return combinedSubmoduleIds;
 }
 
+/**
+ * This function will create a combined object for bidder with allowed subModule Ids
+ * @param {SubmoduleContainer[]} submodules
+ * @param {string} bidder
+ */
+function getCombinedSubmoduleIdsForBidder(submodules, bidder) {
+  if (!Array.isArray(submodules) || !submodules.length || !bidder) {
+    return {};
+  }
+  return submodules
+    .filter(i => !i.config.bidders || !utils.isArray(i.config.bidders) || includes(i.config.bidders, bidder))
+    .filter(i => utils.isPlainObject(i.idObj) && Object.keys(i.idObj).length)
+    .reduce((carry, i) => {
+      Object.keys(i.idObj).forEach(key => {
+        carry[key] = i.idObj[key];
+      });
+      return carry;
+    }, {});
+}
+
 /**
  * @param {AdUnit[]} adUnits
  * @param {SubmoduleContainer[]} submodules
@@ -288,29 +482,39 @@ function addIdDataToAdUnitBids(adUnits, submodules) {
   if ([adUnits].some(i => !Array.isArray(i) || !i.length)) {
     return;
   }
-  const combinedSubmoduleIds = getCombinedSubmoduleIds(submodules);
-  const combinedSubmoduleIdsAsEids = createEidsArray(combinedSubmoduleIds);
-  if (Object.keys(combinedSubmoduleIds).length) {
-    adUnits.forEach(adUnit => {
+  adUnits.forEach(adUnit => {
+    if (adUnit.bids && utils.isArray(adUnit.bids)) {
       adUnit.bids.forEach(bid => {
-        // create a User ID object on the bid,
-        bid.userId = combinedSubmoduleIds;
-        bid.userIdAsEids = combinedSubmoduleIdsAsEids;
+        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);
+        }
       });
-    });
-  }
+    }
+  });
 }
 
 /**
- * This is a common function that will initalize subModules if not already done and it will also execute subModule callbacks
+ * This is a common function that will initialize subModules if not already done and it will also execute subModule callbacks
  */
 function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
   let delayed = false;
 
+  // initializedSubmodulesUpdated - flag to identify if any module has been added from the page post module initialization. This is specifically for OW use case
+  if (initializedSubmodulesUpdated && initializedSubmodules !== undefined) {
+    for (var index in initializedSubmodules) {
+      submodules.push(initializedSubmodules[index]);
+    }
+  }
+
   // initialize submodules only when undefined
-  if (typeof initializedSubmodules === 'undefined') {
+  if (typeof initializedSubmodules === 'undefined' || initializedSubmodulesUpdated) {
+    initializedSubmodulesUpdated = false;
     initializedSubmodules = initSubmodules(submodules, gdprDataHandler.getConsentData());
     if (initializedSubmodules.length) {
+      setPrebidServerEidPermissions(initializedSubmodules);
       // list of submodules that have callbacks that need to be executed
       const submodulesWithCallbacks = initializedSubmodules.filter(item => utils.isFn(item.callback));
 
@@ -319,7 +523,7 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
           // delay auction until ids are available
           delayed = true;
           let continued = false;
-          const continueCallback = function() {
+          const continueCallback = function () {
             if (!continued) {
               continued = true;
               continueAuction();
@@ -336,7 +540,7 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
 
             // when syncDelay is zero, process callbacks now, otherwise delay process with a setTimeout
             if (syncDelay > 0) {
-              setTimeout(function() {
+              setTimeout(function () {
                 processSubmoduleCallbacks(submodulesWithCallbacks);
               }, syncDelay);
             } else {
@@ -364,7 +568,7 @@ function initializeSubmodulesAndExecuteCallbacks(continueAuction) {
  */
 export function requestBidsHook(fn, reqBidsConfigObj) {
   // initialize submodules only when undefined
-  initializeSubmodulesAndExecuteCallbacks(function() {
+  initializeSubmodulesAndExecuteCallbacks(function () {
     // pass available user id data to bid adapters
     addIdDataToAdUnitBids(reqBidsConfigObj.adUnits || getGlobal().adUnits, initializedSubmodules);
     // calling fn allows prebid to continue processing
@@ -392,13 +596,195 @@ function getUserIdsAsEids() {
   return createEidsArray(getCombinedSubmoduleIds(initializedSubmodules));
 }
 
+/**
+* This function will be exposed in the global-name-space so that userIds can be refreshed after initialization.
+* @param {RefreshUserIdsOptions} options
+*/
+function refreshUserIds(options, callback, moduleUpdated) {
+  if (moduleUpdated !== undefined) {
+    initializedSubmodulesUpdated = moduleUpdated;
+  }
+
+  let submoduleNames = options ? options.submoduleNames : null;
+  if (!submoduleNames) {
+    submoduleNames = [];
+  }
+
+  initializeSubmodulesAndExecuteCallbacks(function() {
+    let consentData = gdprDataHandler.getConsentData()
+
+    // gdpr consent with purpose one is required, otherwise exit immediately
+    let {userIdModules, hasValidated} = validateGdprEnforcement(submodules, consentData);
+    if (!hasValidated && !hasGDPRConsent(consentData)) {
+      utils.logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
+      return;
+    }
+
+    // we always want the latest consentData stored, even if we don't execute any submodules
+    const storedConsentData = getStoredConsentData();
+    setStoredConsentData(consentData);
+
+    let callbackSubmodules = [];
+    for (let submodule of userIdModules) {
+      if (submoduleNames.length > 0 &&
+        submoduleNames.indexOf(submodule.submodule.name) === -1) {
+        continue;
+      }
+
+      utils.logInfo(`${MODULE_NAME} - refreshing ${submodule.submodule.name}`);
+      populateSubmoduleId(submodule, consentData, storedConsentData, true);
+
+      if (utils.isFn(submodule.callback)) {
+        callbackSubmodules.push(submodule);
+      }
+    }
+
+    if (callbackSubmodules.length > 0) {
+      processSubmoduleCallbacks(callbackSubmodules);
+    }
+
+    if (callback) {
+      callback();
+    }
+  });
+}
+
+function setUserIdentities(userIdentityData) {
+  userIdentity = userIdentityData;
+};
+
+function getUserIdentities() {
+  return userIdentity;
+}
+
+/**
+ * This function is used to read sso information from facebook and google apis.
+ * @param {String} provider SSO provider for which the api call is to be made
+ * @param {Object} userObject Google's user object, passed from google's callback function
+ */
+function onSSOLogin(data) {
+  var refThis = this;
+  var email;
+  var emailHash = {};
+
+  if (!window.PWT || !window.PWT.ssoEnabled) return;
+
+  switch (data.provider) {
+    case undefined:
+    case 'facebook':
+      var timeout = data.provider === 'facebook' ? 0 : 2000;
+      setTimeout(function() {
+        window.FB && window.FB.getLoginStatus(function (response) {
+          if (response.status === 'connected') {
+            window.PWT = window.PWT || {};
+            window.PWT.fbAt = response.authResponse.accessToken;
+            window.FB && window.FB.api('/me?fields=email&access_token=' + window.PWT.fbAt, function (response) {
+              utils.logInfo('SSO - Data received from FB API');
+
+              if (response.error) {
+                utils.logInfo('SSO - User information could not be retrieved by facebook api [', response.error.message, ']');
+                return;
+              }
+
+              email = response.email || undefined;
+              utils.logInfo('SSO - Information successfully retrieved by Facebook API.');
+              generateEmailHash(email, emailHash);
+              refThis.setUserIdentities({
+                emailHash: emailHash
+              });
+            });
+          } else {
+            utils.logInfo('SSO - Error fetching login information from facebook');
+          }
+        }, true);
+      }, timeout);
+    break;ß
+    case 'google':
+      var profile = data.googleUserObject.getBasicProfile();
+      email = profile.getEmail() || undefined;
+      utils.logInfo('SSO - Information successfully retrieved by Google API');
+      generateEmailHash(email, emailHash);
+      refThis.setUserIdentities({
+        emailHash: emailHash
+      });
+      break;
+  }
+}
+
+/**
+ * This function is used to clear user login information once user logs out.
+ */
+function onSSOLogout() {
+  this.setUserIdentities({});
+}
+
+function generateEmailHash(email, emailHash) {
+  email = email !== undefined ? email.trim().toLowerCase() : '';
+  var regex = new RegExp(/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
+  if (regex.test(email)) {
+    emailHash.MD5 = MD5(email).toString();
+    emailHash.SHA1 = SHA1(email).toString();
+    emailHash.SHA256 = SHA256(email).toString();
+  }
+}
 /**
  * This hook returns updated list of submodules which are allowed to do get user id based on TCF 2 enforcement rules configured
  */
 export const validateGdprEnforcement = hook('sync', function (submodules, consentData) {
-  return {userIdModules: submodules, hasValidated: consentData && consentData.hasValidated};
+  return { userIdModules: submodules, hasValidated: consentData && consentData.hasValidated };
 }, 'validateGdprEnforcement');
 
+function populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh) {
+  // There are two submodule configuration types to handle: storage or value
+  // 1. storage: retrieve user id data from cookie/html storage or with the submodule's getId method
+  // 2. value: pass directly to bids
+  if (submodule.config.storage) {
+    let storedId = getStoredValue(submodule.config.storage);
+    let response;
+
+    let refreshNeeded = false;
+    if (typeof submodule.config.storage.refreshInSeconds === 'number') {
+      const storedDate = new Date(getStoredValue(submodule.config.storage, 'last'));
+      refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > submodule.config.storage.refreshInSeconds * 1000);
+    }
+
+    if (!storedId || refreshNeeded || forceRefresh || !storedConsentDataMatchesConsentData(storedConsentData, consentData)) {
+      // 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, consentData, 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, consentData, storedId);
+    }
+
+    if (utils.isPlainObject(response)) {
+      if (response.id) {
+        // A getId/extendId result assumed to be valid user id data, which should be saved to users local storage or cookies
+        setStoredValue(submodule, response.id);
+        storedId = response.id;
+      }
+
+      if (typeof response.callback === 'function') {
+        // Save async callback to be invoked after auction
+        submodule.callback = response.callback;
+      }
+    }
+
+    if (storedId) {
+      // cache decoded value (this is copied to every adUnit bid)
+      submodule.idObj = submodule.submodule.decode(storedId, submodule.config);
+    }
+  } else if (submodule.config.value) {
+    // cache decoded value (this is copied to every adUnit bid)
+    submodule.idObj = submodule.config.value;
+  } else {
+    const response = submodule.submodule.getId(submodule.config, consentData, undefined);
+    if (utils.isPlainObject(response)) {
+      if (typeof response.callback === 'function') { submodule.callback = response.callback; }
+      if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config); }
+    }
+  }
+}
+
 /**
  * @param {SubmoduleContainer[]} submodules
  * @param {ConsentData} consentData
@@ -406,61 +792,18 @@ export const validateGdprEnforcement = hook('sync', function (submodules, consen
  */
 function initSubmodules(submodules, consentData) {
   // gdpr consent with purpose one is required, otherwise exit immediately
-  let {userIdModules, hasValidated} = validateGdprEnforcement(submodules, consentData);
+  let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
   if (!hasValidated && !hasGDPRConsent(consentData)) {
     utils.logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
     return [];
   }
 
-  return userIdModules.reduce((carry, submodule) => {
-    // There are two submodule configuration types to handle: storage or value
-    // 1. storage: retrieve user id data from cookie/html storage or with the submodule's getId method
-    // 2. value: pass directly to bids
-    if (submodule.config.storage) {
-      let storedId = getStoredValue(submodule.config.storage);
-      let response;
-
-      let refreshNeeded = false;
-      if (typeof submodule.config.storage.refreshInSeconds === 'number') {
-        const storedDate = new Date(getStoredValue(submodule.config.storage, 'last'));
-        refreshNeeded = storedDate && (Date.now() - storedDate.getTime() > submodule.config.storage.refreshInSeconds * 1000);
-      }
-
-      if (!storedId || refreshNeeded) {
-        // No previously saved id.  Request one from submodule.
-        response = submodule.submodule.getId(submodule.config.params, consentData, 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.params, storedId);
-      }
-
-      if (utils.isPlainObject(response)) {
-        if (response.id) {
-          // A getId/extendId result assumed to be valid user id data, which should be saved to users local storage or cookies
-          setStoredValue(submodule.config.storage, response.id);
-          storedId = response.id;
-        }
-
-        if (typeof response.callback === 'function') {
-          // Save async callback to be invoked after auction
-          submodule.callback = response.callback;
-        }
-      }
+  // we always want the latest consentData stored, even if we don't execute any submodules
+  const storedConsentData = getStoredConsentData();
+  setStoredConsentData(consentData);
 
-      if (storedId) {
-        // cache decoded value (this is copied to every adUnit bid)
-        submodule.idObj = submodule.submodule.decode(storedId, submodule.config.params);
-      }
-    } else if (submodule.config.value) {
-      // cache decoded value (this is copied to every adUnit bid)
-      submodule.idObj = submodule.config.value;
-    } else {
-      const response = submodule.submodule.getId(submodule.config.params, consentData, undefined);
-      if (utils.isPlainObject(response)) {
-        if (typeof response.callback === 'function') { submodule.callback = response.callback; }
-        if (response.id) { submodule.idObj = submodule.submodule.decode(response.id, submodule.config.params); }
-      }
-    }
+  return userIdModules.reduce((carry, submodule) => {
+    populateSubmoduleId(submodule, consentData, storedConsentData, false);
     carry.push(submodule);
     return carry;
   }, []);
@@ -513,7 +856,9 @@ function updateSubmodules() {
 
   // find submodule and the matching configuration, if found create and append a SubmoduleContainer
   submodules = addedSubmodules.map(i => {
-    const submoduleConfig = find(configs, j => j.name === i.name);
+    const submoduleConfig = find(configs, j => j.name && j.name.toLowerCase() === i.name.toLowerCase());
+    if (submoduleConfig && i.name !== submoduleConfig.name) submoduleConfig.name = i.name;
+    i.findRootDomain = findRootDomain;
     return submoduleConfig ? {
       submodule: i,
       config: submoduleConfig,
@@ -525,7 +870,7 @@ function updateSubmodules() {
   if (!addedUserIdHook && submodules.length) {
     // priority value 40 will load after consentManagement with a priority of 50
     getGlobal().requestBids.before(requestBidsHook, 40);
-    utils.logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules`);
+    utils.logInfo(`${MODULE_NAME} - usersync config updated for ${submodules.length} submodules: `, submodules.map(a => a.submodule.name));
     addedUserIdHook = true;
   }
 }
@@ -559,19 +904,19 @@ export function init(config) {
   ].filter(i => i !== null);
 
   // exit immediately if opt out cookie or local storage keys exists.
-  if (validStorageTypes.indexOf(COOKIE) !== -1 && (coreStorage.getCookie('_pbjs_id_optout') || coreStorage.getCookie('_pubcid_optout'))) {
+  if (validStorageTypes.indexOf(COOKIE) !== -1 && coreStorage.getCookie(PBJS_USER_ID_OPTOUT_NAME)) {
     utils.logInfo(`${MODULE_NAME} - opt-out cookie found, exit module`);
     return;
   }
-  // _pubcid_optout is checked for compatiblility with pubCommonId
-  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && (coreStorage.getDataFromLocalStorage('_pbjs_id_optout') || coreStorage.getDataFromLocalStorage('_pubcid_optout'))) {
+  if (validStorageTypes.indexOf(LOCAL_STORAGE) !== -1 && coreStorage.getDataFromLocalStorage(PBJS_USER_ID_OPTOUT_NAME)) {
     utils.logInfo(`${MODULE_NAME} - opt-out localStorage found, exit module`);
     return;
   }
+
   // listen for config userSyncs to be set
   config.getConfig(conf => {
-    // Note: support for both 'userSync' and 'usersync' will be deprecated with Prebid.js 3.0
-    const userSync = conf.userSync || conf.usersync;
+    // Note: support for 'usersync' was dropped as part of Prebid.js 4.0
+    const userSync = conf.userSync;
     if (userSync && userSync.userIds) {
       configRegistry = userSync.userIds;
       syncDelay = utils.isNumber(userSync.syncDelay) ? userSync.syncDelay : DEFAULT_SYNC_DELAY;
@@ -583,6 +928,11 @@ export function init(config) {
   // exposing getUserIds function in global-name-space so that userIds stored in Prebid can be used by external codes.
   (getGlobal()).getUserIds = getUserIds;
   (getGlobal()).getUserIdsAsEids = getUserIdsAsEids;
+  (getGlobal()).refreshUserIds = refreshUserIds;
+  (getGlobal()).setUserIdentities = setUserIdentities;
+  (getGlobal()).getUserIdentities = getUserIdentities;
+  (getGlobal()).onSSOLogin = onSSOLogin;
+  (getGlobal()).onSSOLogout = onSSOLogout;
 }
 
 // init config update listener to start the application
diff --git a/modules/userId/userId.md b/modules/userId/userId.md
index 20b140c3900..588199f5ca3 100644
--- a/modules/userId/userId.md
+++ b/modules/userId/userId.md
@@ -11,6 +11,16 @@ pbjs.setConfig({
                 name: "_pubcid",
                 expires: 60
             }
+        }, {
+            name: 'dmdId',
+            storage: {
+                name: 'dmd-dgid',
+                type: 'cookie',
+                expires: 30
+            },
+            params: {
+                api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c', // provided by DMD
+            }
         }, {
             name: "unifiedId",
             params: {
@@ -25,13 +35,13 @@ pbjs.setConfig({
         }, {
             name: "id5Id",
             params: {
-                partner: 173, //Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
-                pd: "some-pd-string" // See https://console.id5.io/docs/public/prebid for details
+                partner: 173,         // Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
+                pd: "some-pd-string"  // See https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5 for details
             },
             storage: {
-                type: "cookie",
+                type: "html5",        // ID5 requires html5
                 name: "id5id",
-                expires: 90, // Expiration of cookies in days
+                expires: 90,          // Expiration in days
                 refreshInSeconds: 8*3600 // User Id cache lifetime in seconds, defaulting to 'expires'
             },
         }, {
@@ -43,7 +53,8 @@ pbjs.setConfig({
         }, {
             name: 'identityLink',
             params: {
-                pid: '999' // Set your real identityLink placement ID here 
+                pid: '999', // Set your real identityLink placement ID here
+                // notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this property is undefined and 3p request will be fired.
             },
             storage: {
                 type: 'cookie',
@@ -53,7 +64,7 @@ pbjs.setConfig({
         }, {
             name: 'liveIntentId',
             params: {
-                publisherId: '7798696' // Set an identifier of a publisher know to your systems 
+                publisherId: '7798696' // Set an identifier of a publisher know to your systems
             },
             storage: {
                 type: 'cookie',
@@ -70,7 +81,62 @@ pbjs.setConfig({
                  name: 'sharedid',
                  expires: 28
               }
-        }],
+        }, {
+             name: 'criteo',
+             storage: {             // It is best not to specify this parameter since the module needs to be called as many times as possible
+                 type: 'cookie',
+                 name: '_criteoId',
+                 expires: 1
+              }
+        }, {
+            name: 'mwOpenLinkId',
+            params: {
+                accountId: 0000,
+                partnerId: 0000,
+                uid: '12345xyz'
+            }
+        },{
+            name: "merkleId",
+            params: {
+                vendor:'sdfg',
+                sv_cid:'dfg',
+                sv_pubid:'xcv',
+                sv_domain:'zxv'
+            },
+            storage: {
+                type: "cookie",
+                name: "merkleId",
+                expires: 30
+            }
+        },{
+            name: 'uid2'
+        }
+        }, {
+              name: 'admixerId',
+              params: {
+                  pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
+                  e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
+                  p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
+              },
+              storage: {
+                  type: 'cookie',
+                  name: '__adm__admixer',
+                  expires: 30
+              }
+        },{
+              name: 'flocId',
+               params: {
+                    token: "Registered token or default sharedid.org token" // Default sharedid.org token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"
+           }
+        },
+	{
+		name: 'quantcastId',
+            storage: {
+                type: 'cookie',
+                expires : 30
+            }
+	}
+	],
         syncDelay: 5000,
         auctionDelay: 1000
     }
@@ -80,7 +146,7 @@ pbjs.setConfig({
 Example showing `localStorage` for user id data for some submodules
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: "unifiedId",
             params: {
@@ -102,7 +168,8 @@ pbjs.setConfig({
         }, {
             name: 'identityLink',
             params: {
-                pid: '999' // Set your real identityLink placement ID here 
+                pid: '999', // Set your real identityLink placement ID here
+                // notUse3P: true // true/false - If you do not want to use 3P endpoint to retrieve envelope. If you do not set this property to true, 3p endpoint will be fired. By default this property is undefined and 3p request will be fired.
             },
             storage: {
                 type: 'html5',
@@ -110,25 +177,93 @@ pbjs.setConfig({
                 expires: 30
             }
         }, {
-             name: 'liveIntentId',
-             params: {
-                 publisherId: '7798696' // Set an identifier of a publisher know to your systems 
-             },
-             storage: {
-                 type: 'html5',
-                 name: '_li_pbid',
-                 expires: 60
-             }
+            name: 'liveIntentId',
+            params: {
+                publisherId: '7798696' // Set an identifier of a publisher know to your systems
+            },
+            storage: {
+                type: 'html5',
+                name: '_li_pbid',
+                expires: 60
+            }
         }, {
-             name: 'sharedId',
+            name: 'sharedId',
             params: {
                   syncTime: 60 // in seconds, default is 24 hours
                },
              storage: {
-                type: 'cookie',
+                type: 'html5',
                 name: 'sharedid',
                 expires: 28
              }
+        }, {
+            name: 'id5Id',
+            params: {
+                partner: 173,         // Set your real ID5 partner ID here for production, please ask for one at https://id5.io/universal-id
+                pd: 'some-pd-string'  // See https://support.id5.io/portal/en/kb/articles/passing-partner-data-to-id5 for details
+            },
+            storage: {
+                type: 'html5',
+                name: 'id5id',
+                expires: 90,          // Expiration in days
+                refreshInSeconds: 8*3600 // User Id cache lifetime in seconds, defaulting to 'expires'
+            },
+        }, {
+                name: 'nextrollId',
+                params: {
+                    partnerId: "1009",         // Set your real NextRoll partner ID here for production
+                }
+        }, {
+             name: 'criteo',
+             storage: {              // It is best not to specify this parameter since the module needs to be called as many times as possible
+                 type: 'html5',
+                 name: '_criteoId',
+                 expires: 1
+             }
+        },{
+            name: "merkleId",
+            params: {
+                vendor:'sdfg',
+                sv_cid:'dfg',
+                sv_pubid:'xcv',
+                sv_domain:'zxv'
+            },
+            storage: {
+                type: "html5",
+                name: "merkleId",
+                expires: 30
+            }
+        }, {
+              name: 'admixerId',
+              params: {
+                  pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
+                  e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
+                  p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
+              },
+              storage: {
+                  type: 'html5',
+                  name: 'admixerId',
+                  expires: 30
+              }
+       },{
+              name: 'flocId',
+               params: {
+               token: "Registered token or default sharedid.org token" // Default sharedid.org token: "A3dHTSoNUMjjERBLlrvJSelNnwWUCwVQhZ5tNQ+sll7y+LkPPVZXtB77u2y7CweRIxiYaGwGXNlW1/dFp8VMEgIAAAB+eyJvcmlnaW4iOiJodHRwczovL3NoYXJlZGlkLm9yZzo0NDMiLCJmZWF0dXJlIjoiSW50ZXJlc3RDb2hvcnRBUEkiLCJleHBpcnkiOjE2MjYyMjA3OTksImlzU3ViZG9tYWluIjp0cnVlLCJpc1RoaXJkUGFydHkiOnRydWV9"
+        }
+        },{
+            name: "deepintentId",
+            storage: {
+                type: "html5",
+                name: "_dpes_id",
+                expires: 90
+            }
+        },{
+            name: "deepintentId",
+            storage: {
+                type: "cookie",
+                name: "_dpes_id",
+                expires: 90
+            }
         }],
         syncDelay: 5000
     }
@@ -138,7 +273,7 @@ pbjs.setConfig({
 Example showing how to configure a `value` object to pass directly to bid adapters
 ```
 pbjs.setConfig({
-    usersync: {
+    userSync: {
         userIds: [{
             name: "pubCommonId",
             value: {
@@ -152,6 +287,14 @@ pbjs.setConfig({
         {
             name: "netId",
             value: { "netId": "fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg" }
+        },
+        {
+            name: "criteo",
+            value: { "criteoId": "wK-fkF8zaEIlMkZMbHl3eFo4NEtoNmZaeXJtYkFjZlVuWjBhcjJMaTRYd3pZNSUyQnlKRHNGRXlpdzdjd3pjVzhjcSUyQmY4eTFzN3VSZjV1ZyUyRlA0U2ZiR0UwN2I4bDZRJTNEJTNE" }
+        },
+        {
+            name: "novatiq",
+            value: { "snowflake": "81b001ec-8914-488c-a96e-8c220d4ee08895ef" }
         }],
         syncDelay: 5000
     }
diff --git a/modules/userIdTargeting.js b/modules/userIdTargeting.js
index 3ed8b2a14b5..e15c9ddaca2 100644
--- a/modules/userIdTargeting.js
+++ b/modules/userIdTargeting.js
@@ -20,14 +20,16 @@ export function userIdTargeting(userIds, config) {
 
   if (!SHARE_WITH_GAM) {
     logInfo(MODULE_NAME + ': Not enabled for ' + GAM);
-  }
-
-  if (window.googletag && isFn(window.googletag.pubads) && hasOwn(window.googletag.pubads(), 'setTargeting') && isFn(window.googletag.pubads().setTargeting)) {
+  } else if (window.googletag && isFn(window.googletag.pubads) && hasOwn(window.googletag.pubads(), 'setTargeting') && isFn(window.googletag.pubads().setTargeting)) {
     GAM_API = window.googletag.pubads().setTargeting;
   } else {
-    SHARE_WITH_GAM = false;
-    logInfo(MODULE_NAME + ': Could not find googletag.pubads().setTargeting API. Not adding User Ids in targeting.')
-    return;
+    window.googletag = window.googletag || {};
+    window.googletag.cmd = window.googletag.cmd || [];
+    GAM_API = function (key, value) {
+      window.googletag.cmd.push(function () {
+        window.googletag.pubads().setTargeting(key, value);
+      });
+    };
   }
 
   Object.keys(userIds).forEach(function(key) {
diff --git a/modules/userIdTargeting.md b/modules/userIdTargeting.md
index f99fd5308b3..340c1b6abf2 100644
--- a/modules/userIdTargeting.md
+++ b/modules/userIdTargeting.md
@@ -8,7 +8,7 @@ pbjs.setConfig({
 
 	// your existing userIds config
 
-	usersync: {
+	userSync: {
 		userIds: [{...}, ...]
 	},
 
diff --git a/modules/validationFpdModule/config.js b/modules/validationFpdModule/config.js
new file mode 100644
index 00000000000..f6adfea70eb
--- /dev/null
+++ b/modules/validationFpdModule/config.js
@@ -0,0 +1,125 @@
+/**
+ * Data type map
+ */
+const TYPES = {
+  string: 'string',
+  object: 'object',
+  number: 'number',
+};
+
+/**
+ * Template to define what ortb2 attributes should be validated
+ * Accepted fields:
+ * -- invalid - {Boolean} if true, field is not valid
+ * -- type - {String} valid data type of field
+ * -- isArray - {Boolean} if true, field must be an array
+ * -- childType - {String} used in conjuction with isArray: true, defines valid type of array indices
+ * -- children - {Object} defines child properties needed to be validated (used only if type: object)
+ * -- required - {Array} array of strings defining any required properties for object (used only if type: object)
+ * -- optoutApplies - {Boolean} if true, optout logic will filter if applicable (currently only applies to user object)
+ */
+export const ORTB_MAP = {
+  imp: {
+    invalid: true
+  },
+  cur: {
+    type: TYPES.object,
+    isArray: true,
+    childType: TYPES.string
+  },
+  device: {
+    type: TYPES.object,
+    children: {
+      w: { type: TYPES.number },
+      h: { type: TYPES.number }
+    }
+  },
+  site: {
+    type: TYPES.object,
+    children: {
+      name: { type: TYPES.string },
+      domain: { type: TYPES.string },
+      page: { type: TYPES.string },
+      ref: { type: TYPES.string },
+      keywords: { type: TYPES.string },
+      search: { type: TYPES.string },
+      cat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      sectioncat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      pagecat: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.string
+      },
+      content: {
+        type: TYPES.object,
+        isArray: false,
+        children: {
+          data: {
+            type: TYPES.object,
+            isArray: true,
+            childType: TYPES.object,
+            required: ['name', 'segment'],
+            children: {
+              segment: {
+                type: TYPES.object,
+                isArray: true,
+                childType: TYPES.object,
+                required: ['id'],
+                children: {
+                  id: { type: TYPES.string }
+                }
+              },
+              name: { type: TYPES.string },
+              ext: { type: TYPES.object },
+            }
+          }
+        }
+      },
+      publisher: {
+        type: TYPES.object,
+        isArray: false
+      },
+    }
+  },
+  user: {
+    type: TYPES.object,
+    children: {
+      yob: {
+        type: TYPES.number,
+        optoutApplies: true
+      },
+      gender: {
+        type: TYPES.string,
+        optoutApplies: true
+      },
+      keywords: { type: TYPES.string },
+      data: {
+        type: TYPES.object,
+        isArray: true,
+        childType: TYPES.object,
+        required: ['name', 'segment'],
+        children: {
+          segment: {
+            type: TYPES.object,
+            isArray: true,
+            childType: TYPES.object,
+            required: ['id'],
+            children: {
+              id: { type: TYPES.string }
+            }
+          },
+          name: { type: TYPES.string },
+          ext: { type: TYPES.object },
+        }
+      }
+    }
+  }
+}
diff --git a/modules/validationFpdModule/index.js b/modules/validationFpdModule/index.js
new file mode 100644
index 00000000000..c23f7e09316
--- /dev/null
+++ b/modules/validationFpdModule/index.js
@@ -0,0 +1,232 @@
+/**
+ * This module sets default values and validates ortb2 first part data
+ * @module modules/firstPartyData
+ */
+import { config } from '../../src/config.js';
+import * as utils from '../../src/utils.js';
+import { ORTB_MAP } from './config.js';
+import { submodule } from '../../src/hook.js';
+import { getStorageManager } from '../../src/storageManager.js';
+
+const STORAGE = getStorageManager();
+let optout;
+
+/**
+ * Check if data passed is empty
+ * @param {*} value to test against
+ * @returns {Boolean} is value empty
+ */
+function isEmptyData(data) {
+  let check = true;
+
+  if (typeof data === 'object' && !utils.isEmpty(data)) {
+    check = false;
+  } else if (typeof data !== 'object' && (utils.isNumber(data) || data)) {
+    check = false;
+  }
+
+  return check;
+}
+
+/**
+ * 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)
+ * @returns {Boolean} is requirements fulfilled
+ */
+function getRequiredData(obj, required, parent, i) {
+  let check = true;
+
+  required.forEach(key => {
+    if (!obj[key] || isEmptyData(obj[key])) {
+      check = false;
+      utils.logWarn(`Filtered ${parent}[] value at index ${i} in ortb2 data: missing required property ${key}`);
+    }
+  });
+
+  return check;
+}
+
+/**
+ * Check if data type is valid
+ * @param {*} value to test against
+ * @param {Object} object containing type definition and if should be array bool
+ * @returns {Boolean} is type fulfilled
+ */
+function typeValidation(data, mapping) {
+  let check = false;
+
+  switch (mapping.type) {
+    case 'string':
+      if (typeof data === 'string') check = true;
+      break;
+    case 'number':
+      if (typeof data === 'number' && isFinite(data)) check = true;
+      break;
+    case 'object':
+      if (typeof data === 'object') {
+        if ((Array.isArray(data) && mapping.isArray) || (!Array.isArray(data) && !mapping.isArray)) check = true;
+      }
+      break;
+  }
+
+  return check;
+}
+
+/**
+ * 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
+ * @returns {Array} validated/filtered data
+ */
+export function filterArrayData(arr, child, path, parent) {
+  arr = arr.filter((index, i) => {
+    let check = typeValidation(index, {type: child.type, isArray: child.isArray});
+
+    if (check && Array.isArray(index) === Boolean(child.isArray)) {
+      return true;
+    }
+
+    utils.logWarn(`Filtered ${parent}[] value at index ${i} in ortb2 data: expected type ${child.type}`);
+  }).filter((index, i) => {
+    let requiredCheck = true;
+    let mapping = utils.deepAccess(ORTB_MAP, path);
+
+    if (mapping && mapping.required) requiredCheck = getRequiredData(index, mapping.required, parent, i);
+
+    if (requiredCheck) return true;
+  }).reduce((result, value, i) => {
+    let typeBool = false;
+    let mapping = utils.deepAccess(ORTB_MAP, path);
+
+    switch (child.type) {
+      case 'string':
+        result.push(value);
+        break;
+      case 'object':
+        if (mapping && mapping.children) {
+          let validObject = validateFpd(value, path + '.children.', parent + '.');
+          if (Object.keys(validObject).length) {
+            let requiredCheck = getRequiredData(validObject, mapping.required, parent, i);
+
+            if (requiredCheck) {
+              result.push(validObject);
+              typeBool = true;
+            }
+          }
+        } else {
+          result.push(value);
+          typeBool = true;
+        }
+        break;
+    }
+
+    if (!typeBool) utils.logWarn(`Filtered ${parent}[] value at index ${i}  in ortb2 data: expected type ${child.type}`);
+
+    return result;
+  }, []);
+
+  return arr;
+}
+
+/**
+ * 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
+ * @returns {Object} validated/filtered data
+ */
+export function validateFpd(fpd, path = '', parent = '') {
+  if (!fpd) return {};
+
+  // Filter out imp property if exists
+  let validObject = Object.assign({}, Object.keys(fpd).filter(key => {
+    let mapping = utils.deepAccess(ORTB_MAP, path + key);
+
+    if (!mapping || !mapping.invalid) return key;
+
+    utils.logWarn(`Filtered ${parent}${key} property in ortb2 data: invalid property`);
+  }).filter(key => {
+    let mapping = utils.deepAccess(ORTB_MAP, path + key);
+    // let typeBool = false;
+    let typeBool = (mapping) ? typeValidation(fpd[key], {type: mapping.type, isArray: mapping.isArray}) : true;
+
+    if (typeBool || !mapping) return key;
+
+    utils.logWarn(`Filtered ${parent}${key} property in ortb2 data: expected type ${(mapping.isArray) ? 'array' : mapping.type}`);
+  }).reduce((result, key) => {
+    let mapping = utils.deepAccess(ORTB_MAP, path + key);
+    let modified = {};
+
+    if (mapping) {
+      if (mapping.optoutApplies && optout) {
+        utils.logWarn(`Filtered ${parent}${key} data: pubcid optout found`);
+        return result;
+      }
+
+      modified = (mapping.type === 'object' && !mapping.isArray)
+        ? validateFpd(fpd[key], path + key + '.children.', parent + key + '.')
+        : (mapping.isArray && mapping.childType)
+          ? filterArrayData(fpd[key], { type: mapping.childType, isArray: mapping.childisArray }, path + key, parent + key) : fpd[key];
+
+      // Check if modified data has data and return
+      (!isEmptyData(modified)) ? result[key] = modified
+        : utils.logWarn(`Filtered ${parent}${key} property in ortb2 data: empty data found`);
+    } else {
+      result[key] = fpd[key];
+    }
+
+    return result;
+  }, {}));
+
+  // Return validated data
+  return validObject;
+}
+
+/**
+ * Run validation on global and bidder config data for ortb2
+ */
+function runValidations(data) {
+  let conf = validateFpd(data);
+
+  let bidderDuplicate = { ...config.getBidderConfig() };
+
+  Object.keys(bidderDuplicate).forEach(bidder => {
+    let modConf = Object.keys(bidderDuplicate[bidder]).reduce((res, key) => {
+      let valid = (key !== 'ortb2') ? bidderDuplicate[bidder][key] : validateFpd(bidderDuplicate[bidder][key]);
+
+      if (valid) res[key] = valid;
+
+      return res;
+    }, {});
+
+    if (Object.keys(modConf).length) config.setBidderConfig({ bidders: [bidder], config: modConf });
+  });
+
+  return conf;
+}
+
+/**
+ * Sets default values to ortb2 if exists and adds currency and ortb2 setConfig callbacks on init
+ */
+export function initSubmodule(fpdConf, data) {
+  // Checks for existsnece of pubcid optout cookie/storage
+  // if exists, filters user data out
+  optout = (STORAGE.cookiesAreEnabled() && STORAGE.getCookie('_pubcid_optout')) ||
+    (STORAGE.hasLocalStorage() && STORAGE.getDataFromLocalStorage('_pubcid_optout'));
+
+  return (!fpdConf.skipValidations) ? runValidations(data) : data;
+}
+
+/** @type {firstPartyDataSubmodule} */
+export const validationSubmodule = {
+  name: 'validation',
+  queue: 1,
+  init: initSubmodule
+}
+
+submodule('firstPartyData', validationSubmodule)
diff --git a/modules/vdoaiBidAdapter.js b/modules/vdoaiBidAdapter.js
index 395953fb737..92d665887a5 100644
--- a/modules/vdoaiBidAdapter.js
+++ b/modules/vdoaiBidAdapter.js
@@ -1,14 +1,14 @@
 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';
+import {BANNER, VIDEO} from '../src/mediaTypes.js';
 
-const BIDDER_CODE = 'vdo.ai';
+const BIDDER_CODE = 'vdoai';
 const ENDPOINT_URL = 'https://prebid.vdo.ai/auction';
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
+  supportedMediaTypes: [BANNER, VIDEO],
   /**
    * Determines whether or not the given bid request is valid.
    *
@@ -30,17 +30,16 @@ export const spec = {
     if (validBidRequests.length === 0) {
       return [];
     }
+
     return validBidRequests.map(bidRequest => {
-      const sizes = utils.parseSizesInput(bidRequest.params.size || bidRequest.sizes)[0];
-      const width = sizes.split('x')[0];
-      const height = sizes.split('x')[1];
+      const sizes = utils.getAdUnitSizes(bidRequest);
       const payload = {
         placementId: bidRequest.params.placementId,
-        width: width,
-        height: height,
+        sizes: sizes,
         bidId: bidRequest.bidId,
         referer: bidderRequest.refererInfo.referer,
-        id: bidRequest.auctionId
+        id: bidRequest.auctionId,
+        mediaType: bidRequest.mediaTypes.video ? 'video' : 'banner'
       };
       bidRequest.params.bidFloor && (payload['bidFloor'] = bidRequest.params.bidFloor);
       return {
@@ -63,9 +62,9 @@ export const spec = {
     const response = serverResponse.body;
     const creativeId = response.adid || 0;
     // const width = response.w || 0;
-    const width = bidRequest.data.width;
+    const width = response.width;
     // const height = response.h || 0;
-    const height = bidRequest.data.height;
+    const height = response.height;
     const cpm = response.price || 0;
 
     response.rWidth = width;
@@ -90,8 +89,15 @@ export const spec = {
         ttl: config.getConfig('_bidderTimeout'),
         // referrer: referrer,
         // ad: response.adm
-        ad: adCreative
+        // ad: adCreative,
+        mediaType: response.mediaType
       };
+
+      if (response.mediaType == 'video') {
+        bidResponse.vastXml = adCreative;
+      } else {
+        bidResponse.ad = adCreative;
+      }
       bidResponses.push(bidResponse);
     }
     return bidResponses;
diff --git a/modules/vdoaiBidAdapter.md b/modules/vdoaiBidAdapter.md
index 81bd8e69c1d..04200cc9be0 100644
--- a/modules/vdoaiBidAdapter.md
+++ b/modules/vdoaiBidAdapter.md
@@ -22,13 +22,36 @@ Module that connects to VDO.AI's demand sources
             },
             bids: [
                 {
-                    bidder: "vdo.ai",
+                    bidder: "vdoai",
                     params: {
-                        placement: 'newsdv77',
+                        placementId: 'newsdv77',
                         bidFloor: 0.01  // Optional
                     }
                 }
             ]
         }
     ];
+```
+
+
+# Video Test Parameters
+```
+var videoAdUnit = {
+  code: 'test-div',
+  sizes: [[640, 480]],
+  mediaTypes: {
+    video: {
+      playerSize: [[640, 480]],
+      context: 'instream'
+    },
+  },
+  bids: [
+    {
+        bidder: "vdoai",
+        params: {
+            placementId: 'newsdv77'
+        }
+    }
+  ]
+};
 ```
\ No newline at end of file
diff --git a/modules/verizonMediaIdSystem.js b/modules/verizonMediaIdSystem.js
new file mode 100644
index 00000000000..ca395087d2d
--- /dev/null
+++ b/modules/verizonMediaIdSystem.js
@@ -0,0 +1,105 @@
+/**
+ * This module adds verizonMediaId to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/verizonMediaIdSystem
+ * @requires module:modules/userId
+ */
+
+import {ajax} from '../src/ajax.js';
+import {submodule} from '../src/hook.js';
+import * as utils from '../src/utils.js';
+import includes from 'core-js-pure/features/array/includes.js';
+
+const MODULE_NAME = 'verizonMediaId';
+const VENDOR_ID = 25;
+const PLACEHOLDER = '__PIXEL_ID__';
+const VMCID_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PLACEHOLDER}/fed`;
+
+function isEUConsentRequired(consentData) {
+  return !!(consentData && consentData.gdpr && consentData.gdpr.gdprApplies);
+}
+
+/** @type {Submodule} */
+export const verizonMediaIdSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: MODULE_NAME,
+  /**
+   * Vendor id of Verizon Media EMEA Limited
+   * @type {Number}
+   */
+  gvlid: VENDOR_ID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @returns {{connectid: string} | undefined}
+   */
+  decode(value) {
+    return (typeof value === 'object' && (value.connectid || value.vmuid))
+      ? {connectid: value.connectid || value.vmuid} : undefined;
+  },
+  /**
+   * Gets the Verizon Media Connect ID
+   * @function
+   * @param {SubmoduleConfig} [config]
+   * @param {ConsentData} [consentData]
+   * @returns {IdResponse|undefined}
+   */
+  getId(config, consentData) {
+    const params = config.params || {};
+    if (!params || typeof params.he !== 'string' ||
+        (typeof params.pixelId === 'undefined' && typeof params.endpoint === 'undefined')) {
+      utils.logError('The verizonMediaId submodule requires the \'he\' and \'pixelId\' parameters to be defined.');
+      return;
+    }
+
+    const data = {
+      '1p': includes([1, '1', true], params['1p']) ? '1' : '0',
+      he: params.he,
+      gdpr: isEUConsentRequired(consentData) ? '1' : '0',
+      gdpr_consent: isEUConsentRequired(consentData) ? consentData.gdpr.consentString : '',
+      us_privacy: consentData && consentData.uspConsent ? consentData.uspConsent : ''
+    };
+
+    if (params.pixelId) {
+      data.pixelId = params.pixelId
+    }
+
+    const resp = function (callback) {
+      const callbacks = {
+        success: response => {
+          let responseObj;
+          if (response) {
+            try {
+              responseObj = JSON.parse(response);
+            } catch (error) {
+              utils.logError(error);
+            }
+          }
+          callback(responseObj);
+        },
+        error: error => {
+          utils.logError(`${MODULE_NAME}: ID fetch encountered an error`, error);
+          callback();
+        }
+      };
+      const endpoint = VMCID_ENDPOINT.replace(PLACEHOLDER, params.pixelId);
+      let url = `${params.endpoint || endpoint}?${utils.formatQS(data)}`;
+      verizonMediaIdSubmodule.getAjaxFn()(url, callbacks, null, {method: 'GET', withCredentials: true});
+    };
+    return {callback: resp};
+  },
+
+  /**
+   * Return the function used to perform XHR calls.
+   * Utilised for each of testing.
+   * @returns {Function}
+   */
+  getAjaxFn() {
+    return ajax;
+  }
+};
+
+submodule('userId', verizonMediaIdSubmodule);
diff --git a/modules/verizonMediaSystemId.md b/modules/verizonMediaSystemId.md
new file mode 100644
index 00000000000..c0d315dc754
--- /dev/null
+++ b/modules/verizonMediaSystemId.md
@@ -0,0 +1,33 @@
+## Verizon Media User ID Submodule
+
+Verizon Media User ID Module.
+
+### Prebid Params
+
+```
+pbjs.setConfig({
+    userSync: {
+        userIds: [{
+            name: 'verizonMediaId',
+            storage: {
+                name: 'vmcid',
+                type: 'html5',
+                expires: 15
+            },
+            params: {
+                pixelId: 58776,
+                he: '0bef996248d63cea1529cb86de31e9547a712d9f380146e98bbd39beec70355a'
+            }
+        }]
+    }
+});
+```
+## Parameter Descriptions for the `usersync` Configuration Section
+The below parameters apply only to the Verizon Media User ID Module integration.
+
+| Param under usersync.userIds[] | Scope | Type | Description | Example |
+| --- | --- | --- | --- | --- |
+| name | Required | String | ID value for the Verizon Media module - `"verizonMediaId"` | `"verizonMediaId"` |
+| params | Required | Object | Data for Verizon Media ID initialization. | |
+| params.pixelId | Required | Number | The Verizon Media supplied publisher specific pixel Id  | `8976` |
+| params.he | Required | String | The SHA-256 hashed user email address | `"529cb86de31e9547a712d9f380146e98bbd39beec"` |
diff --git a/modules/vidazooBidAdapter.js b/modules/vidazooBidAdapter.js
index 3eea270dc8d..4ad504ab3d9 100644
--- a/modules/vidazooBidAdapter.js
+++ b/modules/vidazooBidAdapter.js
@@ -1,20 +1,17 @@
 import * as utils from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
 import { BANNER } from '../src/mediaTypes.js';
+import { getStorageManager } from '../src/storageManager.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 INTERNAL_SYNC_TYPE = {
-  IFRAME: 'iframe',
-  IMAGE: 'img'
-};
-const EXTERNAL_SYNC_TYPE = {
-  IFRAME: 'iframe',
-  IMAGE: 'image'
-};
+const DEAL_ID_EXPIRY = 1000 * 60 * 15;
+const UNIQUE_DEAL_ID_EXPIRY = 1000 * 60 * 15;
+const SESSION_ID_KEY = 'vidSid';
 export const SUPPORTED_ID_SYSTEMS = {
   'britepoolid': 1,
   'criteoId': 1,
@@ -23,25 +20,43 @@ export const SUPPORTED_ID_SYSTEMS = {
   'idl_env': 1,
   'lipb': 1,
   'netId': 1,
-  'parrableid': 1,
+  'parrableId': 1,
   'pubcid': 1,
   'tdid': 1,
 };
+const storage = getStorageManager(GVLID);
 
 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 !!(params.cId && params.pId);
+  return !!(extractCID(params) && extractPID(params));
 }
 
 function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
   const { params, bidId, userId, adUnitCode } = bid;
-  const { bidFloor, cId, pId, ext, subDomain } = params;
+  const { bidFloor, ext } = params;
   const hashUrl = hashCode(topWindowUrl);
   const dealId = getNextDealId(hashUrl);
+  const uniqueDealId = getUniqueDealId(hashUrl);
+  const sId = getVidazooSessionId();
+  const cId = extractCID(params);
+  const pId = extractPID(params);
+  const subDomain = extractSubDomain(params);
 
   let data = {
     url: encodeURIComponent(topWindowUrl),
@@ -50,8 +65,10 @@ function buildRequest(bid, topWindowUrl, sizes, bidderRequest) {
     bidId: bidId,
     adUnitCode: adUnitCode,
     publisherId: pId,
+    sessionId: sId,
     sizes: sizes,
     dealId: dealId,
+    uniqueDealId: uniqueDealId,
     bidderVersion: BIDDER_VERSION,
     prebidVersion: '$prebid.version$',
     res: `${screen.width}x${screen.height}`
@@ -96,6 +113,12 @@ function appendUserIdsToRequestPayload(payloadRef, userIds) {
         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;
       }
@@ -147,42 +170,27 @@ function interpretResponse(serverResponse, request) {
   }
 }
 
-function getUserSyncs(syncOptions, responses) {
+function getUserSyncs(syncOptions, responses, gdprConsent = {}, uspConsent = '') {
+  let syncs = [];
   const { iframeEnabled, pixelEnabled } = syncOptions;
-
+  const { gdprApplies, consentString = '' } = gdprConsent;
+  const params = `?gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${encodeURIComponent(consentString || '')}&us_privacy=${encodeURIComponent(uspConsent || '')}`
   if (iframeEnabled) {
-    return [{
+    syncs.push({
       type: 'iframe',
-      url: 'https://static.cootlogix.com/basev/sync/user_sync.html'
-    }];
+      url: `https://prebid.cootlogix.com/api/sync/iframe/${params}`
+    });
   }
-
   if (pixelEnabled) {
-    const lookup = {};
-    const syncs = [];
-    responses.forEach(response => {
-      const { body } = response;
-      const results = body ? body.results || [] : [];
-      results.forEach(result => {
-        (result.cookies || []).forEach(cookie => {
-          if (cookie.type === INTERNAL_SYNC_TYPE.IMAGE) {
-            if (pixelEnabled && !lookup[cookie.src]) {
-              syncs.push({
-                type: EXTERNAL_SYNC_TYPE.IMAGE,
-                url: cookie.src
-              });
-            }
-          }
-        });
-      });
+    syncs.push({
+      type: 'image',
+      url: `https://prebid.cootlogix.com/api/sync/image/${params}`
     });
-    return syncs;
   }
-
-  return [];
+  return syncs;
 }
 
-function hashCode(s, prefix = '_') {
+export function hashCode(s, prefix = '_') {
   const l = s.length;
   let h = 0
   let i = 0;
@@ -192,37 +200,72 @@ function hashCode(s, prefix = '_') {
   return prefix + h;
 }
 
-function getNextDealId(key) {
+export function getNextDealId(key, expiry = DEAL_ID_EXPIRY) {
   try {
-    const currentValue = Number(getStorageItem(key) || 0);
+    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);
+    setStorageItem(key, nextValue, timestamp);
     return nextValue;
   } catch (e) {
     return 0;
   }
 }
 
-function getStorage() {
-  return window['sessionStorage'];
+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) || '';
 }
 
-function getStorageItem(key) {
+export function getStorageItem(key) {
   try {
-    return getStorage().getItem(key);
-  } catch (e) {
-    return null;
-  }
+    return tryParseJSON(storage.getDataFromLocalStorage(key));
+  } catch (e) { }
+
+  return null;
 }
 
-function setStorageItem(key, value) {
+export function setStorageItem(key, value, timestamp) {
   try {
-    getStorage().setItem(key, String(value));
+    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,
+  gvlid: GVLID,
   version: BIDDER_VERSION,
   supportedMediaTypes: [BANNER],
   isBidRequestValid,
diff --git a/modules/viewdeosDXBidAdapter.js b/modules/viewdeosDXBidAdapter.js
index 52894ef2dd9..212759642f5 100644
--- a/modules/viewdeosDXBidAdapter.js
+++ b/modules/viewdeosDXBidAdapter.js
@@ -13,6 +13,7 @@ const DISPLAY = 'display';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['viewdeos'],
+  gvlid: 924,
   supportedMediaTypes: [VIDEO, BANNER],
   isBidRequestValid: function (bid) {
     return !!utils.deepAccess(bid, 'params.aid');
@@ -189,7 +190,10 @@ function createBid(bidResponse, mediaType, bidderParams) {
     cpm: bidResponse.cpm,
     netRevenue: true,
     mediaType,
-    ttl: 3600
+    ttl: 3600,
+    meta: {
+      advertiserDomains: bidResponse.adomain || []
+    }
   };
 
   if (mediaType === DISPLAY) {
diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
index 511e658c947..7d124864bc6 100644
--- a/modules/visxBidAdapter.js
+++ b/modules/visxBidAdapter.js
@@ -1,11 +1,17 @@
 import * as utils from '../src/utils.js';
-import {registerBidder} from '../src/adapters/bidderFactory.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';
+const { parseSizesInput, getKeys, logError, deepAccess } = utils;
 const BIDDER_CODE = 'visx';
-const ENDPOINT_URL = 'https://t.visx.net/hb';
+const GVLID = 154;
+const BASE_URL = 'https://t.visx.net';
+const ENDPOINT_URL = BASE_URL + '/hb';
 const TIME_TO_LIVE = 360;
 const DEFAULT_CUR = 'EUR';
-const ADAPTER_SYNC_URL = 'https://t.visx.net/push_sync';
+const ADAPTER_SYNC_URL = BASE_URL + '/push_sync';
+const TRACK_TIMEOUT_URL = BASE_URL + '/track/bid_timeout';
 const LOG_ERROR_MESS = {
   noAuid: 'Bid from response has no auid parameter - ',
   noAdm: 'Bid from response has no adm parameter - ',
@@ -17,12 +23,25 @@ const LOG_ERROR_MESS = {
   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 - '
+  currencyMismatch: 'Currency from the request is not match currency from the response - ',
+  onlyVideoInstream: `Only video ${VIDEO_INSTREAM} supported`,
+  videoMissing: 'Bid request videoType property is missing - '
 };
 const currencyWhiteList = ['EUR', 'USD', 'GBP', 'PLN'];
+const RE_EMPTY_OR_ONLY_COMMAS = /^,*$/;
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bid) {
+    if (_isVideoBid(bid)) {
+      if (!_isValidVideoBid(bid, true)) {
+        // in case if video bid configuration invalid will try to send bid request for banner
+        if (!_isBannerBid(bid)) {
+          return false;
+        }
+      }
+    }
     return !!bid.params.uid;
   },
   buildRequests: function(validBidRequests, bidderRequest) {
@@ -38,9 +57,10 @@ export const spec = {
     let reqId;
     let payloadSchain;
     let payloadUserId;
+    const videoTypes = _initVideoTypes(bids);
 
     if (currencyWhiteList.indexOf(currency) === -1) {
-      utils.logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
+      logError(LOG_ERROR_MESS.notAllowedCurrency + currency);
       return;
     }
 
@@ -54,7 +74,7 @@ export const spec = {
       if (!payloadUserId && userId) {
         payloadUserId = userId;
       }
-      const sizesId = utils.parseSizesInput(bid.sizes);
+      const sizesId = parseSizesInput(bid.sizes);
 
       if (!slotsMapByUid[uid]) {
         slotsMapByUid[uid] = {};
@@ -85,11 +105,12 @@ export const spec = {
     const payload = {
       pt: 'net',
       auids: auids.join(','),
-      sizes: utils.getKeys(sizeMap).join(','),
+      sizes: getKeys(sizeMap).join(','),
       r: reqId,
       cur: currency,
       wrapperType: 'Prebid_js',
-      wrapperVersion: '$prebid.version$'
+      wrapperVersion: '$prebid.version$',
+      ...videoTypes
     };
 
     if (payloadSchain) {
@@ -100,8 +121,8 @@ export const spec = {
       if (payloadUserId.tdid) {
         payload.tdid = payloadUserId.tdid;
       }
-      if (payloadUserId.id5id) {
-        payload.id5 = payloadUserId.id5id;
+      if (payloadUserId.id5id && payloadUserId.id5id.uid) {
+        payload.id5 = payloadUserId.id5id.uid;
       }
       if (payloadUserId.digitrustid && payloadUserId.digitrustid.data && payloadUserId.digitrustid.data.id) {
         payload.dtid = payloadUserId.digitrustid.data.id;
@@ -151,7 +172,7 @@ export const spec = {
         _addBidResponse(serverBid, bidsMap, currency, bidResponses);
       });
     }
-    if (errorMessage) utils.logError(errorMessage);
+    if (errorMessage) logError(errorMessage);
     return bidResponses;
   },
   getUserSyncs: function(syncOptions, serverResponses, gdprConsent) {
@@ -170,16 +191,32 @@ export const spec = {
         url: ADAPTER_SYNC_URL + (query.length ? '?' + query.join('&') : '')
       }];
     }
+  },
+  onSetTargeting: function(bid) {
+    // Call '/track/pending' with the corresponding bid.requestId
+    if (bid.ext && bid.ext.events && bid.ext.events.pending) {
+      utils.triggerPixel(bid.ext.events.pending);
+    }
+  },
+  onBidWon: function(bid) {
+    // Call '/track/win' with the corresponding bid.requestId
+    if (bid.ext && bid.ext.events && bid.ext.events.win) {
+      utils.triggerPixel(bid.ext.events.win);
+    }
+  },
+  onTimeout: function(timeoutData) {
+    // Call '/track/bid_timeout' with timeout data
+    utils.triggerPixel(TRACK_TIMEOUT_URL + '?data=' + JSON.stringify(timeoutData));
   }
 };
 
 function _getBidFromResponse(respItem) {
   if (!respItem) {
-    utils.logError(LOG_ERROR_MESS.emptySeatbid);
+    logError(LOG_ERROR_MESS.emptySeatbid);
   } else if (!respItem.bid) {
-    utils.logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
+    logError(LOG_ERROR_MESS.hasNoArrayOfBids + JSON.stringify(respItem));
   } else if (!respItem.bid[0]) {
-    utils.logError(LOG_ERROR_MESS.noBid);
+    logError(LOG_ERROR_MESS.noBid);
   }
   return respItem && respItem.bid && respItem.bid[0];
 }
@@ -201,7 +238,7 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithout
           const slot = awaitingBids[sizeId][0];
 
           const bid = slot.bids.shift();
-          bidResponses.push({
+          const bidResponse = {
             requestId: bid.bidId,
             cpm: serverBid.price,
             width: serverBid.w,
@@ -210,9 +247,25 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithout
             currency: reqCurrency,
             netRevenue: true,
             ttl: TIME_TO_LIVE,
-            ad: serverBid.adm,
-            dealId: serverBid.dealid
-          });
+            dealId: serverBid.dealid,
+            meta: {
+              advertiserDomains: serverBid.advertiserDomains ? serverBid.advertiserDomains : [],
+              mediaType: serverBid.mediaType
+            },
+          };
+
+          if (serverBid.ext && serverBid.ext.prebid) {
+            bidResponse.ext = serverBid.ext.prebid;
+          }
+
+          if (!_isVideoBid(bid)) {
+            bidResponse.ad = serverBid.adm;
+          } else {
+            bidResponse.vastXml = serverBid.adm;
+            bidResponse.mediaType = 'video';
+          }
+
+          bidResponses.push(bidResponse);
 
           if (!slot.bids.length) {
             slot.parents.forEach(({parent, key, uid}) => {
@@ -222,7 +275,7 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithout
               }
               if (!parent[key].length) {
                 delete parent[key];
-                if (!utils.getKeys(parent).length) {
+                if (!getKeys(parent).length) {
                   delete bidsMap[uid];
                 }
               }
@@ -237,8 +290,116 @@ function _addBidResponse(serverBid, bidsMap, currency, bidResponses, bidsWithout
     }
   }
   if (errorMessage) {
-    utils.logError(errorMessage);
+    logError(errorMessage);
+  }
+}
+
+function _isVideoBid(bid) {
+  return bid.mediaType === VIDEO || deepAccess(bid, 'mediaTypes.video');
+}
+
+function _isBannerBid(bid) {
+  return bid.mediaType === BANNER || deepAccess(bid, 'mediaTypes.banner');
+}
+
+function _isValidVideoBid(bid, logErrors = false) {
+  let result = true;
+  const videoMediaType = deepAccess(bid, 'mediaTypes.video');
+  if (videoMediaType.context !== VIDEO_INSTREAM) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.onlyVideoInstream);
+    }
+    result = false;
   }
+  if (!(videoMediaType.playerSize && parseSizesInput(deepAccess(videoMediaType, 'playerSize', [])))) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.videoMissing + 'playerSize');
+    }
+    result = false;
+  }
+  if (!videoMediaType.mimes) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.videoMissing + 'mimes');
+    }
+    result = false;
+  }
+  if (!videoMediaType.protocols) {
+    if (logErrors) {
+      logError(LOG_ERROR_MESS.videoMissing + 'protocols');
+    }
+    result = false;
+  }
+  return result;
+}
+
+function _initVideoTypes(bids) {
+  const result = {};
+  let _playerSize = [];
+  let _protocols = [];
+  let _api = [];
+  let _mimes = [];
+  let _minduration = [];
+  let _maxduration = [];
+  let _skip = [];
+  if (bids && bids.length) {
+    bids.forEach(function (bid) {
+      const mediaTypes = deepAccess(bid, 'mediaTypes.video', {});
+      let bidPlayerSize = '';
+      let bidProtocols = '';
+      let bidApi = '';
+      let bidMimes = '';
+      let bidMinduration = null;
+      let bidMaxduration = null;
+      let bidSkip = null;
+      if (_isVideoBid(bid) && _isValidVideoBid(bid)) {
+        bidPlayerSize = parseSizesInput(deepAccess(mediaTypes, 'playerSize', [])).join('|');
+        bidProtocols = deepAccess(mediaTypes, 'protocols', []).join('|');
+        bidApi = deepAccess(mediaTypes, 'api', []).join('|');
+        bidMimes = deepAccess(mediaTypes, 'mimes', []).join('|');
+        bidMinduration = deepAccess(mediaTypes, 'minduration', null);
+        bidMaxduration = deepAccess(mediaTypes, 'maxduration', null);
+        bidSkip = deepAccess(mediaTypes, 'skip', null);
+      }
+      _playerSize.push(bidPlayerSize);
+      _protocols.push(bidProtocols);
+      _api.push(bidApi);
+      _mimes.push(bidMimes);
+      _minduration.push(bidMinduration);
+      _maxduration.push(bidMaxduration);
+      _skip.push(bidSkip);
+    });
+  }
+  _playerSize = _playerSize.join(',');
+  _protocols = _protocols.join(',');
+  _api = _api.join(',');
+  _mimes = _mimes.join(',');
+  _minduration = _minduration.join(',');
+  _maxduration = _maxduration.join(',');
+  _skip = _skip.join(',');
+
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_playerSize)) {
+    result.playerSize = _playerSize;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_protocols)) {
+    result.protocols = _protocols;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_api)) {
+    result.api = _api;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_mimes)) {
+    result.mimes = _mimes;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_minduration)) {
+    result.minduration = _minduration;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_maxduration)) {
+    result.maxduration = _maxduration;
+  }
+  if (!RE_EMPTY_OR_ONLY_COMMAS.test(_skip)) {
+    result.skip = _skip;
+  }
+
+  return result;
 }
 
 registerBidder(spec);
diff --git a/modules/visxBidAdapter.md b/modules/visxBidAdapter.md
index 41e45622481..9578f7cc4a7 100644
--- a/modules/visxBidAdapter.md
+++ b/modules/visxBidAdapter.md
@@ -11,33 +11,61 @@ Maintainer:     service@yoc.com
 Module that connects to YOC VIS.X® demand source to fetch bids.
 
 # Test Parameters
+```javascript
+var adUnits = [
+    // YOC Mystery Ad adUnit
+    {
+        code: 'yma-test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[1, 1]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '903535'
+                }
+            }
+        ]
+    },
+    // YOC Understitial Ad adUnit
+    {
+        code: 'yua-test-div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '903536'
+                }
+            }
+        ]
+    },
+    // YOC In-stream adUnit
+    {
+        code: 'instream-test-div',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: [400, 300],
+                mimes: ['video/mp4'],
+                protocols: [3, 6]
+            },
+        },
+        bids: [
+            {
+                bidder: 'visx',
+                params: {
+                    uid: '921068'
+                }
+            }
+        ]
+    }
+];
 ```
-    var adUnits = [
-           // YOC Mystery Ad adUnit
-           {
-               code: 'yma-test-div',
-               sizes: [[1, 1]],
-               bids: [
-                   {
-                       bidder: 'visx',
-                       params: {
-                           uid: '903535'
-                       }
-                   }
-               ]
-           },
-           // YOC Understitial Ad adUnit
-           {
-               code: 'yua-test-div',
-               sizes: [[300, 250]],
-               bids: [
-                   {
-                       bidder: 'visx',
-                       params: {
-                           uid: '903536'
-                       }
-                   }
-               ]
-           }
-       ];
-```
\ No newline at end of file
diff --git a/modules/voxBidAdapter.js b/modules/voxBidAdapter.js
new file mode 100644
index 00000000000..ba469c3c7ed
--- /dev/null
+++ b/modules/voxBidAdapter.js
@@ -0,0 +1,250 @@
+import * as utils from '../src/utils.js'
+import { registerBidder } from '../src/adapters/bidderFactory.js'
+import {BANNER, VIDEO} from '../src/mediaTypes.js'
+import find from 'core-js-pure/features/array/find.js';
+import {auctionManager} from '../src/auctionManager.js';
+import {Renderer} from '../src/Renderer.js';
+
+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;
+
+function buildBidRequests(validBidRequests) {
+  return utils._map(validBidRequests, function(validBidRequest) {
+    const params = validBidRequest.params;
+    const bidRequest = {
+      bidId: validBidRequest.bidId,
+      transactionId: validBidRequest.transactionId,
+      sizes: validBidRequest.sizes,
+      placement: params.placement,
+      placeId: params.placementId,
+      imageUrl: params.imageUrl
+    };
+
+    return bidRequest;
+  })
+}
+
+const outstreamRender = bid => {
+  bid.renderer.push(() => {
+    window.ANOutstreamVideo.renderAd({
+      sizes: [bid.width, bid.height],
+      targetId: bid.adUnitCode,
+      rendererOptions: {
+        showBigPlayButton: false,
+        showProgressBar: 'bar',
+        showVolume: false,
+        allowFullscreen: true,
+        skippable: false,
+        content: bid.vastXml
+      }
+    });
+  });
+}
+
+const createRenderer = (bid) => {
+  const renderer = Renderer.install({
+    targetId: bid.adUnitCode,
+    url: VIDEO_RENDERER_URL,
+    loaded: false
+  });
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  return renderer;
+}
+
+function buildBid(bidData) {
+  const bid = {
+    requestId: bidData.bidId,
+    cpm: bidData.price,
+    width: bidData.content.width,
+    height: bidData.content.height,
+    creativeId: bidData.content.seanceId || bidData.bidId,
+    currency: bidData.currency,
+    netRevenue: true,
+    mediaType: BANNER,
+    ttl: TTL,
+    content: bidData.content,
+    meta: {
+      advertiserDomains: bidData.advertiserDomains || [],
+    }
+  };
+
+  if (bidData.placement === 'video') {
+    bid.vastXml = bidData.content;
+    bid.mediaType = VIDEO;
+
+    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 (adUnit.mediaTypes.video.context === 'outstream') {
+        bid.renderer = createRenderer(bid);
+      }
+    }
+  } else if (bidData.placement === 'inImage') {
+    bid.mediaType = BANNER;
+    bid.ad = wrapInImageBanner(bid, bidData);
+  } else {
+    bid.mediaType = BANNER;
+    bid.ad = wrapBanner(bid, bidData);
+  }
+
+  return bid;
+}
+
+function getMediaTypeFromBid(bid) {
+  return bid.mediaTypes && Object.keys(bid.mediaTypes)[0];
+}
+
+function hasVideoMandatoryParams(mediaTypes) {
+  const isHasVideoContext = !!mediaTypes.video && (mediaTypes.video.context === 'instream' || mediaTypes.video.context === 'outstream');
+
+  const isPlayerSize =
+    !!utils.deepAccess(mediaTypes, 'video.playerSize') &&
+    utils.isArray(utils.deepAccess(mediaTypes, 'video.playerSize'));
+
+  return isHasVideoContext && isPlayerSize;
+}
+
+function wrapInImageBanner(bid, bidData) {
+  return `
+    
+    
+        
+        
+        
+        
+    
+    
+      

+      
+    
+  `;
+}
+
+function wrapBanner(bid, bidData) {
+  return `
+    
+    
+      
+      
+      
+      
+    
+    
+      

+      
+    
+  `;
+}
+
+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(bid) {
+    return (
+      !!bid.params.placementId &&
+      !!bid.params.placement &&
+      (
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'banner') ||
+        (getMediaTypeFromBid(bid) === BANNER && bid.params.placement === 'inImage' && !!bid.params.imageUrl) ||
+        (getMediaTypeFromBid(bid) === VIDEO && bid.params.placement === 'video' && hasVideoMandatoryParams(bid.mediaTypes))
+      )
+    );
+  },
+
+  /**
+   * 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) {
+    const payload = {
+      url: bidderRequest.refererInfo.referer,
+      cmp: !!bidderRequest.gdprConsent,
+      bidRequests: buildBidRequests(validBidRequests)
+    };
+
+    if (payload.cmp) {
+      const gdprApplies = bidderRequest.gdprConsent.gdprApplies;
+      if (gdprApplies !== undefined) payload['ga'] = gdprApplies;
+      payload['cs'] = bidderRequest.gdprConsent.consentString;
+    }
+
+    const payloadString = JSON.stringify(payload);
+
+    return {
+      method: 'POST',
+      url: SSP_ENDPOINT,
+      data: payloadString,
+      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.
+   */
+  interpretResponse: function(serverResponse, bidRequest) {
+    let bidRequests = JSON.parse(bidRequest.data).bidRequests;
+    const serverBody = serverResponse.body;
+
+    if (serverBody && serverBody.bids && utils.isArray(serverBody.bids)) {
+      return utils._map(serverBody.bids, function(bid) {
+        let rawBid = find(bidRequests, function (item) {
+          return item.bidId === bid.bidId;
+        });
+        bid.placement = rawBid.placement;
+        bid.transactionId = rawBid.transactionId;
+        bid.placeId = rawBid.placeId;
+        return buildBid(bid);
+      });
+    } else {
+      return [];
+    }
+  }
+
+}
+registerBidder(spec);
diff --git a/modules/voxBidAdapter.md b/modules/voxBidAdapter.md
new file mode 100644
index 00000000000..3fc0383e6f8
--- /dev/null
+++ b/modules/voxBidAdapter.md
@@ -0,0 +1,237 @@
+# Overview
+
+
+**Module Name**: VOX Bidder Adapter
+**Module Type**: Bidder Adapter
+**Maintainer**: prebid@hybrid.ai
+
+# Description
+
+You can use this adapter to get a bid from partners.hybrid.ai
+
+
+## Sample Banner Ad Unit
+
+```js
+var adUnits = [{
+    code: 'banner_ad_unit',
+    mediaTypes: {
+        banner: {
+            sizes: [[160, 600]]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "banner",                      // required
+            placementId: "5fc77bc5a757531e24c89a4c"   // required
+        }
+    }]
+}];
+```
+
+## Sample Video Ad Unit
+
+```js
+var adUnits = [{
+    code: 'video_ad_unit',
+    mediaTypes: {
+        video: {
+            context: 'outstream',      // required
+            playerSize: [[640, 480]]   // required
+        }
+    },
+    bids: [{
+        bidder: 'vox',
+        params: {
+            placement: "video",                       // required
+            placementId: "5fc77a94a757531e24c89a3d"   // required
+        }
+    }]
+}];
+```
+
+# Sample In-Image Ad Unit
+
+```js
+var adUnits = [{
+    code: 'test-div',
+    mediaTypes: {
+        banner: {
+            sizes: [0, 0]
+        }
+    },
+    bids: [{
+        bidder: "vox",
+        params: {
+            placement: "inImage",
+            placementId: "5fc77b40a757531e24c89a42",
+            imageUrl: "https://gallery.voxexchange.io/vox-main.png"
+        }
+    }]
+}];
+```
+
+# Example page with In-Image
+
+```html
+
+
+
+	
+	Prebid.js Banner Example
+	
+	
+    
+
+
+	
Prebid.js InImage Banner Test

+	

+        
+        
+    

+
+
+```
+
+# Example page with In-Image and GPT
+
+```html
+
+
+
+	
+	Prebid.js Banner Example
+	
+	
+	
+	
+
+
+	
Prebid.js Banner Ad Unit Test

+	

+		
+		
+	

+
+
+```
diff --git a/modules/vuukleBidAdapter.js b/modules/vuukleBidAdapter.js
new file mode 100644
index 00000000000..7a83bf4e331
--- /dev/null
+++ b/modules/vuukleBidAdapter.js
@@ -0,0 +1,67 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'vuukle';
+const URL = 'https://pb.vuukle.com/adapter';
+const TIME_TO_LIVE = 360;
+
+export const spec = {
+  code: BIDDER_CODE,
+
+  isBidRequestValid: function(bid) {
+    return true
+  },
+
+  buildRequests: function(bidRequests) {
+    const requests = bidRequests.map(function (bid) {
+      const parseSized = utils.parseSizesInput(bid.sizes);
+      const arrSize = parseSized[0].split('x');
+      const params = {
+        url: encodeURIComponent(window.location.href),
+        sizes: JSON.stringify(parseSized),
+        width: arrSize[0],
+        height: arrSize[1],
+        params: JSON.stringify(bid.params),
+        rnd: Math.random(),
+        bidId: bid.bidId,
+        source: 'pbjs',
+        version: '$prebid.version$',
+        v: 1,
+      };
+
+      return {
+        method: 'GET',
+        url: URL,
+        data: params,
+        options: {withCredentials: false}
+      }
+    });
+
+    return requests;
+  },
+
+  interpretResponse: function(serverResponse, bidRequest) {
+    if (!serverResponse || !serverResponse.body || !serverResponse.body.ad) {
+      return [];
+    }
+
+    const res = serverResponse.body;
+    const bidResponse = {
+      requestId: bidRequest.data.bidId,
+      cpm: res.cpm,
+      width: res.width,
+      height: res.height,
+      creativeId: res.creative_id,
+      currency: res.currency || 'USD',
+      netRevenue: true,
+      ttl: TIME_TO_LIVE,
+      ad: res.ad,
+      meta: {
+        advertiserDomains: Array.isArray(res.adomain) ? res.adomain : []
+      }
+    };
+
+    return [bidResponse];
+  },
+}
+registerBidder(spec);
diff --git a/modules/vuukleBidAdapter.md b/modules/vuukleBidAdapter.md
new file mode 100644
index 00000000000..ee7b54c6262
--- /dev/null
+++ b/modules/vuukleBidAdapter.md
@@ -0,0 +1,26 @@
+# Overview
+```
+Module Name: Vuukle Bid Adapter
+Module Type: Bidder Adapter
+Maintainer: support@vuukle.com
+```
+
+# Description
+Module that connects to Vuukle's server for bids.
+Currently module supports only banner mediaType.
+
+# Test Parameters
+```
+    var adUnits = [{
+        code: '/test/div',
+        mediaTypes: {
+            banner: {
+                sizes: [[300, 250]]
+            }
+        },
+        bids: [{
+            bidder: 'vuukle',
+            params: {}
+        }]
+    }];
+```
diff --git a/modules/waardexBidAdapter.js b/modules/waardexBidAdapter.js
index 255bf24098b..1558ea39cd1 100644
--- a/modules/waardexBidAdapter.js
+++ b/modules/waardexBidAdapter.js
@@ -1,218 +1,295 @@
-import { registerBidder } from '../src/adapters/bidderFactory.js';
-import { BANNER } 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 {config} from '../src/config.js';
+import * as utils from '../src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
 
-const domain = 'hb.justbidit.xyz';
-const httpsPort = 8843;
-const path = '/prebid';
+const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid`;
+const BIDDER_CODE = 'waardex';
 
-const ENDPOINT = `https://${domain}:${httpsPort}${path}`;
+const isBidRequestValid = bid => {
+  if (!bid.bidId) {
+    utils.logError(BIDDER_CODE + ': bid.bidId should be non-empty');
+    return false;
+  }
 
-const BIDDER_CODE = 'waardex';
+  if (!bid.params) {
+    utils.logError(BIDDER_CODE + ': bid.params should be non-empty');
+    return false;
+  }
 
-/**
- * @param {Array} requestSizes
- *
- * @returns {Array}
- * */
-function transformSizes(requestSizes) {
-  let sizes = [];
-  if (
-    Array.isArray(requestSizes) &&
-    !Array.isArray(requestSizes[0])
-  ) {
-    sizes[0] = {
-      width: parseInt(requestSizes[0], 10) || 0,
-      height: parseInt(requestSizes[1], 10) || 0,
-    };
-  } else if (
-    Array.isArray(requestSizes) &&
-    Array.isArray(requestSizes[0])
-  ) {
-    sizes = requestSizes.map(item => {
-      return {
-        width: parseInt(item[0], 10) || 0,
-        height: parseInt(item[1], 10) || 0,
-      }
-    });
+  if (!+bid.params.zoneId) {
+    utils.logError(BIDDER_CODE + ': bid.params.zoneId should be non-empty Number');
+    return false;
   }
-  return sizes;
-}
 
-/**
- * @param {Object} banner
- * @param {Array} banner.sizes
- *
- * @returns {Object}
- * */
-function createBannerObject(banner) {
-  return {
-    sizes: transformSizes(banner.sizes),
-  };
-}
-
-/**
- * @param {Array} validBidRequests
- *
- * @returns {Object}
- * */
-function buildBidRequests(validBidRequests) {
-  return validBidRequests.map((validBidRequest) => {
-    const params = validBidRequest.params;
-
-    const item = {
-      bidId: validBidRequest.bidId,
-      placementId: params.placementId,
-      bidfloor: parseFloat(params.bidfloor) || 0,
-      position: parseInt(params.position) || 1,
-      instl: parseInt(params.instl) || 0,
-    };
-    if (validBidRequest.mediaTypes[BANNER]) {
-      item[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
+  if (bid.mediaTypes && bid.mediaTypes.video) {
+    if (!bid.mediaTypes.video.playerSize) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!utils.isArray(bid.mediaTypes.video.playerSize)) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be an Array');
+      return false;
     }
-    return item;
-  });
-}
-
-/**
- * @param {Object} bidderRequest
- * @param {String} bidderRequest.userAgent
- * @param {String} bidderRequest.refererInfo
- * @param {String} bidderRequest.uspConsent
- * @param {Object} bidderRequest.gdprConsent
- * @param {String} bidderRequest.gdprConsent.consentString
- * @param {String} bidderRequest.gdprConsent.gdprApplies
- *
- * @returns {Object} - {
- *   ua: string,
- *   language: string,
- *   [referer]: string,
- *   [us_privacy]: string,
- *   [consent_string]: string,
- *   [consent_required]: string,
- *   [coppa]: boolean,
- * }
- * */
-function getCommonBidsData(bidderRequest) {
+
+    if (!bid.mediaTypes.video.playerSize[0]) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty');
+      return false;
+    }
+
+    if (!utils.isArray(bid.mediaTypes.video.playerSize[0])) {
+      utils.logError(BIDDER_CODE + ': bid.mediaTypes.video.playerSize should be non-empty Array');
+      return false;
+    }
+  }
+
+  return true;
+};
+
+const buildRequests = (validBidRequests, bidderRequest) => {
+  const dataToSend = {
+    ...getCommonBidsData(bidderRequest),
+    bidRequests: getBidRequestsToSend(validBidRequests)
+  };
+
+  let zoneId = '';
+  if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.zoneId) {
+    zoneId = +validBidRequests[0].params.zoneId;
+  }
+
+  return {method: 'POST', url: `${ENDPOINT}?pubId=${zoneId}`, data: dataToSend};
+};
+
+const getCommonBidsData = bidderRequest => {
   const payload = {
     ua: navigator.userAgent || '',
     language: navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '',
-
   };
+
   if (bidderRequest && bidderRequest.refererInfo) {
     payload.referer = encodeURIComponent(bidderRequest.refererInfo.referer);
   }
+
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.us_privacy = bidderRequest.uspConsent;
   }
+
   if (bidderRequest && bidderRequest.gdprConsent) {
     payload.gdpr_consent = {
       consent_string: bidderRequest.gdprConsent.consentString,
       consent_required: bidderRequest.gdprConsent.gdprApplies,
     }
   }
+
   payload.coppa = !!config.getConfig('coppa');
 
   return payload;
-}
-
-/**
- * this function checks either bid response is valid or noе
- *
- * @param {Object} bid
- * @param {string} bid.requestId
- * @param {number} bid.cpm
- * @param {string} bid.creativeId
- * @param {number} bid.ttl
- * @param {string} bid.currency
- * @param {number} bid.width
- * @param {number} bid.height
- * @param {string} bid.ad
- *
- * @returns {boolean}
- * */
-function isBidValid(bid) {
-  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
-    return false;
+};
+
+const getBidRequestsToSend = validBidRequests => {
+  return validBidRequests.map(getBidRequestToSend);
+};
+
+const getBidRequestToSend = validBidRequest => {
+  const result = {
+    bidId: validBidRequest.bidId,
+    bidfloor: parseFloat(validBidRequest.params.bidfloor) || 0,
+    position: parseInt(validBidRequest.params.position) || 1,
+    instl: parseInt(validBidRequest.params.instl) || 0,
+  };
+
+  if (validBidRequest.mediaTypes[BANNER]) {
+    result[BANNER] = createBannerObject(validBidRequest.mediaTypes[BANNER]);
   }
 
-  return Boolean(bid.width && bid.height && bid.ad);
-}
-
-/**
- * @param {Object} serverBid
- *
- * @returns {Object|null}
- * */
-function createBid(serverBid) {
-  const bid = {
-    requestId: serverBid.id,
-    cpm: serverBid.price,
+  if (validBidRequest.mediaTypes[VIDEO]) {
+    result[VIDEO] = createVideoObject(validBidRequest.mediaTypes[VIDEO], validBidRequest.params);
+  }
+
+  return result;
+};
+
+const createBannerObject = banner => {
+  return {
+    sizes: transformSizes(banner.sizes),
+  };
+};
+
+const transformSizes = requestSizes => {
+  let result = [];
+
+  if (Array.isArray(requestSizes) && !Array.isArray(requestSizes[0])) {
+    result[0] = {
+      width: parseInt(requestSizes[0], 10) || 0,
+      height: parseInt(requestSizes[1], 10) || 0,
+    };
+  } else if (Array.isArray(requestSizes) && Array.isArray(requestSizes[0])) {
+    result = requestSizes.map(item => {
+      return {
+        width: parseInt(item[0], 10) || 0,
+        height: parseInt(item[1], 10) || 0,
+      }
+    });
+  }
+
+  return result;
+};
+
+const createVideoObject = (videoMediaTypes, videoParams) => {
+  return {
+    w: utils.deepAccess(videoMediaTypes, 'playerSize')[0][0],
+    h: utils.deepAccess(videoMediaTypes, 'playerSize')[0][1],
+    mimes: utils.getBidIdParameter('mimes', videoParams) || ['application/javascript', 'video/mp4', 'video/webm'],
+    minduration: utils.getBidIdParameter('minduration', videoParams) || 0,
+    maxduration: utils.getBidIdParameter('maxduration', videoParams) || 500,
+    protocols: utils.getBidIdParameter('protocols', videoParams) || [2, 3, 5, 6],
+    startdelay: utils.getBidIdParameter('startdelay', videoParams) || 0,
+    placement: utils.getBidIdParameter('placement', videoParams) || videoMediaTypes.context === 'outstream' ? 3 : 1,
+    skip: utils.getBidIdParameter('skip', videoParams) || 1,
+    skipafter: utils.getBidIdParameter('skipafter', videoParams) || 0,
+    minbitrate: utils.getBidIdParameter('minbitrate', videoParams) || 0,
+    maxbitrate: utils.getBidIdParameter('maxbitrate', videoParams) || 3500,
+    delivery: utils.getBidIdParameter('delivery', videoParams) || [2],
+    playbackmethod: utils.getBidIdParameter('playbackmethod', videoParams) || [1, 2, 3, 4],
+    api: utils.getBidIdParameter('api', videoParams) || [2],
+    linearity: utils.getBidIdParameter('linearity', videoParams) || 1
+  };
+};
+
+const interpretResponse = (serverResponse, bidRequest) => {
+  try {
+    const responseBody = serverResponse.body;
+
+    if (!responseBody.seatbid || !responseBody.seatbid[0]) {
+      return [];
+    }
+
+    return responseBody.seatbid[0].bid
+      .map(openRtbBid => {
+        const hbRequestBid = getHbRequestBid(openRtbBid, bidRequest.data);
+        if (!hbRequestBid) return;
+
+        const hbRequestMediaType = getHbRequestMediaType(hbRequestBid);
+        if (!hbRequestMediaType) return;
+
+        return mapOpenRtbToHbBid(openRtbBid, hbRequestMediaType, hbRequestBid);
+      })
+      .filter(x => x);
+  } catch (e) {
+    return [];
+  }
+};
+
+const getHbRequestBid = (openRtbBid, bidRequest) => {
+  return find(bidRequest.bidRequests, x => x.bidId === openRtbBid.impid);
+};
+
+const getHbRequestMediaType = hbRequestBid => {
+  if (hbRequestBid.banner) return BANNER;
+  if (hbRequestBid.video) return VIDEO;
+  return null;
+};
+
+const mapOpenRtbToHbBid = (openRtbBid, mediaType, hbRequestBid) => {
+  let bid = null;
+
+  if (mediaType === BANNER) {
+    bid = mapOpenRtbBannerToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  if (mediaType === VIDEO) {
+    bid = mapOpenRtbVideoToHbBid(openRtbBid, hbRequestBid);
+  }
+
+  return isBidValid(bid) ? bid : null;
+};
+
+const mapOpenRtbBannerToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: BANNER,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
     currency: 'USD',
-    width: serverBid.w,
-    height: serverBid.h,
-    creativeId: serverBid.crid,
+    width: openRtbBid.w,
+    height: openRtbBid.h,
+    creativeId: openRtbBid.crid,
     netRevenue: true,
     ttl: 3000,
-    ad: serverBid.adm,
-    dealId: serverBid.dealid,
+    ad: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
     meta: {
-      cid: serverBid.cid,
-      adomain: serverBid.adomain,
-      mediaType: serverBid.ext.mediaType
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      mediaType: openRtbBid.ext && openRtbBid.ext.mediaType
     },
   };
+};
 
-  return isBidValid(bid) ? bid : null;
-}
+const mapOpenRtbVideoToHbBid = (openRtbBid, hbRequestBid) => {
+  return {
+    mediaType: VIDEO,
+    requestId: hbRequestBid.bidId,
+    cpm: openRtbBid.price,
+    currency: 'USD',
+    width: hbRequestBid.video.w,
+    height: hbRequestBid.video.h,
+    ad: openRtbBid.adm,
+    ttl: 3000,
+    creativeId: openRtbBid.crid,
+    netRevenue: true,
+    vastUrl: getVastUrl(openRtbBid),
+    // An impression tracking URL to serve with video Ad
+    // Optional; only usable with vastUrl and requires prebid cache to be enabled
+    // Example: "https://vid.exmpale.com/imp/134"
+    // For now we don't need this field
+    // vastImpUrl: null,
+    vastXml: openRtbBid.adm,
+    dealId: openRtbBid.dealid,
+    meta: {
+      cid: openRtbBid.cid,
+      adomain: openRtbBid.adomain,
+      networkId: null,
+      networkName: null,
+      agencyId: null,
+      agencyName: null,
+      advertiserId: null,
+      advertiserName: null,
+      advertiserDomains: null,
+      brandId: null,
+      brandName: null,
+      primaryCatId: null,
+      secondaryCatIds: null,
+      mediaType: 'video',
+    },
+  }
+};
 
-export const spec = {
-  code: BIDDER_CODE,
-  supportedMediaTypes: [BANNER],
-
-  isBidRequestValid: (bid) => Boolean(bid.bidId && bid.params && +bid.params.placementId && +bid.params.pubId),
-
-  /**
-   * @param {Object[]} validBidRequests -  array of valid bid requests
-   * @param {Object} bidderRequest - an array of valid bid requests
-   *
-   * */
-  buildRequests(validBidRequests, bidderRequest) {
-    const payload = getCommonBidsData(bidderRequest);
-    payload.bidRequests = buildBidRequests(validBidRequests);
-
-    let pubId = '';
-    if (validBidRequests[0] && validBidRequests[0].params && +validBidRequests[0].params.pubId) {
-      pubId = +validBidRequests[0].params.pubId;
-    }
+const getVastUrl = openRtbBid => {
+  const adm = (openRtbBid.adm || '').trim();
 
-    const url = `${ENDPOINT}?pubId=${pubId}`;
+  if (adm.startsWith('http')) {
+    return adm;
+  } else {
+    return null
+  }
+};
 
-    return {
-      method: 'POST',
-      url,
-      data: payload
-    };
-  },
-
-  /**
-   * Unpack the response from the server into a list of bids.
-   */
-  interpretResponse(serverResponse, bidRequest) {
-    const bids = [];
-    serverResponse = serverResponse.body;
-
-    if (serverResponse.seatbid && serverResponse.seatbid[0]) {
-      const oneSeatBid = serverResponse.seatbid[0];
-      oneSeatBid.bid.forEach(serverBid => {
-        const bid = createBid(serverBid);
-        if (bid) {
-          bids.push(bid);
-        }
-      });
-    }
-    return bids;
-  },
-}
+const isBidValid = bid => {
+  if (!bid.requestId || !bid.cpm || !bid.creativeId || !bid.ttl || !bid.currency) {
+    return false;
+  }
+
+  return Boolean(bid.width && bid.height && bid.ad);
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  supportedMediaTypes: [BANNER, VIDEO],
+  isBidRequestValid,
+  buildRequests,
+  interpretResponse,
+};
 
 registerBidder(spec);
diff --git a/modules/waardexBidAdapter.md b/modules/waardexBidAdapter.md
index 44ee720d31a..8eade8409f4 100644
--- a/modules/waardexBidAdapter.md
+++ b/modules/waardexBidAdapter.md
@@ -10,51 +10,84 @@ Maintainer: info@prebid.org
 
 Connects to Waardex exchange for bids.
 
-Waardex bid adapter supports Banner.
+Waardex bid adapter supports Banner and Video.
 
 # Test Parameters
-
-```
-
+## Banner
+```javascript
 var sizes = [
     [300, 250]
 ];
 var PREBID_TIMEOUT = 5000;
 var FAILSAFE_TIMEOUT = 5000;
 
-var adUnits = [{
-  code: '/19968336/header-bid-tag-0',
-  mediaTypes: {
-    banner: {
-        sizes: sizes,
-    },
-  },
-  bids: [{
-    bidder: 'waardex',
-    params: {
-        placementId: 13144370,
-        position: 1,  // add position openrtb
-        bidfloor: 0.5,
-        instl: 0,     // 1 - full screen
-        pubId: 1,
+var adUnits = [
+    {
+        code: '/19968336/header-bid-tag-0',
+        mediaTypes: {
+            banner: {
+                sizes: sizes
+            }
+        },
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    bidfloor: 1.5,
+                    position: 1,
+                    instl: 1,
+                    zoneId: 1
+                }
+            }
+        ]
     }
-  }]
-},{
-    code: '/19968336/header-bid-tag-1',
-    mediaTypes: {
-        banner: {
-            sizes: sizes,
+];
+```
+
+## Video
+
+```javascript
+const PREBID_TIMEOUT = 1000;
+const FAILSAFE_TIMEOUT = 3000;
+
+const sizes = [
+    [640, 480]
+];
+
+const adUnits = [
+    {
+        code: 'video1',
+        mediaTypes: {
+            video: {
+                context: 'instream',
+                playerSize: sizes[0]
+            }
         },
-    },
-    bids: [{
-        bidder: 'waardex',
-        params: {
-            placementId: 333333333333,
-            position: 1,  // add position openrtb
-            bidfloor: 0.5,
-            instl: 0,     // 1 - full screen
-            pubId: 1,
-        }
-    }]
-}];
+        bids: [
+            {
+                bidder: 'waardex',
+                params: {
+                    bidfloor: 1.5,
+                    position: 1,
+                    instl: 1,
+                    zoneId: 1,
+                    mimes: ['video/x-ms-wmv', 'video/mp4'],
+                    minduration: 2,
+                    maxduration: 10,
+                    protocols: ['VAST 1.0', 'VAST 2.0'],
+                    startdelay: -1,
+                    placement: 1,
+                    skip: 1,
+                    skipafter: 2,
+                    minbitrate: 0,
+                    maxbitrate: 0,
+                    delivery: [1, 2, 3],
+                    playbackmethod: [1, 2],
+                    api: [1, 2, 3, 4, 5, 6],
+                    linearity: 1,
+                }
+            }
+        ]
+    }
+]
 ```
diff --git a/modules/welectBidAdapter.js b/modules/welectBidAdapter.js
new file mode 100644
index 00000000000..c90a3d29498
--- /dev/null
+++ b/modules/welectBidAdapter.js
@@ -0,0 +1,106 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+
+const BIDDER_CODE = 'welect';
+const DEFAULT_DOMAIN = 'www.welect.de';
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['wlt'],
+  gvlid: 282,
+  supportedMediaTypes: ['video'],
+
+  // 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.
+   */
+  isBidRequestValid: function (bid) {
+    return (
+      utils.deepAccess(bid, 'mediaTypes.video.context') === 'instream' &&
+      !!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.
+   */
+  buildRequests: function (validBidRequests) {
+    return validBidRequests.map((bidRequest) => {
+      let rawSizes =
+        utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize') ||
+        bidRequest.sizes;
+      let size = rawSizes[0];
+
+      let domain = bidRequest.params.domain || DEFAULT_DOMAIN;
+
+      let url = `https://${domain}/api/v2/preflight/${bidRequest.params.placementId}`;
+
+      let gdprConsent = null;
+
+      if (bidRequest && bidRequest.gdprConsent) {
+        gdprConsent = {
+          gdpr_consent: {
+            gdprApplies: bidRequest.gdprConsent.gdprApplies,
+            tcString: bidRequest.gdprConsent.gdprConsent,
+          },
+        };
+      }
+
+      const data = {
+        width: size[0],
+        height: size[1],
+        bid_id: bidRequest.bidId,
+        ...gdprConsent,
+      };
+
+      return {
+        method: 'POST',
+        url: url,
+        data: data,
+        options: {
+          contentType: 'application/json',
+          withCredentials: false,
+          crossOrigin: true,
+        },
+      };
+    });
+  },
+  /**
+   * 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 responseBody = serverResponse.body;
+
+    if (typeof responseBody !== 'object' || responseBody.available !== true) {
+      return [];
+    }
+
+    const bidResponses = [];
+    const bidResponse = {
+      requestId: responseBody.bidResponse.requestId,
+      cpm: responseBody.bidResponse.cpm,
+      width: responseBody.bidResponse.width,
+      height: responseBody.bidResponse.height,
+      creativeId: responseBody.bidResponse.creativeId,
+      currency: responseBody.bidResponse.currency,
+      netRevenue: responseBody.bidResponse.netRevenue,
+      ttl: responseBody.bidResponse.ttl,
+      ad: responseBody.bidResponse.ad,
+      vastUrl: responseBody.bidResponse.vastUrl,
+      meta: {
+        advertiserDomains: responseBody.bidResponse.meta.advertiserDomains
+      }
+    };
+    bidResponses.push(bidResponse);
+    return bidResponses;
+  },
+};
+registerBidder(spec);
diff --git a/modules/welectBidAdapter.md b/modules/welectBidAdapter.md
new file mode 100644
index 00000000000..7f72a0bd949
--- /dev/null
+++ b/modules/welectBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+```
+Module Name: Welect Bidder Adapter
+Module Type: Welect Adapter
+Maintainer: nick.duitz@9elements.com
+```
+
+# Description
+
+Module that connects to Welect's demand sources
+
+# Test Parameters
+```
+var adUnits = [
+  {
+    bidder: 'welect',
+    params: {
+      placementId: 'exampleId',
+      domain: 'www.welect.de'
+    },
+    sizes: [[640, 360]],
+    mediaTypes: {
+      video: {
+        context: 'instream'
+      }
+    },
+  };
+];
+```
\ No newline at end of file
diff --git a/modules/widespaceBidAdapter.js b/modules/widespaceBidAdapter.js
index 0bf6fa00628..646fbfb9993 100644
--- a/modules/widespaceBidAdapter.js
+++ b/modules/widespaceBidAdapter.js
@@ -94,10 +94,9 @@ export const spec = {
 
       // Include debug data when available
       if (!isInHostileIframe) {
-        const DEBUG_AD = (find(window.top.location.hash.split('&'),
+        data.forceAdId = (find(window.top.location.hash.split('&'),
           val => includes(val, 'WS_DEBUG_FORCEADID')
         ) || '').split('=')[1];
-        data.forceAdId = DEBUG_AD;
       }
 
       // GDPR Consent info
@@ -150,7 +149,10 @@ export const spec = {
           netRevenue: Boolean(bid.netRev),
           ttl: bid.ttl,
           referrer: getTopWindowReferrer(),
-          ad: bid.code
+          ad: bid.code,
+          meta: {
+            advertiserDomains: bid.adomain || []
+          }
         });
       }
     });
@@ -222,7 +224,6 @@ function visibleOnLoad(element) {
     const topPos = element.getBoundingClientRect().top;
     return topPos < screen.height && topPos >= window.top.pageYOffset ? 1 : 0;
   }
-  ;
   return '';
 }
 
diff --git a/modules/widespaceBidAdapter.md b/modules/widespaceBidAdapter.md
index 1ca2b61d406..fe87a620a86 100644
--- a/modules/widespaceBidAdapter.md
+++ b/modules/widespaceBidAdapter.md
@@ -1,8 +1,8 @@
 # Overview
 
 
-**Module Name:** Widespace Bidder Adapter.
-**Module Type:** Bidder Adapter.
+**Module Name:** Widespace Bidder Adapter.\
+**Module Type:** Bidder Adapter.\
 **Maintainer:** support@widespace.com
 
 
@@ -38,3 +38,4 @@ Banner and video formats are supported.
    }
   ];
 ```
+
diff --git a/modules/yieldlabBidAdapter.js b/modules/yieldlabBidAdapter.js
index 9c2b6abf475..d86f84e21b7 100644
--- a/modules/yieldlabBidAdapter.js
+++ b/modules/yieldlabBidAdapter.js
@@ -8,10 +8,12 @@ const ENDPOINT = 'https://ad.yieldlab.net'
 const BIDDER_CODE = 'yieldlab'
 const BID_RESPONSE_TTL_SEC = 300
 const CURRENCY_CODE = 'EUR'
-const OUTSTREAMPLAYER_URL = 'https://ad2.movad.net/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
+const OUTSTREAMPLAYER_URL = 'https://ad.adition.com/dynamic.ad?a=o193092&ma_loadEvent=ma-start-event'
+const GVLID = 70
 
 export const spec = {
   code: BIDDER_CODE,
+  gvlid: GVLID,
   supportedMediaTypes: [VIDEO, BANNER],
 
   isBidRequestValid: function (bid) {
@@ -37,7 +39,7 @@ export const spec = {
     utils._each(validBidRequests, function (bid) {
       adslotIds.push(bid.params.adslotId)
       if (bid.params.targeting) {
-        query.t = createQueryString(bid.params.targeting)
+        query.t = createTargetingString(bid.params.targeting)
       }
       if (bid.userIdAsEids && Array.isArray(bid.userIdAsEids)) {
         query.ids = createUserIdString(bid.userIdAsEids)
@@ -47,12 +49,21 @@ export const spec = {
           query[prop] = bid.params.customParams[prop]
         }
       }
+      if (bid.schain && utils.isPlainObject(bid.schain) && Array.isArray(bid.schain.nodes)) {
+        query.schain = createSchainString(bid.schain)
+      }
     })
 
-    if (bidderRequest && bidderRequest.gdprConsent) {
-      query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
-      if (query.gdpr) {
-        query.consent = bidderRequest.gdprConsent.consentString
+    if (bidderRequest) {
+      if (bidderRequest.refererInfo && bidderRequest.refererInfo.referer) {
+        query.pubref = bidderRequest.refererInfo.referer
+      }
+
+      if (bidderRequest.gdprConsent) {
+        query.gdpr = (typeof bidderRequest.gdprConsent.gdprApplies === 'boolean') ? bidderRequest.gdprConsent.gdprApplies : true
+        if (query.gdpr) {
+          query.consent = bidderRequest.gdprConsent.consentString
+        }
       }
     }
 
@@ -62,7 +73,8 @@ export const spec = {
     return {
       method: 'GET',
       url: `${ENDPOINT}/yp/${adslots}?${queryString}`,
-      validBidRequests: validBidRequests
+      validBidRequests: validBidRequests,
+      queryParams: query
     }
   },
 
@@ -74,6 +86,7 @@ export const spec = {
   interpretResponse: function (serverResponse, originalBidRequest) {
     const bidResponses = []
     const timestamp = Date.now()
+    const reqParams = originalBidRequest.queryParams
 
     originalBidRequest.validBidRequests.forEach(function (bidRequest) {
       if (!serverResponse.body) {
@@ -85,23 +98,28 @@ export const spec = {
       })
 
       if (matchedBid) {
-        const primarysize = bidRequest.sizes.length === 2 && !utils.isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
-        const customsize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : primarysize
+        const adUnitSize = bidRequest.sizes.length === 2 && !utils.isArray(bidRequest.sizes[0]) ? bidRequest.sizes : bidRequest.sizes[0]
+        const adSize = bidRequest.params.adSize !== undefined ? parseSize(bidRequest.params.adSize) : (matchedBid.adsize !== undefined) ? parseSize(matchedBid.adsize) : adUnitSize
         const extId = bidRequest.params.extId !== undefined ? '&id=' + bidRequest.params.extId : ''
         const adType = matchedBid.adtype !== undefined ? matchedBid.adtype : ''
+        const gdprApplies = reqParams.gdpr ? '&gdpr=' + reqParams.gdpr : ''
+        const gdprConsent = reqParams.consent ? '&consent=' + reqParams.consent : ''
 
         const bidResponse = {
           requestId: bidRequest.bidId,
           cpm: matchedBid.price / 100,
-          width: customsize[0],
-          height: customsize[1],
+          width: adSize[0],
+          height: adSize[1],
           creativeId: '' + matchedBid.id,
           dealId: (matchedBid['c.dealid']) ? matchedBid['c.dealid'] : matchedBid.pid,
           currency: CURRENCY_CODE,
           netRevenue: false,
           ttl: BID_RESPONSE_TTL_SEC,
           referrer: '',
-          ad: ``
+          ad: ``,
+          meta: {
+            advertiserDomains: (matchedBid.advertiser) ? matchedBid.advertiser : 'n/a'
+          }
         }
 
         if (isVideo(bidRequest, adType)) {
@@ -111,8 +129,7 @@ export const spec = {
             bidResponse.height = playersize[1]
           }
           bidResponse.mediaType = VIDEO
-          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/${customsize[0]}x${customsize[1]}?ts=${timestamp}${extId}`
-
+          bidResponse.vastUrl = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}`
           if (isOutstream(bidRequest)) {
             const renderer = Renderer.install({
               id: bidRequest.bidId,
@@ -192,12 +209,58 @@ function createQueryString (obj) {
   let str = []
   for (var p in obj) {
     if (obj.hasOwnProperty(p)) {
-      str.push(encodeURIComponent(p) + '=' + encodeURIComponent(obj[p]))
+      let val = obj[p]
+      if (p !== 'schain') {
+        str.push(encodeURIComponent(p) + '=' + encodeURIComponent(val))
+      } else {
+        str.push(p + '=' + val)
+      }
     }
   }
   return str.join('&')
 }
 
+/**
+ * Creates an unencoded targeting string out of an object with key-values
+ * @param {Object} obj
+ * @returns {String}
+ */
+function createTargetingString (obj) {
+  let str = []
+  for (var p in obj) {
+    if (obj.hasOwnProperty(p)) {
+      let key = p
+      let val = obj[p]
+      str.push(key + '=' + val)
+    }
+  }
+  return str.join('&')
+}
+
+/**
+ * Creates a string out of a schain object
+ * @param {Object} schain
+ * @returns {String}
+ */
+function createSchainString (schain) {
+  const ver = schain.ver || ''
+  const complete = (schain.complete === 1 || schain.complete === 0) ? schain.complete : ''
+  const keys = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext']
+  const nodesString = schain.nodes.reduce((acc, node) => {
+    return acc += `!${keys.map(key => node[key] ? encodeURIComponentWithBangIncluded(node[key]) : '').join(',')}`
+  }, '')
+  return `${ver},${complete}${nodesString}`
+}
+
+/**
+ * Encodes URI Component with exlamation mark included. Needed for schain object.
+ * @param {String} str
+ * @returns {String}
+ */
+function encodeURIComponentWithBangIncluded(str) {
+  return encodeURIComponent(str).replace(/!/g, '%21')
+}
+
 /**
  * Handles an outstream response after the library is loaded
  * @param {Object} bid
diff --git a/modules/yieldlabBidAdapter.md b/modules/yieldlabBidAdapter.md
index 37897b83f12..a7a3f2715dc 100644
--- a/modules/yieldlabBidAdapter.md
+++ b/modules/yieldlabBidAdapter.md
@@ -21,7 +21,6 @@ Module that connects to Yieldlab's demand sources
                    params: {
                        adslotId: "5220336",
                        supplyId: "1381604",
-                       adSize: "728x90",
                        targeting: {
                            key1: "value1",
                            key2: "value2"
@@ -41,8 +40,7 @@ Module that connects to Yieldlab's demand sources
                    bidder: "yieldlab",
                    params: {
                        adslotId: "5220339",
-                       supplyId: "1381604",
-                       adSize: "640x480"
+                       supplyId: "1381604"
                    }
                }]
            }
diff --git a/modules/yieldliftBidAdapter.js b/modules/yieldliftBidAdapter.js
index 87a598bd335..9398e2c7816 100644
--- a/modules/yieldliftBidAdapter.js
+++ b/modules/yieldliftBidAdapter.js
@@ -96,6 +96,9 @@ export const spec = {
           creativeId: bid.crid,
           netRevenue: DEFAULT_NET_REVENUE,
           currency: DEFAULT_CURRENCY,
+          meta: {
+            adomain: bid.adomain
+          }
         })
       })
     } else {
diff --git a/modules/yieldmoBidAdapter.js b/modules/yieldmoBidAdapter.js
index 55495979ea4..fa1ab3a90b3 100644
--- a/modules/yieldmoBidAdapter.js
+++ b/modules/yieldmoBidAdapter.js
@@ -1,109 +1,156 @@
 import * as utils from '../src/utils.js';
+import { BANNER, VIDEO } from '../src/mediaTypes.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { Renderer } from '../src/Renderer.js';
+import includes from 'core-js-pure/features/array/includes';
+import find from 'core-js-pure/features/array/find.js';
 
 const BIDDER_CODE = 'yieldmo';
 const CURRENCY = 'USD';
 const TIME_TO_LIVE = 300;
 const NET_REVENUE = true;
-const SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
-const localWindow = utils.getWindowTop();
+const BANNER_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebid';
+const VIDEO_SERVER_ENDPOINT = 'https://ads.yieldmo.com/exchange/prebidvideo';
+const OUTSTREAM_VIDEO_PLAYER_URL = 'https://prebid-outstream.yieldmo.com/bundle.js';
+const OPENRTB_VIDEO_BIDPARAMS = ['mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
+  'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'];
+const OPENRTB_VIDEO_SITEPARAMS = ['name', 'domain', 'cat', 'keywords'];
+const LOCAL_WINDOW = utils.getWindowTop();
+const DEFAULT_PLAYBACK_METHOD = 2;
+const DEFAULT_START_DELAY = 0;
+const VAST_TIMEOUT = 15000;
+const MAX_BANNER_REQUEST_URL_LENGTH = 8000;
+const BANNER_REQUEST_PROPERTIES_TO_REDUCE = ['description', 'title', 'pr', 'page_url'];
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: ['banner'],
+  supportedMediaTypes: [BANNER, VIDEO],
+
   /**
    * Determines whether or not the given bid request is valid.
    * @param {object} bid, bid to validate
    * @return boolean, true if valid, otherwise false
    */
-  isBidRequestValid: function(bid) {
-    return !!(bid && bid.adUnitCode && bid.bidId);
+  isBidRequestValid: function (bid) {
+    return !!(bid && bid.adUnitCode && bid.bidId && (hasBannerMediaType(bid) || hasVideoMediaType(bid)) &&
+      validateVideoParams(bid));
   },
+
   /**
    * 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.
+   * @param {BidderRequest} bidderRequest bidder request object.
    * @return ServerRequest Info describing the request to the server.
    */
-  buildRequests: function(bidRequests, bidderRequest) {
-    let serverRequest = {
-      p: [],
-      page_url: bidderRequest.refererInfo.referer,
-      bust: new Date().getTime().toString(),
-      pr: bidderRequest.refererInfo.referer,
-      scrd: localWindow.devicePixelRatio || 0,
-      dnt: getDNT(),
-      e: getEnvironment(),
-      description: getPageDescription(),
-      title: localWindow.document.title || '',
-      w: localWindow.innerWidth,
-      h: localWindow.innerHeight,
-      userConsent:
-        JSON.stringify({
+  buildRequests: function (bidRequests, bidderRequest) {
+    const bannerBidRequests = bidRequests.filter(request => hasBannerMediaType(request));
+    const videoBidRequests = bidRequests.filter(request => hasVideoMediaType(request));
+
+    let serverRequests = [];
+    if (bannerBidRequests.length > 0) {
+      let serverRequest = {
+        pbav: '$prebid.version$',
+        p: [],
+        page_url: bidderRequest.refererInfo.referer,
+        bust: new Date().getTime().toString(),
+        pr: (LOCAL_WINDOW.document && LOCAL_WINDOW.document.referrer) || '',
+        scrd: LOCAL_WINDOW.devicePixelRatio || 0,
+        dnt: getDNT(),
+        description: getPageDescription(),
+        title: LOCAL_WINDOW.document.title || '',
+        w: LOCAL_WINDOW.innerWidth,
+        h: LOCAL_WINDOW.innerHeight,
+        userConsent: JSON.stringify({
           // case of undefined, stringify will remove param
-          gdprApplies:
-            bidderRequest && bidderRequest.gdprConsent
-              ? bidderRequest.gdprConsent.gdprApplies
-              : '',
-          cmp:
-            bidderRequest && bidderRequest.gdprConsent
-              ? bidderRequest.gdprConsent.consentString
-              : '',
+          gdprApplies: utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies') || '',
+          cmp: utils.deepAccess(bidderRequest, 'gdprConsent.consentString') || ''
         }),
-      us_privacy:
-        bidderRequest && bidderRequest.uspConsent
-          ? bidderRequest.uspConsent
-          : '',
-    };
-
-    bidRequests.forEach(request => {
-      serverRequest.p.push(addPlacement(request));
-      const pubcid = getId(request, 'pubcid');
-      if (pubcid) {
-        serverRequest.pubcid = pubcid;
-      } else if (request.crumbs) {
-        if (request.crumbs.pubcid) {
+        us_privacy: utils.deepAccess(bidderRequest, 'uspConsent') || ''
+      };
+
+      const mtp = window.navigator.maxTouchPoints;
+      if (mtp) {
+        serverRequest.mtp = mtp;
+      }
+
+      bannerBidRequests.forEach(request => {
+        serverRequest.p.push(addPlacement(request));
+        const pubcid = getId(request, 'pubcid');
+        if (pubcid) {
+          serverRequest.pubcid = pubcid;
+        } else if (request.crumbs && request.crumbs.pubcid) {
           serverRequest.pubcid = request.crumbs.pubcid;
         }
+        const tdid = getId(request, 'tdid');
+        if (tdid) {
+          serverRequest.tdid = tdid;
+        }
+        const criteoId = getId(request, 'criteoId');
+        if (criteoId) {
+          serverRequest.cri_prebid = criteoId;
+        }
+        if (request.schain) {
+          serverRequest.schain = JSON.stringify(request.schain);
+        }
+      });
+      serverRequest.p = '[' + serverRequest.p.toString() + ']';
+
+      // check if url exceeded max length
+      const url = `${BANNER_SERVER_ENDPOINT}?${utils.parseQueryStringParameters(serverRequest)}`;
+      let extraCharacters = url.length - MAX_BANNER_REQUEST_URL_LENGTH;
+      if (extraCharacters > 0) {
+        for (let i = 0; i < BANNER_REQUEST_PROPERTIES_TO_REDUCE.length; i++) {
+          extraCharacters = shortcutProperty(extraCharacters, serverRequest, BANNER_REQUEST_PROPERTIES_TO_REDUCE[i]);
+
+          if (extraCharacters <= 0) {
+            break;
+          }
+        }
       }
-      const tdid = getId(request, 'tdid');
-      if (tdid) {
-        serverRequest.tdid = tdid;
-      }
-      const criteoId = getId(request, 'criteoId');
-      if (criteoId) {
-        serverRequest.cri_prebid = criteoId;
-      }
-      if (request.schain) {
-        serverRequest.schain =
-          JSON.stringify(request.schain);
-      }
-    });
-    serverRequest.p = '[' + serverRequest.p.toString() + ']';
-    return {
-      method: 'GET',
-      url: SERVER_ENDPOINT,
-      data: serverRequest
-    };
+
+      serverRequests.push({
+        method: 'GET',
+        url: BANNER_SERVER_ENDPOINT,
+        data: serverRequest
+      });
+    }
+
+    if (videoBidRequests.length > 0) {
+      const serverRequest = openRtbRequest(videoBidRequests, bidderRequest);
+      serverRequests.push({
+        method: 'POST',
+        url: VIDEO_SERVER_ENDPOINT,
+        data: serverRequest
+      });
+    }
+    return serverRequests;
   },
+
   /**
    * Makes Yieldmo Ad Server response compatible to Prebid specs
-   * @param serverResponse successful response from Ad Server
+   * @param {ServerResponse} serverResponse successful response from Ad Server
+   * @param {ServerRequest} bidRequest
    * @return {Bid[]} an array of bids
    */
-  interpretResponse: function(serverResponse) {
+  interpretResponse: function (serverResponse, bidRequest) {
     let bids = [];
-    let data = serverResponse.body;
+    const data = serverResponse.body;
     if (data.length > 0) {
       data.forEach(response => {
-        if (response.cpm && response.cpm > 0) {
-          bids.push(createNewBid(response));
+        if (response.cpm > 0) {
+          bids.push(createNewBannerBid(response));
         }
       });
     }
+    if (data.seatbid) {
+      const seatbids = data.seatbid.reduce((acc, seatBid) => acc.concat(seatBid.bid), []);
+      seatbids.forEach(bid => bids.push(createNewVideoBid(bid, bidRequest)));
+    }
     return bids;
   },
-  getUserSyncs: function() {
+
+  getUserSyncs: function () {
     return [];
   }
 };
@@ -113,6 +160,20 @@ registerBidder(spec);
  * Helper Functions
  ***************************************/
 
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasBannerMediaType(bidRequest) {
+  return !!utils.deepAccess(bidRequest, 'mediaTypes.banner');
+}
+
+/**
+ * @param {BidRequest} bidRequest bid request
+ */
+function hasVideoMediaType(bidRequest) {
+  return !!utils.deepAccess(bidRequest, 'mediaTypes.video');
+}
+
 /**
  * Adds placement information to array
  * @param request bid request
@@ -127,18 +188,19 @@ function addPlacement(request) {
     if (request.params.placementId) {
       placementInfo.ym_placement_id = request.params.placementId;
     }
-    if (request.params.bidFloor) {
-      placementInfo.bidFloor = request.params.bidFloor;
+    const bidfloor = getBidFloor(request, BANNER);
+    if (bidfloor) {
+      placementInfo.bidFloor = bidfloor;
     }
   }
   return JSON.stringify(placementInfo);
 }
 
 /**
- * creates a new bid with response information
+ * creates a new banner bid with response information
  * @param response server response
  */
-function createNewBid(response) {
+function createNewBannerBid(response) {
   return {
     requestId: response['callback_id'],
     cpm: response.cpm,
@@ -149,9 +211,68 @@ function createNewBid(response) {
     netRevenue: NET_REVENUE,
     ttl: TIME_TO_LIVE,
     ad: response.ad,
+    meta: {
+      advertiserDomains: response.adomain || [],
+      mediaType: BANNER,
+    },
   };
 }
 
+/**
+ * creates a new video bid with response information
+ * @param response openRTB server response
+ * @param bidRequest server request
+ */
+function createNewVideoBid(response, bidRequest) {
+  const imp = find((utils.deepAccess(bidRequest, 'data.imp') || []), imp => imp.id === response.impid);
+
+  let result = {
+    requestId: imp.id,
+    cpm: response.price,
+    width: imp.video.w,
+    height: imp.video.h,
+    creativeId: response.crid || response.adid,
+    currency: CURRENCY,
+    netRevenue: NET_REVENUE,
+    mediaType: VIDEO,
+    ttl: TIME_TO_LIVE,
+    vastXml: response.adm,
+    meta: {
+      advertiserDomains: response.adomain || [],
+      mediaType: VIDEO,
+    },
+  };
+
+  if (imp.video.placement && imp.video.placement !== 1) {
+    const renderer = Renderer.install({
+      url: OUTSTREAM_VIDEO_PLAYER_URL,
+      config: {
+        width: result.width,
+        height: result.height,
+        vastTimeout: VAST_TIMEOUT,
+        maxAllowedVastTagRedirects: 5,
+        allowVpaid: true,
+        autoPlay: true,
+        preload: true,
+        mute: true
+      },
+      id: imp.tagid,
+      loaded: false,
+    });
+
+    renderer.setRender(function (bid) {
+      bid.renderer.push(() => {
+        const { id, config } = bid.renderer;
+        window.YMoutstreamPlayer(bid, id, config);
+      });
+    });
+
+    result.renderer = renderer;
+  }
+
+  return result;
+}
+
 /**
  * Detects whether dnt is true
  * @returns true if user enabled dnt
@@ -169,175 +290,286 @@ function getPageDescription() {
   if (document.querySelector('meta[name="description"]')) {
     return document
       .querySelector('meta[name="description"]')
-      .getAttribute('content'); // Value of the description metadata from the publisher's page.
+      .getAttribute('content') || ''; // Value of the description metadata from the publisher's page.
   } else {
     return '';
   }
 }
 
-/***************************************
- * Detect Environment Helper Functions
- ***************************************/
-
 /**
- * Represents a method for loading Yieldmo ads.  Environments affect
- * which formats can be loaded into the page
- * Environments:
- *    CodeOnPage: 0, // div directly on publisher's page
- *    Amp: 1, // google Accelerate Mobile Pages ampproject.org
- *    Mraid = 2, // native loaded through the MRAID spec, without Yieldmo's SDK https://www.iab.net/media/file/IAB_MRAID_v2_FINAL.pdf
- *    Dfp: 4, // google doubleclick for publishers https://www.doubleclickbygoogle.com/
- *    DfpInAmp: 5, // AMP page containing a DFP iframe
- *    SafeFrame: 10,
- *    DfpSafeFrame: 11,Sandboxed: 16, // An iframe that can't get to the top window.
- *    SuperSandboxed: 89, // An iframe without allow-same-origin
- *    Unknown: 90, // A default sandboxed implementation delivered by EnvironmentDispatch when all positive environment checks fail
+ * Gets an id from the userId object if it exists
+ * @param {*} request
+ * @param {*} idType
+ * @returns an id if there is one, or undefined
  */
+function getId(request, idType) {
+  return (typeof utils.deepAccess(request, 'userId') === 'object') ? request.userId[idType] : undefined;
+}
 
 /**
- * Detects what environment we're in
- * @returns Environment kind
+ * @param {BidRequest[]} bidRequests bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB request object
  */
-function getEnvironment() {
-  if (isSuperSandboxedIframe()) {
-    return 89;
-  } else if (isDfpInAmp()) {
-    return 5;
-  } else if (isDfp()) {
-    return 4;
-  } else if (isAmp()) {
-    return 1;
-  } else if (isDFPSafeFrame()) {
-    return 11;
-  } else if (isSafeFrame()) {
-    return 10;
-  } else if (isMraid()) {
-    return 2;
-  } else if (isCodeOnPage()) {
-    return 0;
-  } else if (isSandboxedIframe()) {
-    return 16;
-  } else {
-    return 90;
-  }
+function openRtbRequest(bidRequests, bidderRequest) {
+  let openRtbRequest = {
+    id: bidRequests[0].bidderRequestId,
+    at: 1,
+    imp: bidRequests.map(bidRequest => openRtbImpression(bidRequest)),
+    site: openRtbSite(bidRequests[0], bidderRequest),
+    device: openRtbDevice(),
+    badv: bidRequests[0].params.badv || [],
+    bcat: bidRequests[0].params.bcat || [],
+    ext: {
+      prebid: '$prebid.version$',
+    }
+  };
+
+  populateOpenRtbGdpr(openRtbRequest, bidderRequest);
+
+  return openRtbRequest;
 }
 
 /**
- * @returns true if we are running on the top window at dispatch time
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return Object OpenRTB's 'imp' (impression) object
  */
-function isCodeOnPage() {
-  return window === window.parent;
+function openRtbImpression(bidRequest) {
+  const size = extractPlayerSize(bidRequest);
+  const imp = {
+    id: bidRequest.bidId,
+    tagid: bidRequest.adUnitCode,
+    bidfloor: getBidFloor(bidRequest, VIDEO),
+    ext: {
+      placement_id: bidRequest.params.placementId
+    },
+    video: {
+      w: size[0],
+      h: size[1],
+      linearity: 1
+    }
+  };
+
+  const mediaTypesParams = utils.deepAccess(bidRequest, 'mediaTypes.video');
+  Object.keys(mediaTypesParams)
+    .filter(param => includes(OPENRTB_VIDEO_BIDPARAMS, param))
+    .forEach(param => imp.video[param] = mediaTypesParams[param]);
+
+  const videoParams = utils.deepAccess(bidRequest, 'params.video');
+  Object.keys(videoParams)
+    .filter(param => includes(OPENRTB_VIDEO_BIDPARAMS, param))
+    .forEach(param => imp.video[param] = videoParams[param]);
+
+  if (imp.video.skippable) {
+    imp.video.skip = 1;
+    delete imp.video.skippable;
+  }
+  if (imp.video.placement !== 1) {
+    imp.video.startdelay = DEFAULT_START_DELAY;
+    imp.video.playbackmethod = [ DEFAULT_PLAYBACK_METHOD ];
+  }
+  return imp;
 }
 
-/**
- * @returns true if the environment is both DFP and AMP
- */
-function isDfpInAmp() {
-  return isDfp() && isAmp();
+function getBidFloor(bidRequest, mediaType) {
+  let floorInfo = {};
+
+  if (typeof bidRequest.getFloor === 'function') {
+    floorInfo = bidRequest.getFloor({ currency: CURRENCY, mediaType, size: '*' });
+  }
+
+  return floorInfo.floor || bidRequest.params.bidfloor || bidRequest.params.bidFloor || 0;
 }
 
 /**
- * @returns true if the window is in an iframe whose id and parent element id match DFP
+ * @param {BidRequest} bidRequest bidder request object.
+ * @return [number, number] || null Player's width and height, or undefined otherwise.
  */
-function isDfp() {
-  try {
-    const frameElement = window.frameElement;
-    const parentElement = window.frameElement.parentNode;
-    if (frameElement && parentElement) {
-      return (
-        frameElement.id.indexOf('google_ads_iframe') > -1 &&
-        parentElement.id.indexOf('google_ads_iframe') > -1
-      );
-    }
-    return false;
-  } catch (e) {
-    return false;
+function extractPlayerSize(bidRequest) {
+  const sizeArr = utils.deepAccess(bidRequest, 'mediaTypes.video.playerSize');
+  if (utils.isArrayOfNums(sizeArr, 2)) {
+    return sizeArr;
+  } else if (utils.isArray(sizeArr) && utils.isArrayOfNums(sizeArr[0], 2)) {
+    return sizeArr[0];
   }
+  return null;
 }
 
 /**
- * @returns true if there is an AMP context object
+ * @param {BidRequest} bidRequest bid request object
+ * @param {BidderRequest} bidderRequest bidder request object
+ * @return Object OpenRTB's 'site' object
  */
-function isAmp() {
-  try {
-    const ampContext = window.context || window.parent.context;
-    if (ampContext && ampContext.pageViewId) {
-      return ampContext;
-    }
-    return false;
-  } catch (e) {
-    return false;
+function openRtbSite(bidRequest, bidderRequest) {
+  let result = {};
+
+  const loc = utils.parseUrl(utils.deepAccess(bidderRequest, 'refererInfo.referer'));
+  if (!utils.isEmpty(loc)) {
+    result.page = `${loc.protocol}://${loc.hostname}${loc.pathname}`;
   }
+
+  if (self === top && document.referrer) {
+    result.ref = document.referrer;
+  }
+
+  const keywords = document.getElementsByTagName('meta')['keywords'];
+  if (keywords && keywords.content) {
+    result.keywords = keywords.content;
+  }
+
+  const siteParams = utils.deepAccess(bidRequest, 'params.site');
+  if (siteParams) {
+    Object.keys(siteParams)
+      .filter(param => includes(OPENRTB_VIDEO_SITEPARAMS, param))
+      .forEach(param => result[param] = siteParams[param]);
+  }
+  return result;
 }
 
 /**
- * @returns true if the environment is a SafeFrame.
+ * @return Object OpenRTB's 'device' object
  */
-function isSafeFrame() {
-  return window.$sf && window.$sf.ext;
+function openRtbDevice() {
+  return {
+    ua: navigator.userAgent,
+    language: (navigator.language || navigator.browserLanguage || navigator.userLanguage || navigator.systemLanguage),
+  };
 }
 
 /**
- * @returns true if the environment is a dfp safe frame.
+ * Updates openRtbRequest with GDPR info from bidderRequest, if present.
+ * @param {Object} openRtbRequest OpenRTB's request to update.
+ * @param {BidderRequest} bidderRequest bidder request object.
  */
-function isDFPSafeFrame() {
-  if (window.location && window.location.href) {
-    const href = window.location.href;
-    return (
-      isSafeFrame() &&
-      href.indexOf('google') !== -1 &&
-      href.indexOf('safeframe') !== -1
-    );
+function populateOpenRtbGdpr(openRtbRequest, bidderRequest) {
+  const gdpr = bidderRequest.gdprConsent;
+  if (gdpr && 'gdprApplies' in gdpr) {
+    utils.deepSetValue(openRtbRequest, 'regs.ext.gdpr', gdpr.gdprApplies ? 1 : 0);
+    utils.deepSetValue(openRtbRequest, 'user.ext.consent', gdpr.consentString);
+  }
+  const uspConsent = utils.deepAccess(bidderRequest, 'uspConsent');
+  if (uspConsent) {
+    utils.deepSetValue(openRtbRequest, 'regs.ext.us_privacy', uspConsent);
   }
-  return false;
 }
 
 /**
- * Return true if we are in an iframe and can't access the top window.
+ * 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
  */
-function isSandboxedIframe() {
-  return window.top !== window && !window.frameElement;
-}
+function validateVideoParams(bid) {
+  if (!hasVideoMediaType(bid)) {
+    return true;
+  }
+
+  const paramRequired = (paramStr, value, conditionStr) => {
+    let error = `"${paramStr}" is required`;
+    if (conditionStr) {
+      error += ' when ' + conditionStr;
+    }
+    throw new Error(error);
+  }
+
+  const paramInvalid = (paramStr, value, expectedStr) => {
+    expectedStr = expectedStr ? ', expected: ' + expectedStr : '';
+    value = JSON.stringify(value);
+    throw new Error(`"${paramStr}"=${value} is invalid${expectedStr}`);
+  }
+
+  const isDefined = val => typeof val !== 'undefined';
+  const validate = (fieldPath, validateCb, errorCb, errorCbParam) => {
+    if (fieldPath.indexOf('video') === 0) {
+      const valueFieldPath = 'params.' + fieldPath;
+      const mediaFieldPath = 'mediaTypes.' + fieldPath;
+      const valueParams = utils.deepAccess(bid, valueFieldPath);
+      const mediaTypesParams = utils.deepAccess(bid, mediaFieldPath);
+      const hasValidValueParams = validateCb(valueParams);
+      const hasValidMediaTypesParams = validateCb(mediaTypesParams);
+
+      if (hasValidValueParams) return valueParams;
+      else if (hasValidMediaTypesParams) return hasValidMediaTypesParams;
+      else {
+        if (!hasValidValueParams) errorCb(valueFieldPath, valueParams, errorCbParam);
+        else if (!hasValidMediaTypesParams) errorCb(mediaFieldPath, mediaTypesParams, errorCbParam);
+      }
+      return valueParams || mediaTypesParams;
+    } else {
+      const value = utils.deepAccess(bid, fieldPath);
+      if (!validateCb(value)) {
+        errorCb(fieldPath, value, errorCbParam);
+      }
+      return value;
+    }
+  }
 
-/**
- * Return true if we cannot document.write to a child iframe (this implies no allow-same-origin)
- */
-function isSuperSandboxedIframe() {
-  const sacrificialIframe = window.document.createElement('iframe');
   try {
-    sacrificialIframe.setAttribute('style', 'display:none');
-    window.document.body.appendChild(sacrificialIframe);
-    sacrificialIframe.contentWindow._testVar = true;
-    window.document.body.removeChild(sacrificialIframe);
-    return false;
-  } catch (e) {
-    window.document.body.removeChild(sacrificialIframe);
+    validate('video.context', val => !utils.isEmpty(val), paramRequired);
+
+    validate('params.placementId', val => !utils.isEmpty(val), paramRequired);
+
+    validate('video.playerSize', val => utils.isArrayOfNums(val, 2) ||
+      (utils.isArray(val) && val.every(v => utils.isArrayOfNums(v, 2))),
+    paramInvalid, 'array of 2 integers, ex: [640,480] or [[640,480]]');
+
+    validate('video.mimes', val => isDefined(val), paramRequired);
+    validate('video.mimes', val => utils.isArray(val) && val.every(v => utils.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 => utils.isNumber(val), paramInvalid, 'number, ex: 5');
+    }
+
+    validate('video.protocols', val => isDefined(val), paramRequired);
+    validate('video.protocols', val => utils.isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('video.api', val => isDefined(val), paramRequired);
+    validate('video.api', val => utils.isArrayOfNums(val) && val.every(v => (v >= 1 && v <= 6)),
+      paramInvalid, 'array of numbers, ex: [2,3]');
+
+    validate('video.playbackmethod', val => !isDefined(val) || utils.isArrayOfNums(val), paramInvalid,
+      'array of integers, ex: [2,6]');
+
+    validate('video.maxduration', val => isDefined(val), paramRequired);
+    validate('video.maxduration', val => utils.isInteger(val), paramInvalid);
+    validate('video.minduration', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('video.skippable', val => !isDefined(val) || utils.isBoolean(val), paramInvalid);
+    validate('video.skipafter', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('video.pos', val => !isDefined(val) || utils.isNumber(val), paramInvalid);
+    validate('params.badv', val => !isDefined(val) || utils.isArray(val), paramInvalid,
+      'array of strings, ex: ["ford.com","pepsi.com"]');
+    validate('params.bcat', val => !isDefined(val) || utils.isArray(val), paramInvalid,
+      'array of strings, ex: ["IAB1-5","IAB1-6"]');
     return true;
+  } catch (e) {
+    utils.logError(e.message);
+    return false;
   }
 }
 
 /**
- * @returns true if the window has the attribute identifying MRAID
+ * 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
+ * @return {number} 0 if required characters count was removed otherwise count of how many left
  */
-function isMraid() {
-  return !!window.mraid;
-}
+function shortcutProperty(extraCharacters, target, propertyName) {
+  if (target[propertyName].length > extraCharacters) {
+    target[propertyName] = target[propertyName].substring(0, target[propertyName].length - extraCharacters);
 
-/**
- * Gets an id from the userId object if it exists
- * @param {*} request
- * @param {*} idType
- * @returns an id if there is one, or undefined
- */
-function getId(request, idType) {
-  let id;
-  if (
-    request &&
-    request.userId &&
-    request.userId[idType] &&
-    typeof request.userId === 'object'
-  ) {
-    id = request.userId[idType];
+    return 0
   }
-  return id;
+
+  const charactersLeft = extraCharacters - target[propertyName].length;
+
+  target[propertyName] = '';
+
+  return charactersLeft;
 }
diff --git a/modules/yieldmoBidAdapter.md b/modules/yieldmoBidAdapter.md
index 0f86d2507d1..040fbbec486 100644
--- a/modules/yieldmoBidAdapter.md
+++ b/modules/yieldmoBidAdapter.md
@@ -11,26 +11,93 @@ Note: Our ads will only render in mobile
 
 Connects to Yieldmo Ad Server for bids.
 
-Yieldmo bid adapter supports Banner.
+Yieldmo bid adapter supports Banner and Video.
 
 # Test Parameters
+
+## Banner
+
+Sample banner ad unit config:
+```javascript
+var adUnits = [{ // Banner adUnit
+  code: 'div-gpt-ad-1460505748561-0',
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 250], [300, 600]],
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only) 
+      bidFloor: .28 // optional param
+    }
+  }]
+}];
+```
+
+## Video
+
+Sample instream video ad unit config:
+```javascript
+var adUnits = [{ // Video adUnit
+  code: 'div-video-ad-1234567890',
+  mediaTypes: {
+    video: {
+      playerSize: [640, 480], // required
+      context: 'instream',
+      mimes: ['video/mp4']    // required, array of strings
+    }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1524592390382976659', // required
+      video: {
+        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
+      }
+    }
+  }]
+}];
+```
+
+Sample out-stream video ad unit config:
+```javascript
+var videoAdUnit = [{
+  code: 'div-video-ad-1234567890',
+  mediaTypes: {
+      video: {
+          playerSize: [640, 480],   // required
+          context: 'outstream',
+          mimes: ['video/mp4']      // required, array of strings
+      }
+  },
+  bids: [{
+    bidder: 'yieldmo',
+    params: {
+      placementId: '1524592390382976659',  // required
+      video: {
+        placement: 3,                      // required, integer ( 3,4,5 )
+        maxduration: 30,                   // required, integer
+        protocols: [2, 3],                 // required, array of integers
+        api: [2, 3],                       // required, array of integers
+        playbackmethod: [1,2]              // required, array of integers
+      }
+    }
+  }]
+}];
 ```
-var adUnits = [
-   // Banner adUnit
-   {
-       code: 'div-gpt-ad-1460505748561-0', 
-       mediaTypes: {
-         banner: {
-            sizes: [[300, 250], [300,600]],
-         }
-       }
-       bids: [{
-         bidder: 'yieldmo',
-         params: {
-           placementId: '1779781193098233305', // string with at most 19 characters (may include numbers only) 
-           bidFloor: .28 // optional param
-         }
-       }]
-   }
-];
-```
\ No newline at end of file
+
+Please also note, that we support the following OpenRTB params: 
+'mimes', 'startdelay', 'placement', 'startdelay', 'skipafter', 'protocols', 'api',
+'playbackmethod', 'maxduration', 'minduration', 'pos', 'skip', 'skippable'.
+They can be specified in `mediaTypes.video` or in `bids[].params.video`.
diff --git a/modules/yieldoneAnalyticsAdapter.js b/modules/yieldoneAnalyticsAdapter.js
index dd40e205b07..542c0917708 100644
--- a/modules/yieldoneAnalyticsAdapter.js
+++ b/modules/yieldoneAnalyticsAdapter.js
@@ -123,7 +123,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
             auctionManager.getAdUnitCodes(),
             auctionManager.getBidsReceived()
           );
-          if (yieldoneAnalytics.eventsStorage[currentAuctionId]) {
+          if (yieldoneAnalytics.eventsStorage[currentAuctionId] && yieldoneAnalytics.eventsStorage[currentAuctionId].events.length) {
             yieldoneAnalytics.eventsStorage[currentAuctionId].page = {url: referrers[currentAuctionId]};
             yieldoneAnalytics.eventsStorage[currentAuctionId].pubId = pubId;
             yieldoneAnalytics.eventsStorage[currentAuctionId].wrapper_version = '$prebid.version$';
@@ -139,8 +139,8 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
       }
     }
   },
-  sendStat(events, auctionId) {
-    if (!events) return;
+  sendStat(data, auctionId) {
+    if (!data || !data.events || !data.events.length) return;
     delete yieldoneAnalytics.eventsStorage[auctionId];
     ajax(
       url,
@@ -148,7 +148,7 @@ const yieldoneAnalytics = Object.assign(adapter({analyticsType}), {
         success: function() {},
         error: function() {}
       },
-      JSON.stringify(events),
+      JSON.stringify(data),
       {
         method: 'POST'
       }
diff --git a/modules/yieldoneBidAdapter.js b/modules/yieldoneBidAdapter.js
index 59240878426..574967db291 100644
--- a/modules/yieldoneBidAdapter.js
+++ b/modules/yieldoneBidAdapter.js
@@ -8,6 +8,7 @@ const BIDDER_CODE = 'yieldone';
 const ENDPOINT_URL = 'https://y.one.impact-ad.jp/h_bid';
 const USER_SYNC_URL = 'https://y.one.impact-ad.jp/push_sync';
 const VIDEO_PLAYER_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstview/js/dac-video-prebid.min.js';
+const CMER_PLAYER_URL = 'https://an.cmertv.com/hb/renderer/cmertv-video-yone-prebid.min.js';
 const VIEWABLE_PERCENTAGE_URL = 'https://img.ak.impact-ad.jp/ic/pone/ivt/firstview/js/prebid-adformat-config.js';
 
 export const spec = {
@@ -136,7 +137,11 @@ export const spec = {
       } else if (response.adm) {
         bidResponse.mediaType = VIDEO;
         bidResponse.vastXml = response.adm;
-        bidResponse.renderer = newRenderer(response);
+        if (renderId === 'cmer') {
+          bidResponse.renderer = newCmerRenderer(response);
+        } else {
+          bidResponse.renderer = newRenderer(response);
+        }
       }
 
       bidResponses.push(bidResponse);
@@ -175,4 +180,26 @@ function outstreamRender(bid) {
   });
 }
 
+function newCmerRenderer(response) {
+  const renderer = Renderer.install({
+    id: response.uid,
+    url: CMER_PLAYER_URL,
+    loaded: false,
+  });
+
+  try {
+    renderer.setRender(cmerRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on newRenderer', err);
+  }
+
+  return renderer;
+}
+
+function cmerRender(bid) {
+  bid.renderer.push(() => {
+    window.CMERYONEPREBID.renderPrebid(bid);
+  });
+}
+
 registerBidder(spec);
diff --git a/modules/yuktamediaAnalyticsAdapter.js b/modules/yuktamediaAnalyticsAdapter.js
index b346a26c843..2ef2d251ace 100644
--- a/modules/yuktamediaAnalyticsAdapter.js
+++ b/modules/yuktamediaAnalyticsAdapter.js
@@ -3,134 +3,257 @@ import adapter from '../src/AnalyticsAdapter.js';
 import adapterManager from '../src/adapterManager.js';
 import CONSTANTS from '../src/constants.json';
 import * as utils from '../src/utils.js';
+import { getStorageManager } from '../src/storageManager.js';
+import { getRefererInfo } from '../src/refererDetection.js';
+import strIncludes from 'core-js-pure/features/string/includes.js';
 
-const emptyUrl = '';
-const analyticsType = 'endpoint';
-const yuktamediaAnalyticsVersion = 'v2.0.0';
+const storage = getStorageManager();
+const yuktamediaAnalyticsVersion = 'v3.1.0';
 
 let initOptions;
-let auctionTimestamp;
-let events = {
-  bids: []
+
+const events = {
+  auctions: {}
+};
+const localStoragePrefix = 'yuktamediaAnalytics_';
+const utmTags = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
+const location = utils.getWindowLocation();
+const referer = getRefererInfo().referer;
+const _pageInfo = {
+  userAgent: window.navigator.userAgent,
+  timezoneOffset: new Date().getTimezoneOffset(),
+  language: window.navigator.language,
+  screenWidth: window.screen.width,
+  screenHeight: window.screen.height,
+  pageViewId: utils.generateUUID(),
+  host: location.host,
+  path: location.pathname,
+  search: location.search,
+  hash: location.hash,
+  referer: referer,
+  refererDomain: utils.parseUrl(referer).host,
+  yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
+  prebidVersion: $$PREBID_GLOBAL$$.version
 };
 
-var yuktamediaAnalyticsAdapter = Object.assign(adapter(
-  {
-    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;
-        auctionTimestamp = args.timestamp;
-      } else if (eventType === CONSTANTS.EVENTS.BID_REQUESTED) {
-        mapBidRequests(args).forEach(item => { events.bids.push(item) });
-      } else if (eventType === CONSTANTS.EVENTS.BID_RESPONSE) {
-        mapBidResponse(args, 'response');
-      } else if (eventType === CONSTANTS.EVENTS.BID_WON) {
-        send({
-          bidWon: mapBidResponse(args, 'win')
-        }, 'won');
-      }
+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] : '';
+}
 
-    if (eventType === CONSTANTS.EVENTS.AUCTION_END) {
-      send(events, 'auctionEnd');
-    }
-  }
-});
+function isNavigatorSendBeaconSupported() {
+  return ('navigator' in window) && ('sendBeacon' in window.navigator);
+}
 
-function mapBidRequests(params) {
-  let arr = [];
-  if (typeof params.bids !== 'undefined' && params.bids.length) {
-    params.bids.forEach(function (bid) {
-      arr.push({
-        bidderCode: bid.bidder,
-        bidId: bid.bidId,
-        adUnitCode: bid.adUnitCode,
-        requestId: bid.bidderRequestId,
-        auctionId: bid.auctionId,
-        transactionId: bid.transactionId,
-        sizes: utils.parseSizesInput(bid.mediaTypes.banner.sizes).toString(),
-        renderStatus: 1,
-        requestTimestamp: params.auctionStart
-      });
-    });
+function updateSessionId() {
+  if (isSessionIdTimeoutExpired()) {
+    let newSessionId = utils.generateUUID();
+    storage.setDataInLocalStorage(localStoragePrefix.concat('session_id'), newSessionId);
   }
-  return arr;
+  initOptions.sessionId = getSessionId();
+  updateSessionIdTimeout();
 }
 
-function mapBidResponse(bidResponse, status) {
-  if (status !== 'win') {
-    let bid = events.bids.filter(o => o.bidId == bidResponse.bidId || o.bidId == bidResponse.requestId)[0];
-    Object.assign(bid, {
-      bidderCode: bidResponse.bidder,
-      bidId: status == 'timeout' ? bidResponse.bidId : bidResponse.requestId,
-      adUnitCode: bidResponse.adUnitCode,
-      auctionId: bidResponse.auctionId,
-      creativeId: bidResponse.creativeId,
-      transactionId: bidResponse.transactionId,
-      currency: bidResponse.currency,
-      cpm: bidResponse.cpm,
-      netRevenue: bidResponse.netRevenue,
-      mediaType: bidResponse.mediaType,
-      statusMessage: bidResponse.statusMessage,
-      status: bidResponse.status,
-      renderStatus: status == 'timeout' ? 3 : 2,
-      timeToRespond: bidResponse.timeToRespond,
-      requestTimestamp: bidResponse.requestTimestamp,
-      responseTimestamp: bidResponse.responseTimestamp
-    });
-  } else if (status == 'win') {
-    return {
-      bidderCode: bidResponse.bidder,
-      bidId: bidResponse.requestId,
-      adUnitCode: bidResponse.adUnitCode,
-      auctionId: bidResponse.auctionId,
-      creativeId: bidResponse.creativeId,
-      transactionId: bidResponse.transactionId,
-      currency: bidResponse.currency,
-      cpm: bidResponse.cpm,
-      netRevenue: bidResponse.netRevenue,
-      renderedSize: bidResponse.size,
-      mediaType: bidResponse.mediaType,
-      statusMessage: bidResponse.statusMessage,
-      status: bidResponse.status,
-      renderStatus: 4,
-      timeToRespond: bidResponse.timeToRespond,
-      requestTimestamp: bidResponse.requestTimestamp,
-      responseTimestamp: bidResponse.responseTimestamp
-    }
-  }
+function updateSessionIdTimeout() {
+  storage.setDataInLocalStorage(localStoragePrefix.concat('session_timeout'), Date.now());
 }
 
-function send(data, status) {
-  let location = utils.getWindowLocation();
-  if (typeof data !== 'undefined' && typeof data.auctionInit !== 'undefined') {
-    data.auctionInit = Object.assign({ host: location.host, path: location.pathname, search: location.search }, data.auctionInit);
-  }
-  data.initOptions = initOptions;
+function isSessionIdTimeoutExpired() {
+  let cpmSessionTimestamp = storage.getDataFromLocalStorage(localStoragePrefix.concat('session_timeout'));
+  return Date.now() - cpmSessionTimestamp > 3600000;
+}
+
+function getSessionId() {
+  return storage.getDataFromLocalStorage(localStoragePrefix.concat('session_id')) ? storage.getDataFromLocalStorage(localStoragePrefix.concat('session_id')) : '';
+}
+
+function isUtmTimeoutExpired() {
+  let utmTimestamp = storage.getDataFromLocalStorage(localStoragePrefix.concat('utm_timeout'));
+  return (Date.now() - utmTimestamp) > 3600000;
+}
 
-  let yuktamediaAnalyticsRequestUrl = utils.buildUrl({
+function send(data, status) {
+  data.initOptions = Object.assign(_pageInfo, initOptions);
+  const yuktamediaAnalyticsRequestUrl = utils.buildUrl({
     protocol: 'https',
     hostname: 'analytics-prebid.yuktamedia.com',
-    pathname: status == 'auctionEnd' ? '/api/bids' : '/api/bid/won',
-    search: {
-      auctionTimestamp: auctionTimestamp,
-      yuktamediaAnalyticsVersion: yuktamediaAnalyticsVersion,
-      prebidVersion: $$PREBID_GLOBAL$$.version
-    }
+    pathname: '/api/bids'
   });
-
-  ajax(yuktamediaAnalyticsRequestUrl, undefined, JSON.stringify(data), { method: 'POST', contentType: 'text/plain' });
+  if (isNavigatorSendBeaconSupported()) {
+    window.navigator.sendBeacon(yuktamediaAnalyticsRequestUrl, JSON.stringify(data));
+  } else {
+    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:
+          utils.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:
+          utils.logInfo(localStoragePrefix + 'BID_REQUESTED:', JSON.stringify(args));
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            if (typeof events.auctions[args.auctionId] === 'undefined') {
+              events.auctions[args.auctionId] = { bids: {} };
+            }
+            events.auctions[args.auctionId]['timeStamp'] = args.start;
+            args.bids.forEach(function (bidRequest) {
+              events.auctions[args.auctionId]['bids'][bidRequest.bidId] = {
+                bidder: bidRequest.bidder,
+                adUnit: bidRequest.adUnitCode,
+                sizes: utils.parseSizesInput(bidRequest.sizes).toString(),
+                isBid: false,
+                won: false,
+                timeout: false,
+                renderStatus: 'bid-requested',
+                bidId: bidRequest.bidId,
+                auctionId: args.auctionId
+              }
+              if (typeof initOptions.enableUserIdCollection !== 'undefined' && initOptions.enableUserIdCollection && typeof bidRequest['userId'] !== 'undefined') {
+                for (let [userIdProvider, userId] in Object.entries(bidRequest['userId'])) {
+                  userIdProvider = typeof userIdProvider !== 'string' ? JSON.stringify(userIdProvider) : userIdProvider;
+                  userId = typeof userId !== 'string' ? JSON.stringify(userId) : userId;
+                  events.auctions[args.auctionId]['bids'][bidRequest.bidId]['userID-'.concat(userIdProvider)] = userId;
+                }
+              }
+            });
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_RESPONSE:
+          utils.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.cpm = args.cpm;
+              bidResponse.currency = args.currency;
+              bidResponse.netRevenue = args.netRevenue;
+              bidResponse.dealId = typeof args.dealId !== 'undefined' ? args.dealId : '';
+              bidResponse.mediaType = args.mediaType;
+              if (bidResponse.mediaType === 'native') {
+                bidResponse.nativeTitle = typeof args['native']['title'] !== 'undefined' ? args['native']['title'] : '';
+                bidResponse.nativeSponsoredBy = typeof args['native']['sponsoredBy'] !== 'undefined' ? args['native']['sponsoredBy'] : '';
+              }
+              bidResponse.timeToRespond = args.timeToRespond;
+              bidResponse.requestTimestamp = args.requestTimestamp;
+              bidResponse.responseTimestamp = args.responseTimestamp;
+              bidResponse.bidForSize = args.size;
+              for (const [adserverTargetingKey, adserverTargetingValue] of Object.entries(args.adserverTargeting)) {
+                if (['body', 'icon', 'image', 'linkurl', 'host', 'path'].every((ele) => !strIncludes(adserverTargetingKey, ele))) {
+                  bidResponse['adserverTargeting-' + adserverTargetingKey] = adserverTargetingValue;
+                }
+              }
+              bidResponse.renderStatus = 'bid-response-received';
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.NO_BID:
+          utils.logInfo(localStoragePrefix + 'NO_BID:', 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) {
+              const noBid = events.auctions[args.auctionId]['bids'][args.bidId];
+              noBid.renderStatus = 'no-bid';
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_WON:
+          utils.logInfo(localStoragePrefix + 'BID_WON:', JSON.stringify(args));
+          if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
+            updateSessionId();
+          }
+          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) {
+              const wonBid = events.auctions[args.auctionId]['bids'][args.requestId];
+              wonBid.won = true;
+              wonBid.renderStatus = 'bid-won';
+              send({ 'bids': [wonBid] }, 'won');
+            }
+          }
+          break;
+        case CONSTANTS.EVENTS.BID_TIMEOUT:
+          utils.logInfo(localStoragePrefix + 'BID_TIMEOUT:', JSON.stringify(args));
+          if (args.length) {
+            args.forEach(timeout => {
+              if (typeof timeout !== 'undefined' && typeof timeout.auctionId !== 'undefined' && timeout.auctionId.length) {
+                if (typeof events.auctions[args.auctionId] === 'undefined') {
+                  events.auctions[args.auctionId] = { bids: {} };
+                } else if (Object.keys(events.auctions[args.auctionId]['bids']).length) {
+                  const timeoutBid = events.auctions[timeout.auctionId].bids[timeout.bidId];
+                  timeoutBid.timeout = true;
+                  timeoutBid.renderStatus = 'bid-timedout';
+                }
+              }
+            });
+          }
+          break;
+        case CONSTANTS.EVENTS.AUCTION_END:
+          utils.logInfo(localStoragePrefix + 'AUCTION_END:', JSON.stringify(args));
+          if (typeof initOptions.enableSession !== 'undefined' && initOptions.enableSession) {
+            updateSessionId();
+          }
+          if (typeof args.auctionId !== 'undefined' && args.auctionId.length) {
+            const bids = Object.values(events.auctions[args.auctionId]['bids']);
+            send({ 'bids': bids }, 'auctionEnd');
+          }
+          break;
+      }
+    }
+  }
+});
+
+yuktamediaAnalyticsAdapter.buildUtmTagData = function (options) {
+  let utmTagData = {};
+  let utmTagsDetected = false;
+  if (typeof options.enableUTMCollection !== 'undefined' && options.enableUTMCollection) {
+    utmTags.forEach(function (utmTagKey) {
+      let utmTagValue = getParameterByName(utmTagKey);
+      if (utmTagValue !== '') {
+        utmTagsDetected = true;
+      }
+      utmTagData[utmTagKey] = utmTagValue;
+    });
+    utmTags.forEach(function (utmTagKey) {
+      if (utmTagsDetected) {
+        storage.setDataInLocalStorage(localStoragePrefix.concat(utmTagKey), utmTagData[utmTagKey]);
+        storage.setDataInLocalStorage(localStoragePrefix.concat('utm_timeout'), Date.now());
+      } else {
+        if (!isUtmTimeoutExpired()) {
+          utmTagData[utmTagKey] = storage.getDataFromLocalStorage(localStoragePrefix.concat(utmTagKey)) ? storage.getDataFromLocalStorage(localStoragePrefix.concat(utmTagKey)) : '';
+          storage.setDataInLocalStorage(localStoragePrefix.concat('utm_timeout'), Date.now());
+        }
+      }
+    });
+  }
+  return utmTagData;
+};
+
 yuktamediaAnalyticsAdapter.originEnableAnalytics = yuktamediaAnalyticsAdapter.enableAnalytics;
 yuktamediaAnalyticsAdapter.enableAnalytics = function (config) {
-  initOptions = config.options;
+  if (config && config.options) {
+    if (typeof config.options.pubId === 'undefined' || typeof config.options.pubKey === 'undefined') {
+      utils.logError('Need pubId and pubKey to log auction results. Please contact a YuktaMedia representative if you do not know your pubId and pubKey.');
+      return;
+    }
+  }
+  initOptions = Object.assign({}, config.options, this.buildUtmTagData(config.options));
   yuktamediaAnalyticsAdapter.originEnableAnalytics(config);
 };
 
diff --git a/modules/yuktamediaAnalyticsAdapter.md b/modules/yuktamediaAnalyticsAdapter.md
index a21675b6b1d..af47985c834 100644
--- a/modules/yuktamediaAnalyticsAdapter.md
+++ b/modules/yuktamediaAnalyticsAdapter.md
@@ -1,5 +1,5 @@
 # Overview
-Module Name: YuktaMedia Analytics Adapter
+Module Name: YuktaOne Analytics by YuktaMedia
 
 Module Type: Analytics Adapter
 
@@ -15,8 +15,11 @@ Analytics adapter for prebid provided by YuktaMedia. Contact info@yuktamedia.com
 {
   provider: 'yuktamedia',
     options : {
-      pubId : 50357   //id provided by YuktaMedia LLP
-      pubKey: 'xxx'   //key provided by YuktaMedia LLP
+      pubId : 50357,               // id provided by YuktaMedia LLP
+      pubKey: 'xxx',               // key provided by YuktaMedia LLP
+      enableUTMCollection: true,   // set true if want to collect utm info
+      enableSession: true,         // set true if want to collect information by sessions
+      enableUserIdCollection: true // set true if want to collect user ID module info
     }
 }
 ```
diff --git a/modules/zemantaBidAdapter.js b/modules/zemantaBidAdapter.js
new file mode 100644
index 00000000000..b2c00b69c24
--- /dev/null
+++ b/modules/zemantaBidAdapter.js
@@ -0,0 +1,281 @@
+// jshint esversion: 6, es3: false, node: true
+'use strict';
+
+import {
+  registerBidder
+} from '../src/adapters/bidderFactory.js';
+import { NATIVE, BANNER } from '../src/mediaTypes.js';
+import * as utils from '../src/utils.js';
+import { ajax } from '../src/ajax.js';
+import { config } from '../src/config.js';
+
+const BIDDER_CODE = 'zemanta';
+const GVLID = 164;
+const CURRENCY = 'USD';
+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' }
+};
+
+export const spec = {
+  code: BIDDER_CODE,
+  gvlid: GVLID,
+  aliases: [
+    { code: 'outbrain', gvlid: GVLID }
+  ],
+  supportedMediaTypes: [ NATIVE, BANNER ],
+  isBidRequestValid: (bid) => {
+    return (
+      (!!config.getConfig('zemanta.bidderUrl') || !!config.getConfig('outbrain.bidderUrl')) &&
+      !!utils.deepAccess(bid, 'params.publisher.id') &&
+      !!(bid.nativeParams || bid.sizes)
+    );
+  },
+  buildRequests: (validBidRequests, bidderRequest) => {
+    const page = bidderRequest.refererInfo.referer;
+    const ua = navigator.userAgent;
+    const test = setOnAny(validBidRequests, 'params.test');
+    const publisher = setOnAny(validBidRequests, 'params.publisher');
+    const bcat = setOnAny(validBidRequests, 'params.bcat');
+    const badv = setOnAny(validBidRequests, 'params.badv');
+    const cur = CURRENCY;
+    const endpointUrl = config.getConfig('zemanta.bidderUrl') || config.getConfig('outbrain.bidderUrl');
+    const timeout = bidderRequest.timeout;
+
+    const imps = validBidRequests.map((bid, id) => {
+      bid.netRevenue = 'net';
+      const imp = {
+        id: id + 1 + ''
+      }
+
+      if (bid.params.tagid) {
+        imp.tagid = bid.params.tagid
+      }
+
+      if (bid.nativeParams) {
+        imp.native = {
+          request: JSON.stringify({
+            assets: getNativeAssets(bid)
+          })
+        }
+      } else {
+        imp.banner = {
+          format: transformSizes(bid.sizes)
+        }
+      }
+
+      return imp;
+    });
+
+    const request = {
+      id: bidderRequest.auctionId,
+      site: { page, publisher },
+      device: { ua },
+      source: { fd: 1 },
+      cur: [cur],
+      tmax: timeout,
+      imp: imps,
+      bcat: bcat,
+      badv: badv,
+    };
+
+    if (test) {
+      request.is_debug = !!test;
+      request.test = 1;
+    }
+
+    if (utils.deepAccess(bidderRequest, 'gdprConsent.gdprApplies')) {
+      utils.deepSetValue(request, 'user.ext.consent', bidderRequest.gdprConsent.consentString)
+      utils.deepSetValue(request, 'regs.ext.gdpr', bidderRequest.gdprConsent.gdprApplies & 1)
+    }
+    if (bidderRequest.uspConsent) {
+      utils.deepSetValue(request, 'regs.ext.us_privacy', bidderRequest.uspConsent)
+    }
+    if (config.getConfig('coppa') === true) {
+      utils.deepSetValue(request, 'regs.coppa', config.getConfig('coppa') & 1)
+    }
+
+    return {
+      method: 'POST',
+      url: endpointUrl,
+      data: JSON.stringify(request),
+      bids: validBidRequests
+    };
+  },
+  interpretResponse: (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 type = bid.nativeParams ? NATIVE : BANNER;
+        const bidObject = {
+          requestId: bid.bidId,
+          cpm: bidResponse.price,
+          creativeId: bidResponse.crid,
+          ttl: 360,
+          netRevenue: bid.netRevenue === 'net',
+          currency: cur,
+          mediaType: type,
+          nurl: bidResponse.nurl,
+        };
+        if (type === NATIVE) {
+          bidObject.native = parseNative(bidResponse);
+        } else {
+          bidObject.ad = bidResponse.adm;
+          bidObject.width = bidResponse.w;
+          bidObject.height = bidResponse.h;
+        }
+        bidObject.meta = {};
+        if (bidResponse.adomain && bidResponse.adomain.length > 0) {
+          bidObject.meta.advertiserDomains = bidResponse.adomain;
+        }
+        return bidObject;
+      }
+    }).filter(Boolean);
+  },
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    const syncs = [];
+    let syncUrl = config.getConfig('zemanta.usersyncUrl') || config.getConfig('outbrain.usersyncUrl');
+    if (syncOptions.pixelEnabled && syncUrl) {
+      if (gdprConsent) {
+        syncUrl += '&gdpr=' + (gdprConsent.gdprApplies & 1);
+        syncUrl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+      }
+      if (uspConsent) {
+        syncUrl += '&us_privacy=' + encodeURIComponent(uspConsent);
+      }
+
+      syncs.push({
+        type: 'image',
+        url: syncUrl
+      });
+    }
+    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
+    if (bid.nurl) {
+      ajax(utils.replaceAuctionPrice(bid.nurl, bid.originalCpm))
+    }
+  }
+};
+
+registerBidder(spec);
+
+function parseNative(bid) {
+  const { assets, link, eventtrackers } = JSON.parse(bid.adm);
+  const result = {
+    clickUrl: link.url,
+    clickTrackers: link.clicktrackers || 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 };
+    }
+  });
+  if (eventtrackers) {
+    result.impressionTrackers = [];
+    eventtrackers.forEach(tracker => {
+      if (tracker.event !== 1) return;
+      switch (tracker.method) {
+        case 1: // img
+          result.impressionTrackers.push(tracker.url);
+          break;
+        case 2: // js
+          result.javascriptTrackers = ``;
+          break;
+      }
+    });
+  }
+  return result;
+}
+
+function setOnAny(collection, key) {
+  for (let i = 0, result; i < collection.length; i++) {
+    result = utils.deepAccess(collection[i], key);
+    if (result) {
+      return result;
+    }
+  }
+}
+
+function flatten(arr) {
+  return [].concat(...arr);
+}
+
+function getNativeAssets(bid) {
+  return utils._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);
+}
+
+/* Turn bid request sizes into ut-compatible format */
+function transformSizes(requestSizes) {
+  if (!utils.isArray(requestSizes)) {
+    return [];
+  }
+
+  if (requestSizes.length === 2 && !utils.isArray(requestSizes[0])) {
+    return [{
+      w: parseInt(requestSizes[0], 10),
+      h: parseInt(requestSizes[1], 10)
+    }];
+  } else if (utils.isArray(requestSizes[0])) {
+    return requestSizes.map(item =>
+      ({
+        w: parseInt(item[0], 10),
+        h: parseInt(item[1], 10)
+      })
+    );
+  }
+
+  return [];
+}
diff --git a/modules/zemantaBidAdapter.md b/modules/zemantaBidAdapter.md
new file mode 100644
index 00000000000..fa933ecd922
--- /dev/null
+++ b/modules/zemantaBidAdapter.md
@@ -0,0 +1,111 @@
+# Overview
+
+```
+Module Name: Zemanta Adapter
+Module Type: Bidder Adapter
+Maintainer: prog-ops-team@outbrain.com
+```
+
+# Description
+
+Module that connects to zemanta bidder to fetch bids.
+Both native and display formats are supported but not at the same time. Using OpenRTB standard.
+
+# Configuration
+
+## Bidder and usersync URLs
+
+The Zemanta adapter does not work without setting the correct bidder and usersync URLs.
+You will receive the URLs when contacting us.
+
+```
+pbjs.setConfig({
+    zemanta: {
+      bidderUrl: 'https://bidder-url.com',
+      usersyncUrl: 'https://usersync-url.com'
+    }
+});
+```
+
+
+# Test Native Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_native_example_1',
+        mediaTypes: {
+            native: {
+                image: {
+                    required: false,
+                    sizes: [100, 50]
+                },
+                title: {
+                    required: false,
+                    len: 140
+                },
+                sponsoredBy: {
+                    required: false
+                },
+                clickUrl: {
+                    required: false
+                },
+                body: {
+                    required: false
+                },
+                icon: {
+                    required: false,
+                    sizes: [50, 50]
+                }
+            }
+        },
+        bids: [{
+            bidder: 'zemanta',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            }
+        }]
+    ];
+
+    pbjs.setConfig({
+        zemanta: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
+
+# Test Display Parameters
+```
+    var adUnits = [
+        code: '/19968336/prebid_display_example_1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        bids: [{
+            bidder: 'zemanta',
+            params: {
+                publisher: {
+                  id: '2706', // required
+                  name: 'Publishers Name',
+                  domain: 'publisher.com'
+                },
+                tagid: 'tag-id',
+                bcat: ['IAB1-1'],
+                badv: ['example.com']
+            },
+        }]
+    ];
+
+    pbjs.setConfig({
+        zemanta: {
+          bidderUrl: 'https://prebidtest.zemanta.com/api/bidder/prebidtest/bid/'
+        }
+    });
+```
diff --git a/modules/zeotapIdPlusIdSystem.js b/modules/zeotapIdPlusIdSystem.js
new file mode 100644
index 00000000000..8f26cc827d6
--- /dev/null
+++ b/modules/zeotapIdPlusIdSystem.js
@@ -0,0 +1,64 @@
+/**
+ * This module adds Zeotap to the User ID module
+ * The {@link module:modules/userId} module is required
+ * @module modules/zeotapIdPlusIdSystem
+ * @requires module:modules/userId
+ */
+import * as utils from '../src/utils.js'
+import {submodule} from '../src/hook.js';
+import { getStorageManager } from '../src/storageManager.js';
+
+const ZEOTAP_COOKIE_NAME = 'IDP';
+const ZEOTAP_VENDOR_ID = 301;
+const ZEOTAP_MODULE_NAME = 'zeotapIdPlus';
+
+function readCookie() {
+  return storage.cookiesAreEnabled() ? storage.getCookie(ZEOTAP_COOKIE_NAME) : null;
+}
+
+function readFromLocalStorage() {
+  return storage.localStorageIsEnabled() ? storage.getDataFromLocalStorage(ZEOTAP_COOKIE_NAME) : null;
+}
+
+export function getStorage() {
+  return getStorageManager(ZEOTAP_VENDOR_ID, ZEOTAP_MODULE_NAME);
+}
+
+export const storage = getStorage();
+
+/** @type {Submodule} */
+export const zeotapIdPlusSubmodule = {
+  /**
+   * used to link submodule with config
+   * @type {string}
+   */
+  name: ZEOTAP_MODULE_NAME,
+  /**
+   * Vendor ID of Zeotap
+   * @type {Number}
+   */
+  gvlid: ZEOTAP_VENDOR_ID,
+  /**
+   * decode the stored id value for passing to bid requests
+   * @function
+   * @param { Object | string | undefined } value
+   * @return { Object | string | undefined }
+   */
+  decode(value) {
+    const id = value ? utils.isStr(value) ? value : utils.isPlainObject(value) ? value.id : undefined : undefined;
+    return id ? {
+      'IDP': JSON.parse(atob(id))
+    } : 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 id = readCookie() || readFromLocalStorage();
+    return id ? { id } : undefined;
+  }
+};
+submodule('userId', zeotapIdPlusSubmodule);
diff --git a/modules/zetaBidAdapter.js b/modules/zetaBidAdapter.js
new file mode 100644
index 00000000000..a6cbc831604
--- /dev/null
+++ b/modules/zetaBidAdapter.js
@@ -0,0 +1,186 @@
+import * as utils from '../src/utils.js';
+import { registerBidder } from '../src/adapters/bidderFactory.js';
+import {BANNER} from '../src/mediaTypes.js';
+const BIDDER_CODE = 'zeta_global';
+const PREBID_DEFINER_ID = '44253'
+const ENDPOINT_URL = 'https://prebid.rfihub.com/prebid';
+const USER_SYNC_URL = 'https://p.rfihub.com/cm?in=1&pub=';
+const DEFAULT_CUR = 'USD';
+const TTL = 200;
+const NET_REV = true;
+
+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) {
+    // check for all required bid fields
+    if (!(bid &&
+          bid.bidId &&
+          bid.params)) {
+      utils.logWarn('Invalid bid request - missing required bid data');
+      return false;
+    }
+
+    if (!(bid.params.user &&
+          bid.params.user.buyeruid)) {
+      utils.logWarn('Invalid bid request - missing required user data');
+      return false;
+    }
+
+    if (!(bid.params.device &&
+          bid.params.device.ip)) {
+      utils.logWarn('Invalid bid request - missing required device data');
+      return false;
+    }
+
+    if (!(bid.params.device.geo &&
+          bid.params.device.geo.country)) {
+      utils.logWarn('Invalid bid request - missing required geo data');
+      return false;
+    }
+
+    if (!bid.params.definerId) {
+      utils.logWarn('Invalid bid request - missing required definer data');
+      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; // treat all requests as secure
+    const request = validBidRequests[0];
+    const params = request.params;
+    let impData = {
+      id: request.bidId,
+      secure: secure,
+      banner: buildBanner(request)
+    };
+    let payload = {
+      id: bidderRequest.auctionId,
+      imp: [impData],
+      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: params.bcat,
+      badv: params.badv,
+      bapp: params.bapp,
+      source: params.source ? params.source : {},
+      regs: params.regs ? params.regs : {},
+      ext: params.ext ? params.ext : {}
+    };
+
+    payload.device.ua = navigator.userAgent;
+    payload.device.ip = navigator.ip;
+    payload.site.page = bidderRequest.refererInfo.referer;
+    payload.site.mobile = /(ios|ipod|ipad|iphone|android)/i.test(navigator.userAgent) ? 1 : 0;
+    payload.ext.definerId = params.definerId;
+
+    if (params.test) {
+      payload.test = params.test;
+    }
+    if (request.gdprConsent) {
+      payload.regs.ext = Object.assign(
+        payload.regs.ext,
+        {gdpr: request.gdprConsent.gdprApplies === true ? 1 : 0}
+      );
+    }
+    if (request.gdprConsent && request.gdprConsent.gdprApplies) {
+      payload.user.ext = Object.assign(
+        payload.user.ext,
+        {consent: request.gdprConsent.consentString}
+      );
+    }
+    const postUrl = params.definerId !== PREBID_DEFINER_ID ? ENDPOINT_URL.concat('/', params.definerId) : 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 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) {
+      let zetaResponse = serverResponse.body;
+      let zetaBid = zetaResponse.seatbid[0].bid[0];
+      let bid = {
+        requestId: zetaBid.impid,
+        cpm: zetaBid.price,
+        currency: zetaResponse.cur,
+        width: zetaBid.w,
+        height: zetaBid.h,
+        ad: zetaBid.adm,
+        ttl: TTL,
+        creativeId: zetaBid.crid,
+        netRevenue: NET_REV
+      };
+      bidResponse.push(bid);
+    }
+    return bidResponse;
+  },
+
+  /**
+     * 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.
+     * @param gdprConsent The GDPR consent parameters
+     * @param uspConsent The USP consent parameters
+     * @return {UserSync[]} The user syncs which should be dropped.
+     */
+  getUserSyncs: function(syncOptions, serverResponses, gdprConsent, uspConsent) {
+    const syncs = [];
+    if (syncOptions.iframeEnabled) {
+      syncs.push({
+        type: 'iframe',
+        url: USER_SYNC_URL.concat(PREBID_DEFINER_ID)
+      });
+    }
+    return syncs;
+  }
+}
+
+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]
+  };
+}
+
+registerBidder(spec);
diff --git a/modules/zetaBidAdapter.md b/modules/zetaBidAdapter.md
new file mode 100644
index 00000000000..e0f7271a4f1
--- /dev/null
+++ b/modules/zetaBidAdapter.md
@@ -0,0 +1,45 @@
+# Overview
+
+```
+Module Name: Zeta Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: DL-ZetaDSP-Supply-Engineering@zetaglobal.com
+```
+
+# Description
+
+Module that connects to Zeta's demand sources
+
+# Test Parameters
+```
+        var adUnits = [
+            {
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 250]],  // a display size
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'zeta_global',
+                        bidId: 12345,
+                        params: {
+                            placement: 12345,
+                            user: {
+                                uid: 12345,
+                                buyeruid: 12345
+                            },
+                            device: {
+                                ip: '111.222.33.44',
+                                geo: {
+                                    country: 'USA'
+                                }
+                            },
+                            definerId: '44253',
+                            test: 1
+                        }
+                    }
+                ]
+            }
+        ];
+```
diff --git a/modules/zetaSspBidAdapter.js b/modules/zetaSspBidAdapter.js
new file mode 100644
index 00000000000..ecf3c2835d4
--- /dev/null
+++ b/modules/zetaSspBidAdapter.js
@@ -0,0 +1,193 @@
+import * as utils 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 = 'zeta_global_ssp';
+const ENDPOINT_URL = 'https://ssp.disqus.com/bid';
+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';
+const TTL = 200;
+const NET_REV = true;
+
+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) {
+    // check for all required bid fields
+    if (!(bid &&
+      bid.bidId &&
+      bid.params)) {
+      utils.logWarn('Invalid bid request - missing required bid data');
+      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; // treat all requests as secure
+    const request = validBidRequests[0];
+    const params = request.params;
+    const impData = {
+      id: request.bidId,
+      secure: secure,
+      banner: buildBanner(request)
+    };
+    const fpd = config.getLegacyFpd(config.getConfig('ortb2')) || {};
+    let payload = {
+      id: bidderRequest.auctionId,
+      cur: [DEFAULT_CUR],
+      imp: [impData],
+      site: params.site ? params.site : {},
+      device: {...fpd.device, ...params.device},
+      user: params.user ? params.user : {},
+      app: params.app ? params.app : {},
+      ext: {
+        tags: params.tags ? params.tags : {},
+        sid: params.sid ? params.sid : undefined
+      }
+    };
+    const rInfo = bidderRequest.refererInfo;
+    payload.device.ua = navigator.userAgent;
+    payload.site.page = (rInfo && rInfo.referer) ? rInfo.referer.trim() : 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 (request.gdprConsent) {
+      payload.regs = {
+        ext: {
+          gdpr: request.gdprConsent.gdprApplies === true ? 1 : 0
+        }
+      };
+      if (request.gdprConsent.gdprApplies && request.gdprConsent.consentString) {
+        payload.user.ext = {
+          ...payload.user.ext,
+          consent: request.gdprConsent.consentString
+        }
+      }
+    }
+    provideEids(request, payload);
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      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 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) {
+      let zetaResponse = serverResponse.body;
+      let zetaBid = zetaResponse.seatbid[0].bid[0];
+      let bid = {
+        requestId: zetaBid.impid,
+        cpm: zetaBid.price,
+        currency: zetaResponse.cur,
+        width: zetaBid.w,
+        height: zetaBid.h,
+        ad: zetaBid.adm,
+        ttl: TTL,
+        creativeId: zetaBid.crid,
+        netRevenue: NET_REV,
+      };
+      if (zetaBid.adomain && zetaBid.adomain.length) {
+        bid.meta = {
+          advertiserDomains: zetaBid.adomain
+        };
+      }
+      bidResponse.push(bid);
+    }
+    return bidResponse;
+  },
+
+  /**
+   * Register User Sync.
+   */
+  getUserSyncs: (syncOptions, responses, gdprConsent, uspConsent) => {
+    let syncurl = '';
+
+    // Attaching GDPR Consent Params in UserSync url
+    if (gdprConsent) {
+      syncurl += '&gdpr=' + (gdprConsent.gdprApplies ? 1 : 0);
+      syncurl += '&gdpr_consent=' + encodeURIComponent(gdprConsent.consentString || '');
+    }
+
+    // CCPA
+    if (uspConsent) {
+      syncurl += '&us_privacy=' + encodeURIComponent(uspConsent);
+    }
+
+    // coppa compliance
+    if (config.getConfig('coppa') === true) {
+      syncurl += '&coppa=1';
+    }
+
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USER_SYNC_URL_IFRAME + syncurl
+      }];
+    } else {
+      return [{
+        type: 'image',
+        url: USER_SYNC_URL_IMAGE + syncurl
+      }];
+    }
+  }
+}
+
+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 provideEids(request, payload) {
+  if (Array.isArray(request.userIdAsEids) && request.userIdAsEids.length > 0) {
+    utils.deepSetValue(payload, 'user.ext.eids', request.userIdAsEids);
+  }
+}
+
+function getDomainFromURL(url) {
+  let anchor = document.createElement('a');
+  anchor.href = url;
+  let hostname = anchor.hostname;
+  if (hostname.indexOf('www.') === 0) {
+    return hostname.substring(4);
+  }
+  return hostname;
+}
+
+registerBidder(spec);
diff --git a/modules/zetaSspBidAdapter.md b/modules/zetaSspBidAdapter.md
new file mode 100644
index 00000000000..d2950bce6b9
--- /dev/null
+++ b/modules/zetaSspBidAdapter.md
@@ -0,0 +1,42 @@
+# Overview
+
+```
+Module Name: Zeta Ssp Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: miakovlev@zetaglobal.com
+```
+
+# Description
+
+Module that connects to Zeta's SSP
+
+# Test Parameters
+```
+        var adUnits = [
+            {
+                mediaTypes: {
+                    banner: {
+                        sizes: [[300, 250]],  // a display size
+                    }
+                },
+                bids: [
+                    {
+                        bidder: 'zeta_global_ssp',
+                        bidId: 12345,
+                        params: {
+                            placement: 12345,
+                            user: {
+                                uid: 12345,
+                                buyeruid: 12345
+                            },
+                            tags: {
+                                someTag: 123,
+                                sid: 'publisherId'
+                            },
+                            test: 1
+                        }
+                    }
+                ]
+            }
+        ];
+```
diff --git a/package-lock.json b/package-lock.json
index 2fc53a75352..2ab04045665 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,507 +1,518 @@
 {
   "name": "prebid.js",
-  "version": "3.24.0-pre",
+  "version": "4.43.0-pre",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
-      "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
       "requires": {
-        "@babel/highlight": "^7.10.1"
+        "@babel/highlight": "^7.12.13"
       }
     },
     "@babel/compat-data": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
-      "integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz",
+      "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ=="
     },
     "@babel/core": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
-      "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/generator": "^7.10.2",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helpers": "^7.10.1",
-        "@babel/parser": "^7.10.2",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.2",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz",
+      "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==",
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.14.3",
+        "@babel/helper-compilation-targets": "^7.13.16",
+        "@babel/helper-module-transforms": "^7.14.2",
+        "@babel/helpers": "^7.14.0",
+        "@babel/parser": "^7.14.3",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
+        "gensync": "^1.0.0-beta.2",
         "json5": "^2.1.2",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
+        "semver": "^6.3.0",
         "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@babel/generator": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
-      "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
-      "dev": true,
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
+      "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
       "requires": {
-        "@babel/types": "^7.10.2",
+        "@babel/types": "^7.14.2",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz",
-      "integrity": "sha512-ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
+      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz",
-      "integrity": "sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
+      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-explode-assignable-expression": "^7.12.13",
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
-      "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz",
+      "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==",
       "requires": {
-        "@babel/compat-data": "^7.10.1",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/compat-data": "^7.14.4",
+        "@babel/helper-validator-option": "^7.12.17",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
-      "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz",
+      "integrity": "sha512-idr3pthFlDCpV+p/rMgGLGYIVtazeatrSOQk8YzO2pAepIjQhCN3myeihVg58ax2bbbGK9PUE1reFi7axOYIOw==",
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-function-name": "^7.14.2",
+        "@babel/helper-member-expression-to-functions": "^7.13.12",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.14.4",
+        "@babel/helper-split-export-declaration": "^7.12.13"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz",
-      "integrity": "sha512-Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA==",
-      "dev": true,
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.3.tgz",
+      "integrity": "sha512-JIB2+XJrb7v3zceV2XzDhGIB902CmKGSpSl4q2C6agU9SNLG/2V1RtFRGPG1Ajh9STj3+q6zJMOC+N/pp2P9DA==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1",
-        "regexpu-core": "^4.7.0"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "regexpu-core": "^4.7.1"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz",
-      "integrity": "sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==",
-      "dev": true,
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@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"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz",
-      "integrity": "sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
+      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
       "requires": {
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.13.0"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
-      "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz",
+      "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-get-function-arity": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
-      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz",
-      "integrity": "sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==",
-      "dev": true,
+      "version": "7.13.16",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz",
+      "integrity": "sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/traverse": "^7.13.15",
+        "@babel/types": "^7.13.16"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
-      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
-      "dev": true,
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
-      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
-      "dev": true,
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.13.12"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
-      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz",
+      "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==",
       "requires": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@babel/helper-module-imports": "^7.13.12",
+        "@babel/helper-replace-supers": "^7.13.12",
+        "@babel/helper-simple-access": "^7.13.12",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-validator-identifier": "^7.14.0",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
-      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz",
-      "integrity": "sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==",
-      "dev": true
-    },
-    "@babel/helper-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz",
-      "integrity": "sha512-7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.13"
-      }
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
+      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-wrap-function": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-wrap-function": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
-      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz",
+      "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==",
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-member-expression-to-functions": "^7.13.12",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.4"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
-      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
-      "dev": true,
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
       "requires": {
-        "@babel/template": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.13.12"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
+      "requires": {
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
-      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
       "requires": {
-        "@babel/types": "^7.10.1"
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
-      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
-      "dev": true
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+      "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.12.17",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
-      "integrity": "sha512-C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
+      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.13.0",
+        "@babel/types": "^7.13.0"
       }
     },
     "@babel/helpers": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
-      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
-      "dev": true,
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+      "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
       "requires": {
-        "@babel/template": "^7.10.1",
-        "@babel/traverse": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/template": "^7.12.13",
+        "@babel/traverse": "^7.14.0",
+        "@babel/types": "^7.14.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
-      "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
-      "dev": true,
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+      "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.1",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
-      "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
-      "dev": true
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz",
+      "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA=="
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.13.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz",
+      "integrity": "sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12"
+      }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz",
-      "integrity": "sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz",
+      "integrity": "sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-remap-async-to-generator": "^7.13.0",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz",
-      "integrity": "sha512-sqdGWgoXlnOdgMXU+9MbhzwFRgxVLeiGBqTrnuS7LC2IBU31wSsESbTUreT2O418obpfPdGUR2GbEufZF1bpqw==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
+      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz",
+      "integrity": "sha512-HEjzp5q+lWSjAgJtSluFDrGGosmwTgKwCXdDQZvhKsRlwv3YdkUEqxNrrjesJd+B9E9zvr1PVPVBvhYZ9msjvQ==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-class-features-plugin": "^7.14.3",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-class-static-block": "^7.12.13"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz",
-      "integrity": "sha512-Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz",
+      "integrity": "sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz",
+      "integrity": "sha512-sRxW3z3Zp3pFfLAgVEvzTFutTXax837oOatUIvSG9o5gRj9mKwm3br1Se5f4QalTQs9x4AzlA/HrCWbQIHASUQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz",
-      "integrity": "sha512-m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz",
+      "integrity": "sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz",
+      "integrity": "sha512-1JAZtUrqYyGsS7IDmFeaem+/LJqujfLZ2weLR9ugB0ufUPjzf8cguyVT1g5im7f7RXxuLq1xUxEzvm68uYRtGg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz",
-      "integrity": "sha512-56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz",
+      "integrity": "sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz",
+      "integrity": "sha512-DcTQY9syxu9BpU3Uo94fjCB3LN9/hgPS8oUL7KrSW3bA2ePrKZZPJcc5y0hoJAM9dft3pGfErtEUvxXQcfLxUg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz",
-      "integrity": "sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz",
+      "integrity": "sha512-AYosOWBlyyXEagrPRfLJ1enStufsr7D1+ddpj8OLi9k7B6+NdZ0t/9V7Fh+wJ4g2Jol8z2JkgczYqtWrZd4vbA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.1"
+        "@babel/compat-data": "^7.14.4",
+        "@babel/helper-compilation-targets": "^7.14.4",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.2"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz",
-      "integrity": "sha512-VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz",
+      "integrity": "sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz",
-      "integrity": "sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz",
+      "integrity": "sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz",
-      "integrity": "sha512-RZecFFJjDiQ2z6maFprLgrdnm0OzoC23Mx89xf1CcEsxmHuzuXOdniEuI+S3v7vjQG4F5sa6YtUp+19sZuSxHg==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
+      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-class-features-plugin": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz",
+      "integrity": "sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-create-class-features-plugin": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz",
-      "integrity": "sha512-JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
+      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz",
-      "integrity": "sha512-Gf2Yx/iRs1JREDtVZ56OrjjgFHCaldpTnuy9BHla10qyVT3YkIIGEtoDWhyop0ksu1GvNjHIoYRBqm3zoR1jyQ==",
-      "dev": true,
+      "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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz",
+      "integrity": "sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
     "@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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@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==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
     "@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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz",
-      "integrity": "sha512-uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg==",
-      "dev": true,
+      "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==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -510,7 +521,6 @@
       "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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
@@ -519,412 +529,390 @@
       "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==",
-      "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz",
+      "integrity": "sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.13.0"
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz",
-      "integrity": "sha512-hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz",
-      "integrity": "sha512-6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
+      "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz",
-      "integrity": "sha512-XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
+      "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
       "requires": {
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-remap-async-to-generator": "^7.10.1"
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-remap-async-to-generator": "^7.13.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz",
-      "integrity": "sha512-B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
+      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz",
-      "integrity": "sha512-8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz",
+      "integrity": "sha512-5KdpkGxsZlTk+fPleDtGKsA+pon28+ptYmMO8GBSa5fHERCJWAzj50uAfCKBqq42HO+Zot6JF1x37CRprwmN4g==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "lodash": "^4.17.13"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz",
-      "integrity": "sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-define-map": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-optimise-call-expression": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz",
+      "integrity": "sha512-p73t31SIj6y94RDVX57rafVjttNr8MvKEgs5YFatNB/xC68zM3pyosuOEcQmYsYlyQaGY9R7rAULVRcat5FKJQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-function-name": "^7.14.2",
+        "@babel/helper-optimise-call-expression": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-replace-supers": "^7.14.4",
+        "@babel/helper-split-export-declaration": "^7.12.13",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz",
-      "integrity": "sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
+      "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz",
-      "integrity": "sha512-V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz",
+      "integrity": "sha512-JyywKreTCGTUsL1OKu1A3ms/R1sTP0WxbpXlALeGzF53eB3bxtNkYdMj9SDgK7g6ImPy76J5oYYKoTtQImlhQA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz",
-      "integrity": "sha512-19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
+      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz",
-      "integrity": "sha512-wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
+      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz",
-      "integrity": "sha512-lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
+      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz",
-      "integrity": "sha512-US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
+      "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz",
-      "integrity": "sha512-//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
+      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
       "requires": {
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-function-name": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz",
-      "integrity": "sha512-qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
+      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz",
-      "integrity": "sha512-UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
+      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz",
-      "integrity": "sha512-31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz",
+      "integrity": "sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
+        "@babel/helper-module-transforms": "^7.14.2",
+        "@babel/helper-plugin-utils": "^7.13.0",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz",
-      "integrity": "sha512-AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg==",
-      "dev": true,
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz",
+      "integrity": "sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-simple-access": "^7.10.1",
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-simple-access": "^7.13.12",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz",
-      "integrity": "sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.10.1",
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
+      "version": "7.13.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
+      "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.13.0",
+        "@babel/helper-module-transforms": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-identifier": "^7.12.11",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz",
-      "integrity": "sha512-EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA==",
-      "dev": true,
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz",
+      "integrity": "sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-module-transforms": "^7.14.0",
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
+      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz",
-      "integrity": "sha512-MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
+      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz",
-      "integrity": "sha512-WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
+      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-replace-supers": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-replace-supers": "^7.12.13"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz",
-      "integrity": "sha512-tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg==",
-      "dev": true,
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz",
+      "integrity": "sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz",
-      "integrity": "sha512-Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
+      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz",
-      "integrity": "sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==",
-      "dev": true,
+      "version": "7.13.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz",
+      "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==",
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz",
-      "integrity": "sha512-qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
+      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz",
-      "integrity": "sha512-AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
+      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz",
-      "integrity": "sha512-8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
+      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz",
-      "integrity": "sha512-j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
+      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/helper-regex": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz",
-      "integrity": "sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==",
-      "dev": true,
+      "version": "7.13.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
+      "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.13.0"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz",
-      "integrity": "sha512-qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
+      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz",
-      "integrity": "sha512-zZ0Poh/yy1d4jeDWpx/mNwbKJVwUYJX73q+gyh4bwtG0/iUlzdEu0sLMda8yuDFS6LBQlT/ST1SJAR6zYwXWgw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
+      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz",
-      "integrity": "sha512-Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
+      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
     "@babel/preset-env": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
-      "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.10.1",
-        "@babel/helper-compilation-targets": "^7.10.2",
-        "@babel/helper-module-imports": "^7.10.1",
-        "@babel/helper-plugin-utils": "^7.10.1",
-        "@babel/plugin-proposal-async-generator-functions": "^7.10.1",
-        "@babel/plugin-proposal-class-properties": "^7.10.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.10.1",
-        "@babel/plugin-proposal-json-strings": "^7.10.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.10.1",
-        "@babel/plugin-proposal-object-rest-spread": "^7.10.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.10.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-        "@babel/plugin-proposal-private-methods": "^7.10.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.10.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.10.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.1",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.10.1",
-        "@babel/plugin-transform-arrow-functions": "^7.10.1",
-        "@babel/plugin-transform-async-to-generator": "^7.10.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.10.1",
-        "@babel/plugin-transform-block-scoping": "^7.10.1",
-        "@babel/plugin-transform-classes": "^7.10.1",
-        "@babel/plugin-transform-computed-properties": "^7.10.1",
-        "@babel/plugin-transform-destructuring": "^7.10.1",
-        "@babel/plugin-transform-dotall-regex": "^7.10.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.10.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.10.1",
-        "@babel/plugin-transform-for-of": "^7.10.1",
-        "@babel/plugin-transform-function-name": "^7.10.1",
-        "@babel/plugin-transform-literals": "^7.10.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.10.1",
-        "@babel/plugin-transform-modules-amd": "^7.10.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.10.1",
-        "@babel/plugin-transform-modules-umd": "^7.10.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.10.1",
-        "@babel/plugin-transform-object-super": "^7.10.1",
-        "@babel/plugin-transform-parameters": "^7.10.1",
-        "@babel/plugin-transform-property-literals": "^7.10.1",
-        "@babel/plugin-transform-regenerator": "^7.10.1",
-        "@babel/plugin-transform-reserved-words": "^7.10.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.10.1",
-        "@babel/plugin-transform-spread": "^7.10.1",
-        "@babel/plugin-transform-sticky-regex": "^7.10.1",
-        "@babel/plugin-transform-template-literals": "^7.10.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.10.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.10.1",
-        "@babel/plugin-transform-unicode-regex": "^7.10.1",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.10.2",
-        "browserslist": "^4.12.0",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.4.tgz",
+      "integrity": "sha512-GwMMsuAnDtULyOtuxHhzzuSRxFeP0aR/LNzrHRzP8y6AgDNgqnrfCCBm/1cRdTU75tRs28Eh76poHLcg9VF0LA==",
+      "requires": {
+        "@babel/compat-data": "^7.14.4",
+        "@babel/helper-compilation-targets": "^7.14.4",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-validator-option": "^7.12.17",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.14.2",
+        "@babel/plugin-proposal-class-properties": "^7.13.0",
+        "@babel/plugin-proposal-class-static-block": "^7.14.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.2",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.2",
+        "@babel/plugin-proposal-json-strings": "^7.14.2",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.2",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.4",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.2",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.2",
+        "@babel/plugin-proposal-private-methods": "^7.13.0",
+        "@babel/plugin-proposal-private-property-in-object": "^7.14.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.12.13",
+        "@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.0",
+        "@babel/plugin-syntax-top-level-await": "^7.12.13",
+        "@babel/plugin-transform-arrow-functions": "^7.13.0",
+        "@babel/plugin-transform-async-to-generator": "^7.13.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
+        "@babel/plugin-transform-block-scoping": "^7.14.4",
+        "@babel/plugin-transform-classes": "^7.14.4",
+        "@babel/plugin-transform-computed-properties": "^7.13.0",
+        "@babel/plugin-transform-destructuring": "^7.14.4",
+        "@babel/plugin-transform-dotall-regex": "^7.12.13",
+        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
+        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
+        "@babel/plugin-transform-for-of": "^7.13.0",
+        "@babel/plugin-transform-function-name": "^7.12.13",
+        "@babel/plugin-transform-literals": "^7.12.13",
+        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
+        "@babel/plugin-transform-modules-amd": "^7.14.2",
+        "@babel/plugin-transform-modules-commonjs": "^7.14.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
+        "@babel/plugin-transform-modules-umd": "^7.14.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
+        "@babel/plugin-transform-new-target": "^7.12.13",
+        "@babel/plugin-transform-object-super": "^7.12.13",
+        "@babel/plugin-transform-parameters": "^7.14.2",
+        "@babel/plugin-transform-property-literals": "^7.12.13",
+        "@babel/plugin-transform-regenerator": "^7.13.15",
+        "@babel/plugin-transform-reserved-words": "^7.12.13",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
+        "@babel/plugin-transform-spread": "^7.13.0",
+        "@babel/plugin-transform-sticky-regex": "^7.12.13",
+        "@babel/plugin-transform-template-literals": "^7.13.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
+        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
+        "@babel/plugin-transform-unicode-regex": "^7.12.13",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.14.4",
+        "babel-plugin-polyfill-corejs2": "^0.2.0",
+        "babel-plugin-polyfill-corejs3": "^0.2.0",
+        "babel-plugin-polyfill-regenerator": "^0.2.0",
+        "core-js-compat": "^3.9.0",
+        "semver": "^6.3.0"
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-      "dev": true,
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
@@ -934,75 +922,44 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
-      "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
-      "dev": true,
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz",
+      "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==",
       "requires": {
         "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-          "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
-          "dev": true
-        }
       }
     },
     "@babel/template": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
-      "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
-      "dev": true,
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
       "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/parser": "^7.10.1",
-        "@babel/types": "^7.10.1"
+        "@babel/code-frame": "^7.12.13",
+        "@babel/parser": "^7.12.13",
+        "@babel/types": "^7.12.13"
       }
     },
     "@babel/traverse": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
-      "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.1",
-        "@babel/generator": "^7.10.1",
-        "@babel/helper-function-name": "^7.10.1",
-        "@babel/helper-split-export-declaration": "^7.10.1",
-        "@babel/parser": "^7.10.1",
-        "@babel/types": "^7.10.1",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz",
+      "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==",
+      "requires": {
+        "@babel/code-frame": "^7.12.13",
+        "@babel/generator": "^7.14.2",
+        "@babel/helper-function-name": "^7.14.2",
+        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/parser": "^7.14.2",
+        "@babel/types": "^7.14.2",
         "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.10.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
-      "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
-      "dev": true,
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz",
+      "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.10.1",
-        "lodash": "^4.17.13",
+        "@babel/helper-validator-identifier": "^7.14.0",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -1020,7 +977,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
       "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
-      "dev": true,
       "requires": {
         "acorn": "^5.0.3",
         "css": "^2.2.1",
@@ -1033,7 +989,6 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -1041,8 +996,7 @@
         "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
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -1050,7 +1004,6 @@
       "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,
       "requires": {
         "normalize-path": "^2.0.1",
         "through2": "^2.0.3"
@@ -1060,7 +1013,6 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -1068,9 +1020,9 @@
       }
     },
     "@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "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
     },
     "@jest/console": {
@@ -1139,105 +1091,43 @@
             "@types/yargs": "^13.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
           }
         },
-        "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==",
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
           "dev": true
         },
+        "@types/yargs": {
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "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
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-message-util": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
@@ -1260,25 +1150,13 @@
           "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
           }
         },
         "slash": {
@@ -1287,6 +1165,15 @@
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^2.0.0"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -1295,16 +1182,6 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
@@ -1331,10 +1208,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -1364,93 +1251,37 @@
             "@types/yargs": "^13.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
           }
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+          "dev": true
+        },
+        "@types/yargs": {
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "@types/yargs-parser": "*"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "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
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-message-util": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
@@ -1467,41 +1298,19 @@
             "stack-utils": "^1.0.1"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
-        "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=",
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "escape-string-regexp": "^2.0.0"
           }
         }
       }
@@ -1546,10 +1355,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -1576,12 +1395,6 @@
             "semver": "^6.0.0"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -1607,6 +1420,12 @@
         "source-map": "^0.6.0"
       },
       "dependencies": {
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1637,10 +1456,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -1695,91 +1524,23 @@
             "@types/yargs": "^13.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
           }
         },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "@types/yargs": {
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "@types/yargs-parser": "*"
           }
         },
         "jest-regex-util": {
@@ -1788,27 +1549,6 @@
           "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -1820,45 +1560,35 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
     "@jest/types": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
-      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
         "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0"
+        "chalk": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -1887,9 +1617,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -1898,33 +1628,41 @@
       }
     },
     "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
-      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "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,
       "requires": {
         "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.1",
-        "loader-utils": "^1.4.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "loader-utils": "^2.0.0",
         "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.6.4"
+        "schema-utils": "^2.7.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
       }
     },
-    "@kiosked/ulid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@kiosked/ulid/-/ulid-3.0.0.tgz",
-      "integrity": "sha512-ZKt2KIgGHDaGfKt6FjYvCpDvBXZRRoE8b+wDOlAV76aXKpq6ITiSUnPYevR4y55NKDnwCvwOrjWe+aVOCAK8kQ=="
-    },
     "@sindresorhus/is": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz",
-      "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
+      "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
       "dev": true
     },
     "@sinonjs/commons": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
-      "integrity": "sha512-wEj54PfsZ5jGSwMX68G8ZXFawcSglQSXqCftWX3ec8MDUzQdHgcKvw97awHbY0efQEL5iKUOAmmVtoYgmrSG4Q==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
@@ -1932,7 +1670,7 @@
     },
     "@sinonjs/formatio": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
       "integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
       "dev": true,
       "requires": {
@@ -1966,9 +1704,9 @@
       }
     },
     "@types/babel__core": {
-      "version": "7.1.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
-      "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
+      "version": "7.1.14",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -1979,18 +1717,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -1998,9 +1736,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
-      "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -2018,22 +1756,58 @@
         "@types/responselike": "*"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+    "@types/cucumber": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/cucumber/-/cucumber-6.0.1.tgz",
+      "integrity": "sha512-+GZV6xfN0MeN9shDCdny8GbC8N0+U6uca8cjyaJndcwmrUhwS6qOU2vmYn0d71EOwJF568/v3SxJ8VKxuZNYRw==",
+      "dev": true
+    },
+    "@types/ejs": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.6.tgz",
+      "integrity": "sha512-fj1hi+ZSW0xPLrJJD+YNwIh9GZbyaIepG26E/gXvp8nCa2pYokxUYO1sK9qjGxp2g8ryZYuon7wmjpwE2cyASQ==",
       "dev": true
     },
+    "@types/expect": {
+      "version": "1.20.4",
+      "resolved": "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz",
+      "integrity": "sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg=="
+    },
+    "@types/fibers": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@types/fibers/-/fibers-3.1.0.tgz",
+      "integrity": "sha512-1o3I9xtk2PZFxwaLCC6gTaBfBZ5rvw/DSZZPK89fwuwO6LNrzSbC6rEs1xI0bQ3fCRWmO+uNJQQeD2J56oTMDg==",
+      "dev": true
+    },
+    "@types/fs-extra": {
+      "version": "9.0.11",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+      "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/http-cache-semantics": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
       "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
       "dev": true
     },
+    "@types/inquirer": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.1.tgz",
+      "integrity": "sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==",
+      "dev": true,
+      "requires": {
+        "@types/through": "*",
+        "rxjs": "^6.4.0"
+      }
+    },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz",
-      "integrity": "sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
@@ -2046,19 +1820,23 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
-      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
-        "@types/istanbul-lib-coverage": "*",
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/json-schema": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
-      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="
+    },
+    "@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
     },
     "@types/keyv": {
@@ -2070,12 +1848,77 @@
         "@types/node": "*"
       }
     },
-    "@types/node": {
-      "version": "14.0.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.9.tgz",
-      "integrity": "sha512-0sCTiXKXELOBxvZLN4krQ0FPOAA7ij+6WwvD0k/PHd9/KAkr4dXel5J9fh6F4x1FwAQILqAWkmpeuS6mjf1iKA==",
+    "@types/lodash": {
+      "version": "4.14.170",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz",
+      "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==",
+      "dev": true
+    },
+    "@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,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
+    "@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,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
+    "@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,
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
+    "@types/mocha": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
+      "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
       "dev": true
     },
+    "@types/node": {
+      "version": "14.17.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
+      "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw=="
+    },
+    "@types/puppeteer": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.3.tgz",
+      "integrity": "sha512-3nE8YgR9DIsgttLW+eJf6mnXxq8Ge+27m5SU3knWmrlfl6+KOG0Bf9f7Ua7K+C4BnaTMAh3/UpySqdAYvrsvjg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/puppeteer-core": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@types/puppeteer-core/-/puppeteer-core-5.4.0.tgz",
+      "integrity": "sha512-yqRPuv4EFcSkTyin6Yy17pN6Qz2vwVwTCJIDYMXbE3j8vTPhv0nCQlZOl5xfi0WHUkqvQsjAR8hAfjeMCoetwg==",
+      "dev": true,
+      "requires": {
+        "@types/puppeteer": "*"
+      }
+    },
+    "@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,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/responselike": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -2086,24 +1929,57 @@
       }
     },
     "@types/stack-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
+      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "dev": true
+    },
+    "@types/stream-buffers": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz",
+      "integrity": "sha512-NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@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/vinyl": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.4.tgz",
+      "integrity": "sha512-2o6a2ixaVI2EbwBPg1QYLGQoHK56p/8X/sGfKbFC8N6sY9lfjsMf/GprtkQkSya0D4uRiutRZ2BWj7k3JvLsAQ==",
+      "requires": {
+        "@types/expect": "^1.20.4",
+        "@types/node": "*"
+      }
+    },
+    "@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
     },
     "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
     "@types/yauzl": {
@@ -2116,26 +1992,39 @@
         "@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==",
+      "dev": true
+    },
     "@wdio/browserstack-service": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-6.1.15.tgz",
-      "integrity": "sha512-q8qLa44wGSB3tIuZ0yquvAZqr2W7vEwupWiOd1ct0CSYgd4yX/nLd8oypqJCc8jU1ZwNAhu+V3/6hszvwx+HbA==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-6.12.1.tgz",
+      "integrity": "sha512-B4zYlaE8q1Jxb6ctcuUPlKL3inwloETwks+cB9fFtVMDf/HH2Cau3Pi0CoIs8435EI+J4/1LxLHQV2uhzbBSlQ==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16",
+        "@wdio/logger": "6.10.10",
         "browserstack-local": "^1.4.5",
         "got": "^11.0.2"
       }
     },
     "@wdio/cli": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.1.16.tgz",
-      "integrity": "sha512-q7JaEiLU2mdOibeKAQFqdWTS2evdkwgWSft1rmWDN7idiV39uncTTUcwlXBKE2a9yDk/8qn6EEXdBLthOCfyOA==",
-      "dev": true,
-      "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.12.1.tgz",
+      "integrity": "sha512-RgCSonEnCWtVgA1XKUlFuBsQdTbeFs9dvP0VBwCTMilwqMPzt9OhpcDjvRjohBSX8dKf7YqcgEOuWr0WDCPQqw==",
+      "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": "6.12.1",
+        "@wdio/logger": "6.10.10",
+        "@wdio/utils": "6.11.0",
         "async-exit-hook": "^2.0.1",
         "chalk": "^4.0.0",
         "chokidar": "^3.0.0",
@@ -2146,157 +2035,404 @@
         "lodash.flattendeep": "^4.4.0",
         "lodash.pickby": "^4.6.0",
         "lodash.union": "^4.6.0",
-        "log-update": "^4.0.0",
-        "webdriverio": "6.1.16",
-        "yargs": "^15.0.1",
+        "mkdirp": "^1.0.4",
+        "recursive-readdir": "^2.2.2",
+        "webdriverio": "6.12.1",
+        "yargs": "^16.0.3",
         "yarn-install": "^1.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "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,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
+            "type-fest": "^0.21.3"
           }
         },
-        "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "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": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "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==",
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.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==",
+        "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
         },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
+            "fill-range": "^7.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
-        },
-        "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,
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "chardet": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+          "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+          "dev": true
+        },
+        "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==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "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"
           }
         },
-        "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==",
+        "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,
           "requires": {
-            "p-limit": "^2.2.0"
+            "restore-cursor": "^3.1.0"
           }
         },
-        "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==",
+        "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
         },
-        "path-exists": {
+        "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,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.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
+        },
+        "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,
+          "requires": {
+            "chardet": "^0.7.0",
+            "iconv-lite": "^0.4.24",
+            "tmp": "^0.0.33"
+          }
+        },
+        "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"
+          }
+        },
+        "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,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "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
+        },
+        "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,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "inquirer": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+          "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^3.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.19",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.6.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "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,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        },
+        "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
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+          "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
           "dev": true
         },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "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,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
           }
         },
+        "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,
+          "requires": {
+            "is-number": "^7.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"
+          }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
         "yargs": {
-          "version": "15.3.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "dev": true,
           "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
             "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.1"
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
+        },
+        "yargs-parser": {
+          "version": "20.2.7",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+          "dev": true
         }
       }
     },
     "@wdio/concise-reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-6.1.14.tgz",
-      "integrity": "sha512-QKGiIPE2sYJpQcQ5zogUogu+Yldkx/FUM4LC01lc3v0Nww7n0p0fJA3U4cKFAqyW0gXCwW7m6/9c5fDgaSv8+g==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/concise-reporter/-/concise-reporter-6.11.0.tgz",
+      "integrity": "sha512-GrJMPYE//m1s5VT3pq22Zea2BOcz8ewhERqoAuw7nq8g5gWVe2p6kNV1zPhgHrezO04AcdBZammXnD/wxAXcmQ==",
       "dev": true,
       "requires": {
-        "@wdio/reporter": "6.1.14",
+        "@wdio/reporter": "6.11.0",
         "chalk": "^4.0.0",
         "pretty-ms": "^7.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -2325,9 +2461,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -2336,33 +2472,34 @@
       }
     },
     "@wdio/config": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.1.14.tgz",
-      "integrity": "sha512-MXHMHwtkAblfnIxONs9aW//T9Fq5XIw3oH+tztcBRvNTTAIXmwHd+4sOjAwjpCdBSGs0C4kM/aTpGfwDZVURvQ==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/@wdio/config/-/config-6.12.1.tgz",
+      "integrity": "sha512-V5hTIW5FNlZ1W33smHF4Rd5BKjGW2KeYhyXDQfXHjqLCeRiirZ9fABCo9plaVQDnwWSUMWYaAaIAifV82/oJCQ==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16",
+        "@wdio/logger": "6.10.10",
         "deepmerge": "^4.0.0",
         "glob": "^7.1.2"
       }
     },
     "@wdio/local-runner": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.1.16.tgz",
-      "integrity": "sha512-3+pT2fcMXFAnELA6jYjVm6Nt8Il7tGL66A90UbRiT0sL2faTcD3uGAPbmzxMclsmWLh7C04ucCnFwQoTMW1emg==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.12.1.tgz",
+      "integrity": "sha512-vZkXcp/qO9kDpSzwrP4hkt8Q2o3DzSuEtmlEvniYmkS5blLmYuWCn9DpyM4h655jgr+r4NZW8k/3s3qosIs9zw==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.1.8",
-        "@wdio/runner": "6.1.16",
+        "@types/stream-buffers": "^3.0.3",
+        "@wdio/logger": "6.10.10",
+        "@wdio/repl": "6.11.0",
+        "@wdio/runner": "6.12.1",
         "async-exit-hook": "^2.0.1",
         "stream-buffers": "^3.0.2"
       }
     },
     "@wdio/logger": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-6.0.16.tgz",
-      "integrity": "sha512-VbH5UnQIG/3sSMV+Y38+rOdwyK9mVA9vuL7iOngoTafHwUjL1MObfN/Cex84L4mGxIgfxCu6GV48iUmSuQ7sqA==",
+      "version": "6.10.10",
+      "resolved": "https://registry.npmjs.org/@wdio/logger/-/logger-6.10.10.tgz",
+      "integrity": "sha512-2nh0hJz9HeZE0VIEMI+oPgjr/Q37ohrR9iqsl7f7GW5ik+PnKYCT9Eab5mR1GNMG60askwbskgGC1S9ygtvrSw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -2371,20 +2508,25 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -2412,10 +2554,19 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -2424,78 +2575,154 @@
       }
     },
     "@wdio/mocha-framework": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.1.14.tgz",
-      "integrity": "sha512-2AmUH/v3kZoIDAMdW73AhI4tDJU3ie/2dO/DtpXJ3XFnuJ1CtklZGyCTtYHGMZ8DBj18/8Lrs/O0CjS5bAu2tw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.11.0.tgz",
+      "integrity": "sha512-ZiwiaXFZO6ZmxbKqjp5A3rDDb6vGk5E0ODFe1XgmIbjmaqfkiRREOWjdiE29ft3ieq52NKNwFtGSmbhuqPHv+Q==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
+        "@types/mocha": "^8.0.0",
+        "@wdio/logger": "6.10.10",
+        "@wdio/utils": "6.11.0",
         "expect-webdriverio": "^1.1.5",
-        "mocha": "^7.0.1"
+        "mocha": "^8.0.1"
       },
       "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-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "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"
+          }
+        },
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "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
+        },
+        "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
         },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chokidar": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
-          "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
           "dev": true,
           "requires": {
             "anymatch": "~3.1.1",
             "braces": "~3.0.2",
-            "fsevents": "~2.1.1",
+            "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.2.0"
+            "readdirp": "~3.5.0"
           }
         },
         "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "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,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^7.0.0"
           }
         },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "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": {
-            "ms": "^2.1.1"
+            "color-name": "~1.1.4"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "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
+        },
+        "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
         },
+        "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,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
         "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "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,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
           }
         },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "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
+        },
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -2506,228 +2733,308 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "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,
+          "requires": {
+            "is-glob": "^4.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
+        },
+        "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,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
         "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=",
+          "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
         },
+        "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
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
         "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "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,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "p-locate": "^5.0.0"
           }
         },
         "mocha": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz",
-          "integrity": "sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ==",
+          "version": "8.4.0",
+          "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+          "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
           "dev": true,
           "requires": {
-            "ansi-colors": "3.2.3",
+            "@ungap/promise-all-settled": "1.1.2",
+            "ansi-colors": "4.1.1",
             "browser-stdout": "1.3.1",
-            "chokidar": "3.3.0",
-            "debug": "3.2.6",
-            "diff": "3.5.0",
-            "escape-string-regexp": "1.0.5",
-            "find-up": "3.0.0",
-            "glob": "7.1.3",
+            "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": "3.13.1",
-            "log-symbols": "3.0.0",
+            "js-yaml": "4.0.0",
+            "log-symbols": "4.0.0",
             "minimatch": "3.0.4",
-            "mkdirp": "0.5.5",
-            "ms": "2.1.1",
-            "node-environment-flags": "1.0.6",
-            "object.assign": "4.1.0",
-            "strip-json-comments": "2.0.1",
-            "supports-color": "6.0.0",
-            "which": "1.3.1",
+            "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",
-            "yargs": "13.3.2",
-            "yargs-parser": "13.1.2",
-            "yargs-unparser": "1.6.0"
+            "workerpool": "6.1.0",
+            "yargs": "16.2.0",
+            "yargs-parser": "20.2.4",
+            "yargs-unparser": "2.0.0"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         },
         "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "yocto-queue": "^0.1.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==",
+          "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,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "^3.0.2"
           }
         },
-        "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
-        },
         "readdirp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.4"
+            "picomatch": "^2.2.1"
           }
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.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==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.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==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
-          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+          "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": "^3.0.0"
+            "has-flag": "^4.0.0"
+          }
+        },
+        "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,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        },
+        "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"
           }
         },
         "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "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": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
         "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
           "dev": true,
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
+            "string-width": "^4.2.0",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^20.2.2"
           }
         },
         "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+          "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": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.1.14.tgz",
-      "integrity": "sha512-UtRLQ55i23cLQRGtFiEJty1F6AbAfiSpfIxDAiXKHbw6Rp1StwxlqHFrhNe5F48Zu4hnie46t9N/tr/cZOe0kA==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.12.0.tgz",
+      "integrity": "sha512-UhTBZxClCsM3VjaiDp4DoSCnsa7D1QNmI2kqEBfIpyNkT3GcZhJb7L+nL0fTkzCwi7+/uLastb3/aOwH99gt0A==",
       "dev": true
     },
     "@wdio/repl": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.1.8.tgz",
-      "integrity": "sha512-C647KvDIcOHYN24eFbiM2xE+etPEACvRYkEp7BPLyopEABDr0I3Qdb5MLhopC5eMAVHp70/WT27H1CE2v9iILQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.11.0.tgz",
+      "integrity": "sha512-FxrFKiTkFyELNGGVEH1uijyvNY7lUpmff6x+FGskFGZB4uSRs0rxkOMaEjxnxw7QP1zgQKr2xC7GyO03gIGRGg==",
       "dev": true,
       "requires": {
-        "@wdio/utils": "6.1.8"
+        "@wdio/utils": "6.11.0"
       }
     },
     "@wdio/reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.1.14.tgz",
-      "integrity": "sha512-Pt6P0JU0COHTpggsOoJKUJyAyQsi7xlHebBNU/DWdHHpmzYd4e9vDutjyTqXu/1zn+t+Zq+uL1IC0E4Xjv6f7w==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.11.0.tgz",
+      "integrity": "sha512-SStNZZUI0bXI+omyIU6ql4Rh+Dews1dz1GlowHDrBxwKMPyAwytgYokXLn3zr+E3tkHDiRyJjQxfDetBWBGmtg==",
       "dev": true,
       "requires": {
+        "@types/cucumber": "^6.0.1",
         "fs-extra": "^9.0.0"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "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"
+          }
+        }
       }
     },
     "@wdio/runner": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.1.16.tgz",
-      "integrity": "sha512-pGRT51BGnxp4zFD1pSp6qZD/4dnbSnDyV4g/MbbFiA4PFKF41mFhaxRwIGMHcp4EYlv9gaT31UA52JaFIYyuNA==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.12.1.tgz",
+      "integrity": "sha512-LMmiKQavMFrFd2LYrGA/DiKGJ/SH/3n95KWf4k8dmpB1fZqxO0KvEaE44CJTSFTQ0MB4JFTRUvW3JfXBm9EfRA==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.1.8",
+        "@wdio/config": "6.12.1",
+        "@wdio/logger": "6.10.10",
+        "@wdio/utils": "6.11.0",
         "deepmerge": "^4.0.0",
         "gaze": "^1.1.2",
-        "webdriver": "6.1.14",
-        "webdriverio": "6.1.16"
+        "webdriver": "6.12.1",
+        "webdriverio": "6.12.1"
       }
     },
     "@wdio/spec-reporter": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.1.14.tgz",
-      "integrity": "sha512-QaSBgnzllzLp9LR7/5DTkmrI8BqcznUma8ZxwUNmhvskv/oKzrmNyeCsGoiExFmCk81A9FgZiZPXey7CuaTkdw==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.11.0.tgz",
+      "integrity": "sha512-X68HGyay/tt0Y2nHn5U519bx+yBobAHge7lPklZ2cHNPEsmPSrvTyKIw5h3YO8mkfWHdp6IGxgHrET521Oe6WA==",
       "dev": true,
       "requires": {
-        "@wdio/reporter": "6.1.14",
+        "@wdio/reporter": "6.11.0",
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -2756,9 +3063,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -2767,22 +3074,24 @@
       }
     },
     "@wdio/sync": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-6.1.14.tgz",
-      "integrity": "sha512-94K0kQdrOU0aMlJ2Xsd4tWr4tPpmCFp612Ml5+ecQh4C4XD07ocfsvGs+mwI7cfF1sO6g/Hoc+XTY2D+/8En3w==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/sync/-/sync-6.11.0.tgz",
+      "integrity": "sha512-ORdY40PNP1c0VKJV+dIh1tYmMXwsRHPhB66p1Y6TRm6LvIpPVX8peoB/Qx9zBsO40hAS1cFt9pdsGxu7VCHnfg==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16",
+        "@types/fibers": "^3.1.0",
+        "@types/puppeteer": "^5.4.0",
+        "@wdio/logger": "6.10.10",
         "fibers": "^4.0.1"
       }
     },
     "@wdio/utils": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.1.8.tgz",
-      "integrity": "sha512-qzvD8qCPpIpDrZ0HNOx1hTlfKY26p8WByUXgr52ll6DXxtAYXZLIJ8GAYFJUi87NVfwtv6+O7owQGSM/jtr8AQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.11.0.tgz",
+      "integrity": "sha512-vf0sOQzd28WbI26d6/ORrQ4XKWTzSlWLm9W/K/eJO0NASKPEzR+E+Q2kaa+MJ4FKXUpjbt+Lxfo+C26TzBk7tg==",
       "dev": true,
       "requires": {
-        "@wdio/logger": "6.0.16"
+        "@wdio/logger": "6.10.10"
       }
     },
     "JSONStream": {
@@ -2796,9 +3105,10 @@
       }
     },
     "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
     },
     "abbrev": {
       "version": "1.0.9",
@@ -2818,8 +3128,7 @@
     "acorn": {
       "version": "5.7.4",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-      "dev": true
+      "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
     },
     "acorn-dynamic-import": {
       "version": "2.0.2",
@@ -2849,25 +3158,24 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "version": "6.4.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+          "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
           "dev": true
         }
       }
     },
     "acorn-jsx": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-      "dev": true,
       "requires": {
         "acorn": "^3.0.4"
       },
       "dependencies": {
         "acorn": {
           "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
           "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
           "dev": true
         }
@@ -2895,7 +3203,6 @@
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "dev": true,
       "requires": {
         "co": "^4.6.0",
         "fast-deep-equal": "^1.0.0",
@@ -2906,22 +3213,19 @@
         "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
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
         },
         "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
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
         }
       }
     },
     "ajv-keywords": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
-      "dev": true
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "align-text": {
       "version": "0.1.4",
@@ -2934,12 +3238,6 @@
         "repeat-string": "^1.5.2"
       },
       "dependencies": {
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -2958,25 +3256,22 @@
       "dev": true
     },
     "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
+      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
       "requires": {
-        "type-fest": "^0.11.0"
+        "ansi-wrap": "^0.1.0"
       }
     },
+    "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=="
+    },
     "ansi-gray": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
       "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
       "requires": {
         "ansi-wrap": "0.1.0"
       }
@@ -2988,16 +3283,14 @@
       "dev": true
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "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==",
-      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
@@ -3005,24 +3298,31 @@
     "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
+      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768="
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "append-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
       "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
       "requires": {
         "buffer-equal": "^1.0.0"
       }
@@ -3037,27 +3337,35 @@
       }
     },
     "archiver": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-4.0.1.tgz",
-      "integrity": "sha512-/YV1pU4Nhpf/rJArM23W6GTUjT0l++VbjykrCRua1TSXrn+yM8Qs7XvtwSiRse0iCe49EPNf7ktXnPsWuSb91Q==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
+      "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==",
       "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
-        "async": "^2.6.3",
+        "async": "^3.2.0",
         "buffer-crc32": "^0.2.1",
-        "glob": "^7.1.6",
         "readable-stream": "^3.6.0",
-        "tar-stream": "^2.1.2",
-        "zip-stream": "^3.0.1"
+        "readdir-glob": "^1.0.0",
+        "tar-stream": "^2.2.0",
+        "zip-stream": "^4.1.0"
       },
       "dependencies": {
         "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
+          "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
+          "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==",
           "dev": true,
           "requires": {
-            "lodash": "^4.17.14"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
@@ -3080,34 +3388,23 @@
         "readable-stream": "^2.0.0"
       },
       "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
+        "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
         }
       }
     },
     "archy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
+      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA="
     },
     "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"
       }
@@ -3115,14 +3412,12 @@
     "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
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
     },
     "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,
       "requires": {
         "make-iterator": "^1.0.0"
       }
@@ -3130,14 +3425,12 @@
     "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
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
     "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,
       "requires": {
         "make-iterator": "^1.0.0"
       }
@@ -3145,20 +3438,17 @@
     "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
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
     },
     "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
+      "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE="
     },
     "array-each": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
+      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8="
     },
     "array-equal": {
       "version": "1.0.0",
@@ -3169,8 +3459,7 @@
     "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
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
     "array-flatten": {
       "version": "1.1.1",
@@ -3184,13 +3473,15 @@
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+      "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
+        "es-abstract": "^1.18.0-next.2",
+        "get-intrinsic": "^1.1.1",
         "is-string": "^1.0.5"
       }
     },
@@ -3198,7 +3489,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
       "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
       "requires": {
         "array-slice": "^1.0.0",
         "is-number": "^4.0.0"
@@ -3207,8 +3497,7 @@
         "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
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
         }
       }
     },
@@ -3216,7 +3505,6 @@
       "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,
       "requires": {
         "is-number": "^4.0.0"
       },
@@ -3224,22 +3512,19 @@
         "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
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
         }
       }
     },
     "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
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w=="
     },
     "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,
       "requires": {
         "default-compare": "^1.0.0",
         "get-value": "^2.0.6",
@@ -3249,31 +3534,29 @@
         "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
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
     "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
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
     },
     "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
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
     },
     "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
+      "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "arraybuffer.slice": {
@@ -3292,20 +3575,21 @@
       }
     },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -3328,7 +3612,7 @@
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
           "dev": true,
           "requires": {
@@ -3352,26 +3636,23 @@
     "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
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true
     },
     "async": {
-      "version": "0.9.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
-      "dev": true
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
     "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,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.2",
@@ -3382,8 +3663,7 @@
     "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
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "async-exit-hook": {
       "version": "2.0.1",
@@ -3401,7 +3681,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
       "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
       "requires": {
         "async-done": "^1.2.2"
       }
@@ -3421,7 +3700,12 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "available-typed-arrays": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz",
+      "integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==",
       "dev": true
     },
     "aws-sign2": {
@@ -3431,39 +3715,30 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
+      "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": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "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": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -3472,26 +3747,23 @@
             "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": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "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,
+        "has-ansi": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
+        "js-tokens": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+        },
         "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
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
@@ -3522,12 +3794,27 @@
         "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": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
           "dev": true
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "slash": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -3757,10 +4044,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -3775,24 +4072,14 @@
       }
     },
     "babel-loader": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
-      "dev": true,
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
       "requires": {
-        "find-cache-dir": "^2.1.0",
+        "find-cache-dir": "^3.3.1",
         "loader-utils": "^1.4.0",
-        "mkdirp": "^0.5.3",
-        "pify": "^4.0.1",
+        "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
       }
     },
     "babel-messages": {
@@ -3817,7 +4104,6 @@
       "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==",
-      "dev": true,
       "requires": {
         "object.assign": "^4.1.0"
       }
@@ -3874,15 +4160,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "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,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -3892,16 +4169,10 @@
             "p-limit": "^2.0.0"
           }
         },
-        "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
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "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
         }
       }
@@ -3915,81 +4186,108 @@
         "@types/babel__traverse": "^7.0.6"
       }
     },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz",
+      "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==",
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.9.1"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
+      }
+    },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
       "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
       "dev": true
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
       "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
       "dev": true
     },
     "babel-plugin-syntax-class-constructor-call": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
       "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
       "dev": true
     },
     "babel-plugin-syntax-class-properties": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
       "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
       "dev": true
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
       "dev": true
     },
     "babel-plugin-syntax-do-expressions": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
       "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
       "dev": true
     },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
       "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
       "dev": true
     },
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
       "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
       "dev": true
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
       "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
       "dev": true
     },
     "babel-plugin-syntax-flow": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
       "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
       "dev": true
     },
     "babel-plugin-syntax-function-bind": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
       "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
       "dev": true
     },
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
       "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
       "dev": true
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
       "dev": true
     },
@@ -4533,6 +4831,12 @@
             "caniuse-lite": "^1.0.30000844",
             "electron-to-chromium": "^1.3.47"
           }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
@@ -4632,10 +4936,19 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+          "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.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         }
       }
     },
@@ -4649,9 +4962,14 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+          "version": "2.6.12",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
         }
       }
     },
@@ -4685,11 +5003,26 @@
         "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -4729,7 +5062,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
       "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
       "requires": {
         "arr-filter": "^1.1.1",
         "arr-flatten": "^1.0.1",
@@ -4755,16 +5087,14 @@
       "dev": true
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -4779,7 +5109,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -4788,7 +5117,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4797,7 +5125,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4806,7 +5133,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -4822,9 +5148,9 @@
       "dev": true
     },
     "base64-js": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
     "base64id": {
@@ -4845,8 +5171,7 @@
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -4860,8 +5185,7 @@
     "beeper": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-      "dev": true
+      "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak="
     },
     "better-assert": {
       "version": "1.0.2",
@@ -4893,8 +5217,7 @@
     "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
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
     "binary": {
       "version": "0.3.0",
@@ -4907,31 +5230,28 @@
       }
     },
     "binary-extensions": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-      "dev": true
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
     },
     "binaryextensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz",
-      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==",
-      "dev": true
+      "integrity": "sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg=="
     },
     "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,
       "requires": {
         "file-uri-to-path": "1.0.0"
       }
     },
     "bl": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
-      "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+      "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",
@@ -4944,6 +5264,17 @@
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "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==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
         }
       }
     },
@@ -4960,16 +5291,15 @@
       "dev": true
     },
     "bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
       "dev": true
     },
     "body": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
       "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
-      "dev": true,
       "requires": {
         "continuable-cache": "^0.3.1",
         "error": "^7.0.0",
@@ -4980,14 +5310,12 @@
         "bytes": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-          "dev": true
+          "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g="
         },
         "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,
           "requires": {
             "bytes": "1",
             "string_decoder": "0.10"
@@ -4996,8 +5324,7 @@
         "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
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
         }
       }
     },
@@ -5016,25 +5343,57 @@
         "qs": "6.7.0",
         "raw-body": "2.4.0",
         "type-is": "~1.6.17"
+      },
+      "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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "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,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
-        "fill-range": "^7.0.1"
+        "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"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "brorand": {
@@ -5043,11 +5402,6 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
-    "browser-cookies": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browser-cookies/-/browser-cookies-1.2.0.tgz",
-      "integrity": "sha1-/KP/ubamOq3E2MCZnGtX0Pp9KbU="
-    },
     "browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -5079,7 +5433,7 @@
     },
     "browserify-aes": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
@@ -5116,33 +5470,25 @@
     },
     "browserify-rsa": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
       }
     },
     "browserify-sign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "dev": true,
       "requires": {
         "bn.js": "^5.1.1",
         "browserify-rsa": "^4.0.1",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.2",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
         "parse-asn1": "^5.1.5",
         "readable-stream": "^3.6.0",
@@ -5155,6 +5501,17 @@
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "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==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -5173,15 +5530,15 @@
       }
     },
     "browserslist": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-      "dev": true,
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001043",
-        "electron-to-chromium": "^1.3.413",
-        "node-releases": "^1.1.53",
-        "pkg-up": "^2.0.0"
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
       }
     },
     "browserstack": {
@@ -5203,9 +5560,9 @@
           }
         },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -5220,19 +5577,13 @@
             "agent-base": "^4.3.0",
             "debug": "^3.1.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
     "browserstack-local": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.5.tgz",
-      "integrity": "sha512-0/VdSv2YVXmcnwBb64XThMvjM1HnZJnPdv7CUgQbC5y/N9Wsr0Fu+j1oknE9fC/VPx9CpoSC6CJ0kza42skMSA==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.8.tgz",
+      "integrity": "sha512-s+mc3gTOJwELdLWi4qFVKtGwMbb5JWsR+JxKlMaJkRJxoZ0gg3WREgPxAN0bm6iU5+S4Bi0sz0oxBRZT8BiNsQ==",
       "dev": true,
       "requires": {
         "https-proxy-agent": "^4.0.0",
@@ -5261,9 +5612,9 @@
           }
         },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -5278,12 +5629,6 @@
             "agent-base": "^4.3.0",
             "debug": "^3.1.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -5297,13 +5642,13 @@
       }
     },
     "buffer": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-alloc": {
@@ -5331,8 +5676,7 @@
     "buffer-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74="
     },
     "buffer-fill": {
       "version": "1.0.0",
@@ -5343,13 +5687,12 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "buffer-indexof-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.1.tgz",
-      "integrity": "sha1-qfuAbOgUXVQoUQznLyeLs2OmOL8=",
+      "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
     },
     "buffer-shims": {
@@ -5396,18 +5739,22 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
+        "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,
+          "requires": {
+            "camelcase": "^3.0.0",
+            "map-obj": "^1.0.0"
+          }
+        },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -5421,15 +5768,21 @@
             "supports-color": "^2.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "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,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
+        "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
+        },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -5442,7 +5795,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -5456,9 +5808,9 @@
       }
     },
     "cacheable-lookup": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz",
-      "integrity": "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w==",
+      "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": {
@@ -5474,25 +5826,36 @@
         "lowercase-keys": "^2.0.0",
         "normalize-url": "^4.1.0",
         "responselike": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "^0.2.0"
       },
       "dependencies": {
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
+        "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==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
     "callsite": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
@@ -5500,39 +5863,35 @@
       "dev": true
     },
     "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
     },
     "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
     },
     "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,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "requires": {
-        "camelcase": "^3.0.0",
+        "camelcase": "^2.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": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
         }
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001077",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001077.tgz",
-      "integrity": "sha512-AEzsGvjBJL0lby/87W96PyEvwN0GsYvk5LHsglLg9tW37K4BqvAvoSCdWIE13OZQ8afupqZ73+oL/1LkedN8hA==",
+      "version": "1.0.30001235",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001235.tgz",
+      "integrity": "sha512-zWEwIVqnzPkSAXOUlQnPW2oKoYb2aLQ4Q5ejdjBcnH63rfypaW34CxaeBn1VMya2XaEU3P/R2qHpWyj+l0BT1A==",
       "dev": true
     },
     "capture-exit": {
@@ -5551,9 +5910,9 @@
       "dev": true
     },
     "ccount": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
-      "integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
+      "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
     },
     "center-align": {
@@ -5567,16 +5926,16 @@
       }
     },
     "chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
+      "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
         "deep-eql": "^3.0.1",
         "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
+        "pathval": "^1.1.1",
         "type-detect": "^4.0.5"
       }
     },
@@ -5593,7 +5952,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -5625,10 +5983,9 @@
       "dev": true
     },
     "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
     },
     "check-error": {
       "version": "1.0.2",
@@ -5643,19 +6000,22 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
-      "dev": true,
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "requires": {
-        "anymatch": "~3.1.1",
-        "braces": "~3.0.2",
-        "fsevents": "~2.1.2",
-        "glob-parent": "~5.1.0",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "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"
       }
     },
     "chownr": {
@@ -5665,9 +6025,9 @@
       "dev": true
     },
     "chrome-launcher": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.2.tgz",
-      "integrity": "sha512-zWD9RVVKd8Nx2xKGY4G08lb3nCD+2hmICxovvRE9QjBKQzHFvCYqGlsw15b4zUxLKq3wXEwVbR/yLtMbfk7JbQ==",
+      "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": "*",
@@ -5678,6 +6038,15 @@
         "rimraf": "^3.0.2"
       },
       "dependencies": {
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "rimraf": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -5708,14 +6077,12 @@
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
     },
     "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,
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -5727,7 +6094,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -5735,48 +6101,43 @@
       }
     },
     "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,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "requires": {
-        "restore-cursor": "^3.1.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-spinners": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
-      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
+      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
       "dev": true
     },
     "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
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
     },
     "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
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
     },
     "clone-response": {
       "version": "1.0.2",
@@ -5790,48 +6151,27 @@
     "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
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
     },
     "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,
       "requires": {
         "inherits": "^2.0.1",
         "process-nextick-args": "^2.0.0",
         "readable-stream": "^2.3.5"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "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
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "collapse-white-space": {
       "version": "1.0.6",
@@ -5843,7 +6183,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
       "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
       "requires": {
         "arr-map": "^2.0.2",
         "for-own": "^1.0.0",
@@ -5854,7 +6193,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -5864,7 +6202,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -5872,14 +6209,17 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "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
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
+    },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
     },
     "colors": {
       "version": "1.4.0",
@@ -5903,16 +6243,15 @@
       "dev": true
     },
     "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==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
       "dev": true
     },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "component-bind": {
       "version": "1.0.0",
@@ -5923,8 +6262,7 @@
     "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
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -5933,30 +6271,26 @@
       "dev": true
     },
     "compress-commons": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-3.0.0.tgz",
-      "integrity": "sha512-FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==",
+      "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,
       "requires": {
         "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^3.0.1",
+        "crc32-stream": "^4.0.2",
         "normalize-path": "^3.0.0",
-        "readable-stream": "^2.3.7"
+        "readable-stream": "^3.6.0"
       },
       "dependencies": {
         "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==",
+          "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": {
-            "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"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
@@ -5964,43 +6298,23 @@
     "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
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "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,
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "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,
       "requires": {
         "source-map": "^0.6.1"
       },
@@ -6008,8 +6322,7 @@
         "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
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -6017,19 +6330,32 @@
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
       "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
+      },
+      "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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "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
+      "integrity": "sha512-3R0kMOdL7CjJpU66fzAkCe6HNtd3AavCS4m+uW4KtJjrdGPT0SQEZieAYd+cm+lJoBznNQ4lqipYWkhBMgk00g=="
     },
     "console-browserify": {
       "version": "1.2.0",
@@ -6043,12 +6369,6 @@
       "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
       "dev": true
     },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
     "content-disposition": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
@@ -6065,14 +6385,12 @@
     "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
+      "integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8="
     },
     "convert-source-map": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
       "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -6090,52 +6408,54 @@
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dev": true,
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz",
+      "integrity": "sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==",
       "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
+        "each-props": "^1.3.2",
+        "is-plain-object": "^5.0.0"
+      },
+      "dependencies": {
+        "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=="
+        }
       }
     },
     "core-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
+      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
-      "dev": true,
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.14.0.tgz",
+      "integrity": "sha512-R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A==",
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.16.6",
         "semver": "7.0.0"
       },
       "dependencies": {
         "semver": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
         }
       }
     },
     "core-js-pure": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-      "integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA=="
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
+      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g=="
     },
     "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
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "coveralls": {
       "version": "3.1.0",
@@ -6150,46 +6470,60 @@
         "request": "^2.88.2"
       }
     },
-    "crc": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
-      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+    "crc-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz",
+      "integrity": "sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==",
       "dev": true,
       "requires": {
-        "buffer": "^5.1.0"
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
       }
     },
     "crc32-stream": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
-      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
+      "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,
       "requires": {
-        "crc": "^3.4.4",
+        "crc-32": "^1.2.0",
         "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"
+          }
+        }
       }
     },
     "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
     },
     "create-hash": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
@@ -6202,7 +6536,7 @@
     },
     "create-hmac": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
@@ -6220,13 +6554,22 @@
       "integrity": "sha512-7gQ3zX+d+hS/vOxzLrZ4aRAceB7qNJ0VzaGNpcWjDCmtOpASB50USJDupTik/H2nHgiSAA3VNZ3SFuONs8LR9Q=="
     },
     "cross-spawn": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
-      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
-      "dev": true,
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "crypto-browserify": {
@@ -6257,7 +6600,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
       "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "source-map": "^0.6.1",
@@ -6268,11 +6610,16 @@
         "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
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
+    "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
+    },
     "css-value": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
@@ -6298,7 +6645,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -6313,7 +6659,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
       "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
       "requires": {
         "es5-ext": "^0.10.50",
         "type": "^1.0.1"
@@ -6362,25 +6707,23 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
       "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-      "dev": true,
       "requires": {
         "get-stdin": "^4.0.1",
         "meow": "^3.3.0"
       }
     },
     "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "requires": {
-        "ms": "2.0.0"
+        "ms": "2.1.2"
       }
     },
     "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,
       "requires": {
         "debug": "3.X",
         "memoizee": "0.4.X",
@@ -6388,33 +6731,24 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "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
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "decompress-response": {
       "version": "6.0.0",
@@ -6443,23 +6777,40 @@
       }
     },
     "deep-equal": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "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,
       "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.1",
-        "is-regex": "^1.0.4",
-        "object-is": "^1.0.1",
+        "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",
-        "regexp.prototype.flags": "^1.2.0"
+        "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"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
       }
     },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -6471,7 +6822,6 @@
       "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,
       "requires": {
         "kind-of": "^5.0.2"
       },
@@ -6479,8 +6829,7 @@
         "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
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
@@ -6496,8 +6845,7 @@
     "default-resolution": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ="
     },
     "defaults": {
       "version": "1.0.3",
@@ -6507,12 +6855,21 @@
       "optional": true,
       "requires": {
         "clone": "^1.0.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "defer-to-connect": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz",
-      "integrity": "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==",
+      "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-properties": {
@@ -6527,7 +6884,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -6537,7 +6893,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -6546,7 +6901,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -6555,7 +6909,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -6597,9 +6950,9 @@
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
     "detab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.3.tgz",
-      "integrity": "sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detab/-/detab-2.0.4.tgz",
+      "integrity": "sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==",
       "dev": true,
       "requires": {
         "repeat-string": "^1.5.4"
@@ -6608,8 +6961,7 @@
     "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
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
     },
     "detect-indent": {
       "version": "4.0.0",
@@ -6629,8 +6981,7 @@
     "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
+      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I="
     },
     "detective": {
       "version": "4.7.1",
@@ -6643,21 +6994,28 @@
       }
     },
     "devtools": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.1.16.tgz",
-      "integrity": "sha512-Px/K/xYY+fTW8D5yt7p6ZZJfkfHHulKVr2Y+BJSCQyKNSY/hiZFT6KAjoUFrAastLCqqs1gW2Dy/OGb0qWm+Hg==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.12.1.tgz",
+      "integrity": "sha512-JyG46suEiZmld7/UVeogkCWM0zYGt+2ML/TI+SkEp+bTv9cs46cDb0pKF3glYZJA7wVVL2gC07Ic0iCxyJEnCQ==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/protocols": "6.1.14",
-        "@wdio/utils": "6.1.8",
+        "@wdio/config": "6.12.1",
+        "@wdio/logger": "6.10.10",
+        "@wdio/protocols": "6.12.0",
+        "@wdio/utils": "6.11.0",
         "chrome-launcher": "^0.13.1",
-        "puppeteer-core": "^3.0.0",
+        "edge-paths": "^2.1.0",
+        "puppeteer-core": "^5.1.0",
         "ua-parser-js": "^0.7.21",
         "uuid": "^8.0.0"
       }
     },
+    "devtools-protocol": {
+      "version": "0.0.818844",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+      "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
+      "dev": true
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -6665,20 +7023,20 @@
       "dev": true
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "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
     },
     "diff-sequences": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz",
-      "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
       "dev": true
     },
     "diffie-hellman": {
       "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
@@ -6688,9 +7046,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -6726,12 +7084,11 @@
     },
     "doctrine": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+      "resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
       "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "esutils": "^2.0.2"
       }
     },
     "doctrine-temporary-fork": {
@@ -6746,7 +7103,7 @@
     },
     "documentation": {
       "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-5.5.0.tgz",
+      "resolved": "http://registry.npmjs.org/documentation/-/documentation-5.5.0.tgz",
       "integrity": "sha512-Aod3HOI+8zMhwWztDlECRsDfJ8SFu4oADvipOLq3gnWKy4Cpg2oF5AWT+U6PcX85KuguDI6c+q+2YwYEx99B/A==",
       "dev": true,
       "requires": {
@@ -6802,254 +7159,126 @@
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "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,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "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"
-          }
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
+        "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,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.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"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
-          "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
+            "locate-path": "^2.0.0"
           }
         },
-        "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==",
+        "get-port": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+          "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
           "dev": true
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "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": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "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,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
+            "strip-bom": "^3.0.0"
           }
         },
-        "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=",
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "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-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=",
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "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,
           "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "p-try": "^1.0.0"
           }
         },
-        "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=",
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^4.0.0",
-            "pify": "^3.0.0",
-            "strip-bom": "^3.0.0"
+            "p-limit": "^1.1.0"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
+        "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
         },
         "parse-json": {
           "version": "4.0.0",
@@ -7061,6 +7290,12 @@
             "json-parse-better-errors": "^1.0.1"
           }
         },
+        "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
+        },
         "path-type": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -7097,38 +7332,6 @@
             "read-pkg": "^3.0.0"
           }
         },
-        "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,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "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
-        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -7137,38 +7340,15 @@
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "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": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "strip-bom": {
@@ -7177,43 +7357,10 @@
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        },
-        "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,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+        "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
         },
         "yargs": {
@@ -7341,33 +7488,38 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
     "duplexer2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "dev": true,
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+      "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
       "requires": {
-        "readable-stream": "^2.0.2"
+        "readable-stream": "~1.1.9"
       },
       "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
         "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": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "requires": {
             "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"
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
         }
       }
     },
@@ -7381,36 +7533,17 @@
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
       "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
         "inherits": "^2.0.1",
         "readable-stream": "^2.0.0",
         "stream-shift": "^1.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "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,
       "requires": {
         "is-plain-object": "^2.0.1",
         "object.defaults": "^1.1.0"
@@ -7444,11 +7577,26 @@
         "safer-buffer": "^2.1.0"
       }
     },
-    "editions": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-      "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-      "dev": true
+    "edge-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/edge-paths/-/edge-paths-2.2.1.tgz",
+      "integrity": "sha512-AI5fC7dfDmCdKo3m5y7PkYE8m6bMqR6pvVpgtrZkkhcJXFLelUgkjrhk3kXXx8Kbw2cRaTT4LkOR7hqf39KJdw==",
+      "dev": true,
+      "requires": {
+        "@types/which": "^1.3.2",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
+      }
     },
     "ee-first": {
       "version": "1.1.1",
@@ -7456,39 +7604,44 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz",
-      "integrity": "sha512-wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
+      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
       "dev": true,
       "requires": {
         "jake": "^10.6.1"
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.458",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.458.tgz",
-      "integrity": "sha512-OjRkb0igW0oKE2QbzS7vBYrm7xjW/KRTtIj0OGGx57jr/YhBiKb7oZvdbaojqjfCb/7LbnwsbMbdsYjthdJbAw==",
-      "dev": true
+      "version": "1.3.749",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.749.tgz",
+      "integrity": "sha512-F+v2zxZgw/fMwPz/VUGIggG4ZndDsYy0vlpthi3tjmDZlcfbhN5mYW0evXUsBr2sUtuDANFtle410A9u/sd/4A=="
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "dev": true
         }
       }
@@ -7502,8 +7655,7 @@
     "emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -7514,7 +7666,6 @@
       "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,
       "requires": {
         "once": "^1.4.0"
       }
@@ -7522,7 +7673,7 @@
     "engine.io": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "integrity": "sha1-tgKBw1SEpw7gNR6g6/+D7IyVIqI=",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
@@ -7542,12 +7693,18 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "ws": {
           "version": "3.3.3",
           "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
@@ -7563,7 +7720,7 @@
     },
     "engine.io-client": {
       "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
       "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
       "dev": true,
       "requires": {
@@ -7589,12 +7746,18 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "ws": {
           "version": "3.3.3",
           "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
@@ -7640,9 +7803,9 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
       "requires": {
         "prr": "~1.0.1"
@@ -7652,7 +7815,6 @@
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
       "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
-      "dev": true,
       "requires": {
         "string-template": "~0.2.1"
       }
@@ -7661,33 +7823,63 @@
       "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,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.17.5",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
-      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
+      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.10.3",
+        "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"
+      }
+    },
+    "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,
       "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.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"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+          "dev": true
+        }
       }
     },
     "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,
       "requires": {
         "is-callable": "^1.1.4",
         "is-date-object": "^1.0.1",
@@ -7698,7 +7890,6 @@
       "version": "0.10.53",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
       "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.3",
@@ -7706,16 +7897,15 @@
       }
     },
     "es5-shim": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.14.tgz",
-      "integrity": "sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg==",
+      "version": "4.5.15",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.15.tgz",
+      "integrity": "sha512-FYpuxEjMeDvU4rulKqFdukQyZSTpzhg4ScQHrAosrlVpR6GFyaw14f74yn2+4BugniIS0Frpg7TvwZocU4ZMTw==",
       "dev": true
     },
     "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,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -7744,7 +7934,7 @@
     },
     "es6-promisify": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
@@ -7780,7 +7970,6 @@
       "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,
       "requires": {
         "d": "^1.0.1",
         "ext": "^1.1.2"
@@ -7790,7 +7979,6 @@
       "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,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.46",
@@ -7798,6 +7986,11 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -7806,13 +7999,12 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
-      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "dev": true,
       "requires": {
         "esprima": "^4.0.1",
@@ -7845,9 +8037,8 @@
     },
     "eslint": {
       "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
       "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
-      "dev": true,
       "requires": {
         "ajv": "^5.3.0",
         "babel-code-frame": "^6.22.0",
@@ -7889,38 +8080,15 @@
         "text-table": "~0.2.0"
       },
       "dependencies": {
-        "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
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
-          "dev": true
-        },
-        "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,
-          "requires": {
-            "restore-cursor": "^2.0.0"
-          }
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
         },
         "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,
           "requires": {
             "lru-cache": "^4.0.1",
             "shebang-command": "^1.2.0",
@@ -7928,123 +8096,30 @@
           }
         },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
         },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "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,
-          "requires": {
-            "chardet": "^0.4.0",
-            "iconv-lite": "^0.4.17",
-            "tmp": "^0.0.33"
-          }
-        },
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        },
-        "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,
-          "requires": {
-            "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"
-          }
-        },
-        "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
-        },
-        "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
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "mute-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-          "dev": true
-        },
-        "onetime": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^1.0.0"
-          }
-        },
-        "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,
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "requires": {
-            "onetime": "^2.0.0",
-            "signal-exit": "^3.0.2"
+            "minimist": "^1.2.5"
           }
         },
-        "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"
-          }
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
         },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
           }
@@ -8058,25 +8133,100 @@
       "dev": true
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
       "dev": true,
       "requires": {
         "debug": "^2.6.9",
         "resolve": "^1.13.1"
+      },
+      "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
       }
     },
     "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz",
+      "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==",
       "dev": true,
       "requires": {
-        "debug": "^2.6.9",
+        "debug": "^3.2.7",
         "pkg-dir": "^2.0.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "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,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
         "pkg-dir": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -8089,65 +8239,148 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.20.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz",
-      "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==",
+      "version": "2.23.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz",
+      "integrity": "sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.0.3",
-        "array.prototype.flat": "^1.2.1",
-        "contains-path": "^0.1.0",
+        "array-includes": "^3.1.3",
+        "array.prototype.flat": "^1.2.4",
         "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.2",
-        "eslint-module-utils": "^2.4.1",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.4",
+        "eslint-module-utils": "^2.6.1",
+        "find-up": "^2.0.0",
         "has": "^1.0.3",
+        "is-core-module": "^2.4.0",
         "minimatch": "^3.0.4",
-        "object.values": "^1.1.0",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.12.0"
+        "object.values": "^1.1.3",
+        "pkg-up": "^2.0.0",
+        "read-pkg-up": "^3.0.0",
+        "resolve": "^1.20.0",
+        "tsconfig-paths": "^3.9.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"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
         "load-json-file": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
           "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
+            "parse-json": "^4.0.0",
+            "pify": "^3.0.0",
             "strip-bom": "^3.0.0"
           }
         },
-        "path-type": {
+        "locate-path": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
           }
         },
-        "read-pkg": {
+        "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "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,
           "requires": {
-            "load-json-file": "^2.0.0",
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "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
+        },
+        "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,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "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
+        },
+        "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,
+          "requires": {
+            "pify": "^3.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "load-json-file": "^4.0.0",
             "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
+            "path-type": "^3.0.0"
           }
         },
         "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "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,
           "requires": {
             "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
+            "read-pkg": "^3.0.0"
           }
         },
         "strip-bom": {
@@ -8172,7 +8405,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
         }
@@ -8198,23 +8431,20 @@
       "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,
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
+      "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=="
     },
     "espree": {
       "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "resolved": "http://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
       "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
-      "dev": true,
       "requires": {
         "acorn": "^5.5.0",
         "acorn-jsx": "^3.0.0"
@@ -8223,46 +8453,47 @@
     "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=="
     },
     "esquery": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
-      "dev": true,
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "requires": {
         "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
-          "dev": true
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
         }
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+        }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "etag": {
       "version": "1.8.1",
@@ -8273,7 +8504,6 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "~0.10.14"
@@ -8281,9 +8511,8 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-      "dev": true,
       "requires": {
         "duplexer": "~0.1.1",
         "from": "~0",
@@ -8292,18 +8521,25 @@
         "split": "0.3",
         "stream-combiner": "~0.0.4",
         "through": "~2.3.1"
+      },
+      "dependencies": {
+        "map-stream": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+          "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ="
+        }
       }
     },
     "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "events": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
-      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
     "evp_bytestokey": {
@@ -8317,16 +8553,15 @@
       }
     },
     "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
       "requires": {
         "cross-spawn": "^6.0.0",
         "get-stream": "^4.0.0",
@@ -8335,30 +8570,6 @@
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "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,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
       }
     },
     "exit": {
@@ -8367,11 +8578,16 @@
       "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
       "dev": true
     },
+    "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
+    },
     "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,
       "requires": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -8382,11 +8598,18 @@
         "to-regex": "^3.0.1"
       },
       "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"
+          }
+        },
         "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,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -8395,10 +8618,14 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -8424,12 +8651,6 @@
             "repeat-string": "^1.5.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-number": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -8463,32 +8684,30 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1"
       }
     },
     "expect": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
-      "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
-        "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-regex-util": "^25.2.6"
+        "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.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -8510,13 +8729,13 @@
       }
     },
     "expect-webdriverio": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-1.1.5.tgz",
-      "integrity": "sha512-+RL4Lkne+/z+o1G5Y0S5QuEXeICxt4jExhBSM2Jn/mrDwb+PZVKPM2Yd1OzLsKeCdQLtw4Oft6514Gp5GLgdZA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/expect-webdriverio/-/expect-webdriverio-1.4.1.tgz",
+      "integrity": "sha512-b7UGC2Ye0uKTM0giLhqVJvBuVkboxO24YQT6tRkYS6Y54TM+VMjrfNiCOYDnC2JtFwr/c2s0tfMwBD0saZ8kFA==",
       "dev": true,
       "requires": {
-        "expect": "^25.2.1",
-        "jest-matcher-utils": "^25.1.0"
+        "expect": "^26.5.3",
+        "jest-matcher-utils": "^26.5.2"
       }
     },
     "express": {
@@ -8554,36 +8773,47 @@
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
+      },
+      "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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "ext": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
       "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
       "requires": {
         "type": "^2.0.0"
       },
       "dependencies": {
         "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="
         }
       }
     },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -8593,7 +8823,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"
           }
@@ -8601,13 +8830,12 @@
       }
     },
     "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,
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
         "tmp": "^0.0.33"
       }
     },
@@ -8615,7 +8843,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -8631,7 +8858,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -8640,7 +8866,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -8649,7 +8874,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -8658,7 +8882,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -8667,7 +8890,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -8677,9 +8899,9 @@
       }
     },
     "extract-zip": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.0.tgz",
-      "integrity": "sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==",
+      "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,
       "requires": {
         "@types/yauzl": "^2.9.1",
@@ -8688,20 +8910,14 @@
         "yauzl": "^2.10.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "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": {
-            "ms": "^2.1.1"
+            "pump": "^3.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -8713,7 +8929,7 @@
     },
     "faker": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/faker/-/faker-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/faker/-/faker-3.1.0.tgz",
       "integrity": "sha1-D5CPr05uwCUk5UpX5DLFwBPgjJ8=",
       "dev": true
     },
@@ -8721,7 +8937,6 @@
       "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,
       "requires": {
         "ansi-gray": "^0.1.1",
         "color-support": "^1.1.3",
@@ -8730,28 +8945,24 @@
       }
     },
     "fast-deep-equal": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
-      "dev": true
+      "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=="
     },
     "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
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "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
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz",
+      "integrity": "sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk="
     },
     "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,
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
@@ -8784,10 +8995,9 @@
       }
     },
     "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
@@ -8796,7 +9006,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true,
       "requires": {
         "flat-cache": "^1.2.1",
         "object-assign": "^4.0.1"
@@ -8806,13 +9015,12 @@
       "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
     },
     "filelist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz",
-      "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
+      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
       "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
@@ -8841,12 +9049,24 @@
       "dev": true
     },
     "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,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "requires": {
-        "to-regex-range": "^5.0.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
       }
     },
     "finalhandler": {
@@ -8861,156 +9081,57 @@
         "parseurl": "~1.3.3",
         "statuses": "~1.5.0",
         "unpipe": "~1.0.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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "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,
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       }
     },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       }
     },
     "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,
       "requires": {
         "detect-file": "^1.0.0",
         "is-glob": "^4.0.0",
         "micromatch": "^3.0.4",
         "resolve-dir": "^1.0.1"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
       }
     },
     "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,
       "requires": {
         "expand-tilde": "^2.0.2",
         "is-plain-object": "^2.0.3",
@@ -9022,23 +9143,18 @@
     "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
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="
     },
     "flat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
-      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "~2.0.3"
-      }
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true
     },
     "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,
       "requires": {
         "circular-json": "^0.3.1",
         "graceful-fs": "^4.1.2",
@@ -9050,7 +9166,6 @@
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
           "requires": {
             "glob": "^7.1.3"
           }
@@ -9067,75 +9182,49 @@
       "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,
       "requires": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.3.6"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "follow-redirects": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
-      "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "dev": true
+    },
+    "for-each": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
       "requires": {
-        "debug": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "is-callable": "^1.1.3"
       }
     },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
     "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,
       "requires": {
         "for-in": "^1.0.1"
       }
     },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
     "foreachasync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz",
-      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=",
-      "dev": true
+      "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY="
     },
     "forever-agent": {
       "version": "0.6.1",
@@ -9146,8 +9235,7 @@
     "fork-stream": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/fork-stream/-/fork-stream-0.0.4.tgz",
-      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA=",
-      "dev": true
+      "integrity": "sha1-24Sfznf2cIpfjzhq5TOgkHtUrnA="
     },
     "form-data": {
       "version": "2.3.3",
@@ -9161,15 +9249,14 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "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,
       "requires": {
         "map-cache": "^0.2.2"
       }
@@ -9182,8 +9269,7 @@
     "from": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-      "dev": true
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
     },
     "from2": {
       "version": "2.3.0",
@@ -9192,29 +9278,12 @@
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
+        "readable-stream": "^2.0.0"
       }
     },
     "fs-access": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
       "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
       "dev": true,
       "requires": {
@@ -9228,22 +9297,20 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-      "dev": true,
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
+      "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
       "requires": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
+        "jsonfile": "~1.0.1",
+        "mkdirp": "0.3.x",
+        "ncp": "~0.4.2",
+        "rimraf": "~2.2.0"
       }
     },
     "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,
       "requires": {
         "graceful-fs": "^4.1.11",
         "through2": "^2.0.3"
@@ -9253,7 +9320,6 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz",
       "integrity": "sha1-3QI/kwE77iRTHxszUUw3sg/ZM0k=",
-      "dev": true,
       "requires": {
         "fs-extra": "~0.6.1",
         "mkdirp": "~0.3.5",
@@ -9280,7 +9346,7 @@
         },
         "mkdirp": {
           "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
           "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
           "dev": true
         },
@@ -9295,15 +9361,17 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-      "dev": true,
-      "optional": true
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "optional": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      }
     },
     "fstream": {
       "version": "1.0.12",
@@ -9315,12 +9383,23 @@
         "inherits": "~2.0.0",
         "mkdirp": ">=0.5 0",
         "rimraf": "2"
+      },
+      "dependencies": {
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "fun-hooks": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.9.tgz",
-      "integrity": "sha512-821UhoYfO9Sg01wAl/QsDRB088BW0aeOqzC1PXLxSlB+kaUVbK+Vp6wMDHU5huZZopYxmMmv5jDkEYqDpK3hqg==",
+      "version": "0.9.10",
+      "resolved": "https://registry.npmjs.org/fun-hooks/-/fun-hooks-0.9.10.tgz",
+      "integrity": "sha512-7xBjdT+oMYOPWgwFxNiNzF4ubeUvim4zs1DnQqSSGyxu8UD7AW/6Z0iFsVRwuVSIZKUks2en2VHHotmNfj3ipw==",
       "requires": {
         "typescript-tuple": "^2.2.1"
       }
@@ -9333,8 +9412,7 @@
     "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
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "gaze": {
       "version": "1.1.3",
@@ -9346,16 +9424,14 @@
       }
     },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
-      "dev": true
+      "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=="
     },
     "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
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
     },
     "get-func-name": {
       "version": "2.0.0",
@@ -9363,23 +9439,31 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
     "get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
+      "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
     },
     "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
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "get-stream": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-      "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-      "dev": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "requires": {
         "pump": "^3.0.0"
       }
@@ -9387,8 +9471,7 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
     "getpass": {
       "version": "0.1.7",
@@ -9411,7 +9494,7 @@
     },
     "git-url-parse": {
       "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/git-url-parse/-/git-url-parse-8.3.1.tgz",
+      "resolved": "http://registry.npmjs.org/git-url-parse/-/git-url-parse-8.3.1.tgz",
       "integrity": "sha512-r/FxXIdfgdSO+V2zl4ZK1JGYkHT9nqVRSzom5WsYPLg3XzeBeKPl3R/6X9E9ZJRx/sE/dXwXtfl+Zp7YL8ktWQ==",
       "dev": true,
       "requires": {
@@ -9437,10 +9520,9 @@
       }
     },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -9487,19 +9569,28 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "requires": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
       }
     },
     "glob-stream": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
       "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
       "requires": {
         "extend": "^3.0.0",
         "glob": "^7.1.1",
@@ -9511,294 +9602,26 @@
         "remove-trailing-separator": "^1.0.1",
         "to-absolute-glob": "^2.0.0",
         "unique-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        },
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-      "dev": true,
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
+      "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
       "requires": {
         "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"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "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"
-          },
-          "dependencies": {
-            "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
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "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,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "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,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
       }
     },
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
       "requires": {
         "global-prefix": "^1.0.1",
         "is-windows": "^1.0.1",
@@ -9809,7 +9632,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
       "requires": {
         "expand-tilde": "^2.0.2",
         "homedir-polyfill": "^1.0.1",
@@ -9821,8 +9643,7 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "globals-docs": {
       "version": "2.4.1",
@@ -9831,13 +9652,13 @@
       "dev": true
     },
     "globule": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz",
-      "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+      "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
       "dev": true,
       "requires": {
         "glob": "~7.1.1",
-        "lodash": "~4.17.12",
+        "lodash": "~4.17.10",
         "minimatch": "~3.0.2"
       }
     },
@@ -9845,36 +9666,33 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
       "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
       }
     },
     "got": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-11.2.0.tgz",
-      "integrity": "sha512-68pBow9XXXSdVRV5wSx0kWMCZsag4xE3Ru0URVe0PWsSYmU4SJrUmEO6EVYFlFHc9rq/6Yqn6o1GxIb9torQxg==",
+      "version": "11.8.2",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
+      "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
       "dev": true,
       "requires": {
-        "@sindresorhus/is": "^2.1.1",
+        "@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.1",
         "decompress-response": "^6.0.0",
-        "get-stream": "^5.1.0",
-        "http2-wrapper": "^1.0.0-beta.4.5",
+        "http2-wrapper": "^1.0.0-beta.5.2",
         "lowercase-keys": "^2.0.0",
         "p-cancelable": "^2.0.0",
         "responselike": "^2.0.0"
       }
     },
     "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
     },
     "grapheme-splitter": {
       "version": "1.0.4",
@@ -9893,62 +9711,22 @@
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
       "dev": true
-    },
-    "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,
-      "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-          "dev": true,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "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
-        },
+    },
+    "gulp": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
+      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "requires": {
+        "glob-watcher": "^5.0.3",
+        "gulp-cli": "^2.2.0",
+        "undertaker": "^1.2.1",
+        "vinyl-fs": "^3.0.0"
+      },
+      "dependencies": {
         "gulp-cli": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.1.tgz",
-          "integrity": "sha512-yEMxrXqY8mJFlaauFQxNrCpzWJThu0sH1sqlToaTOT063Hub9s/Nt2C+GSLe6feQ/IMWrHvGOOsyES7CQc9O+A==",
-          "dev": true,
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
+          "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
           "requires": {
             "ansi-colors": "^1.0.1",
             "archy": "^1.0.0",
@@ -9958,7 +9736,7 @@
             "copy-props": "^2.0.1",
             "fancy-log": "^1.3.2",
             "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
+            "interpret": "^1.4.0",
             "isobject": "^3.0.1",
             "liftoff": "^3.1.0",
             "matchdep": "^2.0.0",
@@ -9966,7 +9744,7 @@
             "pretty-hrtime": "^1.0.0",
             "replace-homedir": "^1.0.0",
             "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
+            "v8flags": "^3.2.0",
             "yargs": "^7.1.0"
           }
         },
@@ -9981,7 +9759,7 @@
         },
         "os-locale": {
           "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+          "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
@@ -10037,10 +9815,9 @@
           "dev": true
         },
         "yargs": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz",
-          "integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
-          "dev": true,
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz",
+          "integrity": "sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==",
           "requires": {
             "camelcase": "^3.0.0",
             "cliui": "^3.2.0",
@@ -10054,17 +9831,7 @@
             "string-width": "^1.0.2",
             "which-module": "^1.0.0",
             "y18n": "^3.2.1",
-            "yargs-parser": "5.0.0-security.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "5.0.0-security.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz",
-          "integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "object.assign": "^4.1.0"
+            "yargs-parser": "^5.0.1"
           }
         }
       }
@@ -10073,7 +9840,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.3.2.tgz",
       "integrity": "sha1-o0fUc6zqQBgvk1WHpFGUFnGSgQI=",
-      "dev": true,
       "requires": {
         "gulp-util": "^2.2.14",
         "rimraf": "^2.2.8",
@@ -10082,21 +9848,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "resolved": "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
           "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
           "dev": true
         },
         "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
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94="
         },
         "chalk": {
           "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
           "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
-          "dev": true,
           "requires": {
             "ansi-styles": "^1.1.0",
             "escape-string-regexp": "^1.0.0",
@@ -10108,14 +9872,12 @@
         "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
+          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
         },
         "gulp-util": {
           "version": "2.2.20",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
           "integrity": "sha1-1xRuVyiRC9jwR6awseVJvCLb1kw=",
-          "dev": true,
           "requires": {
             "chalk": "^0.5.0",
             "dateformat": "^1.0.7-1.2.3",
@@ -10129,9 +9891,8 @@
           "dependencies": {
             "through2": {
               "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+              "resolved": "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
               "integrity": "sha1-390BLrnHAOIyP9M084rGIqs3Lac=",
-              "dev": true,
               "requires": {
                 "readable-stream": "~1.0.17",
                 "xtend": "~3.0.0"
@@ -10139,38 +9900,25 @@
             }
           }
         },
-        "has-ansi": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
-          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^0.2.0"
-          }
-        },
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
         "minimist": {
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz",
-          "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==",
-          "dev": true
+          "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg=="
         },
         "object-keys": {
           "version": "0.4.0",
           "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-          "dev": true
+          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY="
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -10180,15 +9928,14 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         },
         "strip-ansi": {
           "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
           "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
-          "dev": true,
           "requires": {
             "ansi-regex": "^0.2.1"
           }
@@ -10196,14 +9943,12 @@
         "supports-color": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
-          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
-          "dev": true
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo="
         },
         "through2": {
           "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+          "resolved": "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
           "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-          "dev": true,
           "requires": {
             "readable-stream": "~1.0.17",
             "xtend": "~2.1.1"
@@ -10213,7 +9958,6 @@
               "version": "2.1.2",
               "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
               "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-              "dev": true,
               "requires": {
                 "object-keys": "~0.4.0"
               }
@@ -10224,7 +9968,6 @@
           "version": "0.2.3",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz",
           "integrity": "sha1-vKk4IJWC7FpJrVOKAPofEl5RMlI=",
-          "dev": true,
           "requires": {
             "clone-stats": "~0.0.1"
           }
@@ -10232,8 +9975,7 @@
         "xtend": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=",
-          "dev": true
+          "integrity": "sha1-XM50B7r2Qsunvs2laBEcST9ZZlo="
         }
       }
     },
@@ -10241,7 +9983,6 @@
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
       "integrity": "sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=",
-      "dev": true,
       "requires": {
         "concat-with-sourcemaps": "^1.0.0",
         "through2": "^2.0.0",
@@ -10251,7 +9992,7 @@
     "gulp-connect": {
       "version": "5.7.0",
       "resolved": "https://registry.npmjs.org/gulp-connect/-/gulp-connect-5.7.0.tgz",
-      "integrity": "sha512-8tRcC6wgXMLakpPw9M7GRJIhxkYdgZsXwn7n56BA2bQYGLR9NOPhMzx7js+qYDy6vhNkbApGKURjAw1FjY4pNA==",
+      "integrity": "sha1-fpJfXkw06/7fnzGFdpZuj+iEDVo=",
       "dev": true,
       "requires": {
         "ansi-colors": "^2.0.5",
@@ -10268,14 +10009,13 @@
         "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==",
+          "integrity": "sha1-XaN4Jf7z51872kf3YNZL/RDhXhA=",
           "dev": true
         },
         "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,
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
@@ -10283,23 +10023,20 @@
             "statuses": ">= 1.4.0 < 2"
           }
         },
-        "map-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-          "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-          "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
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         },
         "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",
@@ -10319,14 +10056,12 @@
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
         },
         "statuses": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-          "dev": true
+          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
         }
       }
     },
@@ -10334,7 +10069,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-4.0.2.tgz",
       "integrity": "sha512-fcFUQzFsN6dJ6KZlG+qPOEkqfcevRUXgztkYCvhNvJeSvOicC8ucutN4qR/ID8LmNZx9YPIkBzazTNnVvbh8wg==",
-      "dev": true,
       "requires": {
         "eslint": "^4.0.0",
         "fancy-log": "^1.3.2",
@@ -10342,29 +10076,25 @@
       }
     },
     "gulp-footer": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-footer/-/gulp-footer-2.0.2.tgz",
-      "integrity": "sha512-HsG5VOgKHFRqZXnHGI6oGhPDg70p9pobM+dYOnjBZVLMQUHzLG6bfaPNRJ7XG707E+vWO3TfN0CND9UrYhk94g==",
-      "dev": true,
+      "version": "github:prebid/gulp-footer#ff2b46e6376c7f04900357ff9f7b30f219fe5f8a",
+      "from": "github:prebid/gulp-footer#master",
       "requires": {
+        "event-stream": "3.3.4",
         "lodash._reescape": "^3.0.0",
         "lodash._reevaluate": "^3.0.0",
         "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.6.2",
-        "map-stream": "0.0.7"
+        "lodash.template": "^3.6.2"
       },
       "dependencies": {
         "lodash._reinterpolate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-          "dev": true
+          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
         },
         "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,
           "requires": {
             "lodash._root": "^3.0.0"
           }
@@ -10373,7 +10103,6 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
           "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-          "dev": true,
           "requires": {
             "lodash._getnative": "^3.0.0",
             "lodash.isarguments": "^3.0.0",
@@ -10384,7 +10113,6 @@
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
           "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-          "dev": true,
           "requires": {
             "lodash._basecopy": "^3.0.0",
             "lodash._basetostring": "^3.0.0",
@@ -10401,17 +10129,10 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
           "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-          "dev": true,
           "requires": {
             "lodash._reinterpolate": "^3.0.0",
             "lodash.escape": "^3.0.0"
           }
-        },
-        "map-stream": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-          "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-          "dev": true
         }
       }
     },
@@ -10419,7 +10140,6 @@
       "version": "1.8.12",
       "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.8.12.tgz",
       "integrity": "sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ==",
-      "dev": true,
       "requires": {
         "concat-with-sourcemaps": "*",
         "lodash.template": "^4.4.0",
@@ -10429,14 +10149,12 @@
         "lodash._reinterpolate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-          "dev": true
+          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
         },
         "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,
           "requires": {
             "lodash._reinterpolate": "^3.0.0",
             "lodash.templatesettings": "^4.0.0"
@@ -10446,7 +10164,6 @@
           "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,
           "requires": {
             "lodash._reinterpolate": "^3.0.0"
           }
@@ -10457,7 +10174,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.2.tgz",
       "integrity": "sha1-pJe351cwBQQcqivIt92jyARE1ik=",
-      "dev": true,
       "requires": {
         "gulp-match": "^1.0.3",
         "ternary-stream": "^2.0.1",
@@ -10468,7 +10184,6 @@
       "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,
       "requires": {
         "through2": "^0.6.3"
       },
@@ -10476,14 +10191,12 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -10493,15 +10206,14 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         },
         "through2": {
           "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+          "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
           "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "dev": true,
           "requires": {
             "readable-stream": ">=1.0.33-1 <1.1.0-0",
             "xtend": ">=4.0.0 <4.1.0-0"
@@ -10513,64 +10225,37 @@
       "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,
       "requires": {
         "minimatch": "^3.0.3"
       }
     },
     "gulp-replace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz",
-      "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==",
-      "dev": true,
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz",
+      "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==",
       "requires": {
-        "istextorbinary": "2.2.1",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
+        "@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"
       }
     },
     "gulp-shell": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.5.2.tgz",
       "integrity": "sha1-pJWcoGUa0ce7/nCy0K27tOGuqY0=",
-      "dev": true,
       "requires": {
         "async": "^1.5.0",
         "gulp-util": "^3.0.7",
         "lodash": "^4.0.0",
         "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        }
       }
     },
     "gulp-sourcemaps": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
       "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
-      "dev": true,
       "requires": {
         "@gulp-sourcemaps/identity-map": "1.X",
         "@gulp-sourcemaps/map-sources": "1.X",
@@ -10588,8 +10273,7 @@
         "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
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         }
       }
     },
@@ -10597,7 +10281,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
       "integrity": "sha512-gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg==",
-      "dev": true,
       "requires": {
         "array-each": "^1.0.1",
         "extend-shallow": "^3.0.2",
@@ -10615,7 +10298,6 @@
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
       "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "dev": true,
       "requires": {
         "array-differ": "^1.0.0",
         "array-uniq": "^1.0.2",
@@ -10637,23 +10319,15 @@
         "vinyl": "^0.5.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -10662,29 +10336,38 @@
             "supports-color": "^2.0.0"
           }
         },
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+        },
         "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
+          "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
         },
         "dateformat": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-          "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-          "dev": true
+          "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI="
+        },
+        "has-ansi": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+          "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
         },
         "lodash._reinterpolate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-          "dev": true
+          "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
         },
         "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,
           "requires": {
             "lodash._root": "^3.0.0"
           }
@@ -10693,7 +10376,6 @@
           "version": "3.1.2",
           "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
           "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-          "dev": true,
           "requires": {
             "lodash._getnative": "^3.0.0",
             "lodash.isarguments": "^3.0.0",
@@ -10704,7 +10386,6 @@
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
           "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-          "dev": true,
           "requires": {
             "lodash._basecopy": "^3.0.0",
             "lodash._basetostring": "^3.0.0",
@@ -10721,7 +10402,6 @@
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
           "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-          "dev": true,
           "requires": {
             "lodash._reinterpolate": "^3.0.0",
             "lodash.escape": "^3.0.0"
@@ -10730,35 +10410,22 @@
         "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
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
         },
         "replace-ext": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-          "dev": true
-        },
-        "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,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
+          "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
         },
         "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
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         },
         "vinyl": {
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
           "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-          "dev": true,
           "requires": {
             "clone": "^1.0.0",
             "clone-stats": "^0.0.1",
@@ -10771,7 +10438,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
       "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
       "requires": {
         "glogg": "^1.0.0"
       }
@@ -10795,9 +10461,9 @@
       }
     },
     "handlebars": {
-      "version": "4.7.6",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+      "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,
       "requires": {
         "minimist": "^1.2.5",
@@ -10822,19 +10488,19 @@
       "dev": true
     },
     "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
       "requires": {
-        "ajv": "^6.5.5",
+        "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -10854,22 +10520,26 @@
       }
     },
     "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,
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+      "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "^0.2.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk="
         }
       }
     },
+    "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
+    },
     "has-binary2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
@@ -10896,14 +10566,12 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
     "has-gulplog": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
       "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "dev": true,
       "requires": {
         "sparkles": "^1.0.0"
       }
@@ -10915,9 +10583,9 @@
       "dev": true
     },
     "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
     },
     "has-to-string-tag-x": {
       "version": "1.4.1",
@@ -10932,7 +10600,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -10943,43 +10610,15 @@
       "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,
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -11003,6 +10642,17 @@
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "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==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -11022,9 +10672,9 @@
       }
     },
     "hast-util-is-element": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz",
-      "integrity": "sha512-NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ==",
+      "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
     },
     "hast-util-sanitize": {
@@ -11076,9 +10726,9 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "9.18.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
-      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==",
+      "version": "9.18.5",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
+      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==",
       "dev": true
     },
     "hmac-drbg": {
@@ -11106,7 +10756,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
       "requires": {
         "parse-passwd": "^1.0.0"
       }
@@ -11118,9 +10767,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
-      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+      "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
     },
     "html-encoding-sniffer": {
@@ -11163,10 +10812,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz",
-      "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==",
-      "dev": true
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="
     },
     "http-proxy": {
       "version": "1.18.1",
@@ -11191,12 +10839,12 @@
       }
     },
     "http2-wrapper": {
-      "version": "1.0.0-beta.4.6",
-      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.4.6.tgz",
-      "integrity": "sha512-9oB4BiGDTI1FmIBlOF9OJ5hwJvcBEmPCqk/hy314Uhy2uq5TjekUZM8w8SPLLlUEM+mxNhXdPAXfrJN2Zbb/GQ==",
+      "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.0.0",
+        "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.0.0"
       }
     },
@@ -11214,66 +10862,94 @@
       "requires": {
         "agent-base": "5",
         "debug": "4"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "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": {
-            "ms": "^2.1.1"
+            "locate-path": "^3.0.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "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"
+          }
+        },
+        "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": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "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"
+          }
         }
       }
     },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-      "dev": true
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "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
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "requires": {
+        "repeating": "^2.0.0"
+      }
     },
     "indexof": {
       "version": "0.0.1",
@@ -11285,7 +10961,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -11297,80 +10972,56 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
       "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.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"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
+        "ansi-regex": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
         },
-        "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,
+        "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="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "requires": {
-            "color-name": "~1.1.4"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.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==",
-          "dev": true
-        },
-        "has-flag": {
+        "strip-ansi": {
           "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.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "requires": {
-            "has-flag": "^4.0.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
@@ -11378,12 +11029,11 @@
     "interpret": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-      "dev": true
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "into-stream": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
       "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
       "dev": true,
       "requires": {
@@ -11403,8 +11053,7 @@
     "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
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "ipaddr.js": {
       "version": "1.9.1",
@@ -11415,7 +11064,6 @@
       "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,
       "requires": {
         "is-relative": "^1.0.0",
         "is-windows": "^1.0.1"
@@ -11425,22 +11073,14 @@
       "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,
       "requires": {
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -11470,35 +11110,52 @@
       }
     },
     "is-arguments": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
-      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
     },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-bigint": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
       "dev": true
     },
     "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==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "dev": true,
       "requires": {
-        "binary-extensions": "^2.0.0"
+        "call-bind": "^1.0.2"
       }
     },
     "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-      "dev": true
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "dev": true
     },
     "is-ci": {
       "version": "2.0.0",
@@ -11509,26 +11166,26 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "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,
       "requires": {
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -11536,9 +11193,10 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "dev": true
     },
     "is-decimal": {
       "version": "1.0.4",
@@ -11550,7 +11208,6 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -11560,8 +11217,7 @@
         "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
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
@@ -11589,26 +11245,25 @@
     "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
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
     },
     "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
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "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
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
     },
     "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
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -11620,7 +11275,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -11631,35 +11285,63 @@
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "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==",
+      "dev": true
+    },
     "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=",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI="
+    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true
     },
     "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-number-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
       "dev": true
     },
     "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
       "dev": true
     },
     "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=",
+      "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
     },
     "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"
       }
@@ -11679,22 +11361,22 @@
     "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
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
     },
     "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
+      "dev": true,
       "requires": {
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.2"
       }
     },
     "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,
       "requires": {
         "is-unc-path": "^1.0.0"
       }
@@ -11702,8 +11384,7 @@
     "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
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
     },
     "is-retry-allowed": {
       "version": "1.2.0",
@@ -11717,10 +11398,16 @@
       "integrity": "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=",
       "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==",
+      "dev": true
+    },
     "is-ssh": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz",
-      "integrity": "sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz",
+      "integrity": "sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==",
       "dev": true,
       "requires": {
         "protocols": "^1.1.0"
@@ -11729,20 +11416,33 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
       "dev": true
     },
     "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
       "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typed-array": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz",
+      "integrity": "sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.2",
+        "call-bind": "^1.0.2",
+        "es-abstract": "^1.18.0-next.2",
+        "foreach": "^2.0.5",
         "has-symbols": "^1.0.1"
       }
     },
@@ -11756,7 +11456,6 @@
       "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,
       "requires": {
         "unc-path-regex": "^0.1.2"
       }
@@ -11764,13 +11463,23 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
     "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=",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao="
+    },
+    "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
+    },
+    "is-weakset": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz",
+      "integrity": "sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==",
       "dev": true
     },
     "is-whitespace-character": {
@@ -11782,8 +11491,7 @@
     "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
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "is-word-character": {
       "version": "1.0.4",
@@ -11801,9 +11509,9 @@
       },
       "dependencies": {
         "is-docker": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-          "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+          "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
           "dev": true
         }
       }
@@ -11811,8 +11519,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isbinaryfile": {
       "version": "3.0.3",
@@ -11826,14 +11533,12 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
     "isstream": {
       "version": "0.1.2",
@@ -11863,12 +11568,6 @@
         "wordwrap": "^1.0.0"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "escodegen": {
           "version": "1.8.1",
           "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
@@ -11913,6 +11612,15 @@
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "dev": true
         },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "resolve": {
           "version": "1.1.7",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
@@ -11969,9 +11677,9 @@
           }
         },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -12038,11 +11746,14 @@
             "handlebars": "^4.0.3"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         },
         "rimraf": {
           "version": "2.7.1",
@@ -12053,6 +11764,12 @@
             "glob": "^7.1.3"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -12089,14 +11806,6 @@
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-coverage": "^3.0.0",
         "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
       }
     },
     "istanbul-lib-report": {
@@ -12116,6 +11825,28 @@
           "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
           "dev": true
         },
+        "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"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -12140,25 +11871,26 @@
         "source-map": "^0.6.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
         "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
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "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"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
         },
         "rimraf": {
@@ -12170,6 +11902,12 @@
             "glob": "^7.1.3"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -12188,14 +11926,12 @@
       }
     },
     "istextorbinary": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz",
-      "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
-      "dev": true,
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz",
+      "integrity": "sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==",
       "requires": {
-        "binaryextensions": "2",
-        "editions": "^1.3.3",
-        "textextensions": "2"
+        "binaryextensions": "^2.2.0",
+        "textextensions": "^3.2.0"
       }
     },
     "isurl": {
@@ -12209,15 +11945,23 @@
       }
     },
     "jake": {
-      "version": "10.8.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.1.tgz",
-      "integrity": "sha512-eSp5h9S7UFzKdQERTyF+KuPLjDZa1Tbw8gCVUn98n4PbIkLEDGe4zl7vF4Qge9kQj06HcymnksPk8jznPZeKsA==",
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
+      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
       "dev": true,
       "requires": {
         "async": "0.9.x",
         "chalk": "^2.4.2",
         "filelist": "^1.0.1",
         "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        }
       }
     },
     "jest": {
@@ -12241,10 +11985,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12256,6 +12010,12 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
         "cliui": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -12282,6 +12042,12 @@
             "locate-path": "^3.0.0"
           }
         },
+        "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
+        },
         "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",
@@ -12319,15 +12085,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "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,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -12337,10 +12094,16 @@
             "p-limit": "^2.0.0"
           }
         },
-        "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==",
+        "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
+        },
+        "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
         },
         "string-width": {
@@ -12363,6 +12126,12 @@
             "ansi-regex": "^4.1.0"
           }
         },
+        "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
+        },
         "wrap-ansi": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -12374,6 +12143,12 @@
             "strip-ansi": "^5.0.0"
           }
         },
+        "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
+        },
         "yargs": {
           "version": "13.3.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -12426,10 +12201,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12473,10 +12258,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12488,84 +12283,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-get-type": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
@@ -12578,27 +12295,6 @@
           "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "pretty-format": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
@@ -12611,44 +12307,39 @@
             "react-is": "^16.8.4"
           }
         },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
         }
       }
     },
     "jest-diff": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
-      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -12677,9 +12368,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -12720,10 +12411,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12752,6 +12453,12 @@
             "ansi-styles": "^3.2.0",
             "react-is": "^16.8.4"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
         }
       }
     },
@@ -12780,10 +12487,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12815,10 +12532,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -12827,9 +12554,9 @@
       }
     },
     "jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
       "dev": true
     },
     "jest-haste-map": {
@@ -12863,152 +12590,23 @@
             "@types/yargs": "^13.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
           "dev": true,
           "requires": {
-            "remove-trailing-separator": "^1.0.1"
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
           }
         },
-        "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=",
+        "@types/yargs": {
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "@types/yargs-parser": "*"
           }
         }
       }
@@ -13048,10 +12646,26 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+          "dev": true
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13063,41 +12677,18 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
         "diff-sequences": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
           "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
           "dev": true
         },
+        "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
+        },
         "expect": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
@@ -13112,55 +12703,6 @@
             "jest-regex-util": "^24.9.0"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-diff": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
@@ -13213,27 +12755,6 @@
           "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "pretty-format": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
@@ -13246,20 +12767,25 @@
             "react-is": "^16.8.4"
           }
         },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
+        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
-        "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=",
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "escape-string-regexp": "^2.0.0"
           }
         }
       }
@@ -13285,10 +12811,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13317,35 +12853,40 @@
             "ansi-styles": "^3.2.0",
             "react-is": "^16.8.4"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
         }
       }
     },
     "jest-matcher-utils": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
-      "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
-        "jest-diff": "^25.5.0",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.5.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -13374,9 +12915,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -13385,35 +12926,44 @@
       }
     },
     "jest-message-util": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
-      "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
+      "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==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^25.5.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^3.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
-        "stack-utils": "^1.0.1"
+        "stack-utils": "^2.0.2"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -13435,20 +12985,54 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "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,
+          "requires": {
+            "to-regex-range": "^5.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
         },
+        "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
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
           }
+        },
+        "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,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
@@ -13472,10 +13056,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13484,15 +13078,15 @@
       }
     },
     "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "dev": true
     },
     "jest-regex-util": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
-      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
+      "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-resolve": {
@@ -13519,10 +13113,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13552,10 +13156,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13607,93 +13221,37 @@
             "@types/yargs": "^13.0.0"
           }
         },
-        "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
           }
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+          "dev": true
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+        "@types/yargs": {
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "@types/yargs-parser": "*"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "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
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-message-util": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
@@ -13710,27 +13268,6 @@
             "stack-utils": "^1.0.1"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -13753,14 +13290,13 @@
             "source-map": "^0.6.0"
           }
         },
-        "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=",
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "escape-string-regexp": "^2.0.0"
           }
         }
       }
@@ -13807,10 +13343,26 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+          "dev": true
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -13822,34 +13374,11 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
         },
         "cliui": {
           "version": "5.0.0",
@@ -13868,28 +13397,11 @@
           "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "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
         },
         "find-up": {
           "version": "3.0.0",
@@ -13900,10 +13412,10 @@
             "locate-path": "^3.0.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "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
         },
         "is-fullwidth-code-point": {
@@ -13912,26 +13424,6 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jest-message-util": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
@@ -13964,36 +13456,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -14003,10 +13465,16 @@
             "p-limit": "^2.0.0"
           }
         },
-        "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==",
+        "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
+        },
+        "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
         },
         "slash": {
@@ -14015,6 +13483,15 @@
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^2.0.0"
+          }
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -14041,15 +13518,11 @@
           "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
           "dev": true
         },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
+        "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
         },
         "wrap-ansi": {
           "version": "5.1.0",
@@ -14062,6 +13535,12 @@
             "strip-ansi": "^5.0.0"
           }
         },
+        "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
+        },
         "yargs": {
           "version": "13.3.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
@@ -14130,10 +13609,26 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
+        "@types/stack-utils": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
+          "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
+          "dev": true
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -14145,102 +13640,30 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
         "diff-sequences": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
           "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
           "dev": true
         },
-        "expect": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
-          "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^24.9.0",
-            "ansi-styles": "^3.2.0",
-            "jest-get-type": "^24.9.0",
-            "jest-matcher-utils": "^24.9.0",
-            "jest-message-util": "^24.9.0",
-            "jest-regex-util": "^24.9.0"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "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
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+        "expect": {
+          "version": "24.9.0",
+          "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
+          "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^24.9.0",
+            "ansi-styles": "^3.2.0",
+            "jest-get-type": "^24.9.0",
+            "jest-matcher-utils": "^24.9.0",
+            "jest-message-util": "^24.9.0",
+            "jest-regex-util": "^24.9.0"
           }
         },
         "jest-diff": {
@@ -14295,25 +13718,13 @@
           "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
           "dev": true
         },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
           }
         },
         "pretty-format": {
@@ -14328,10 +13739,10 @@
             "react-is": "^16.8.4"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
           "dev": true
         },
         "slash": {
@@ -14340,14 +13751,13 @@
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
         },
-        "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=",
+        "stack-utils": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+          "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "escape-string-regexp": "^2.0.0"
           }
         }
       }
@@ -14383,15 +13793,40 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
         },
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "slash": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -14431,10 +13866,20 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
@@ -14446,6 +13891,12 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
         "jest-get-type": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
@@ -14463,6 +13914,12 @@
             "ansi-styles": "^3.2.0",
             "react-is": "^16.8.4"
           }
+        },
+        "react-is": {
+          "version": "16.13.1",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+          "dev": true
         }
       }
     },
@@ -14492,20 +13949,24 @@
             "@types/yargs": "^13.0.0"
           }
         },
+        "@types/istanbul-reports": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+          "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "*",
+            "@types/istanbul-lib-report": "*"
+          }
+        },
         "@types/yargs": {
-          "version": "13.0.9",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz",
-          "integrity": "sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg==",
+          "version": "13.0.11",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+          "integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
           "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
-        },
-        "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
         }
       }
     },
@@ -14519,6 +13980,12 @@
         "supports-color": "^6.1.0"
       },
       "dependencies": {
+        "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
+        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -14533,14 +14000,12 @@
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -14597,16 +14062,10 @@
         }
       }
     },
-    "jsencrypt": {
-      "version": "3.0.0-rc.1",
-      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.0.0-rc.1.tgz",
-      "integrity": "sha512-gcvGaqerlUJy1Kq6tNgPYteVEoWNemu+9hBe2CdsCIz4rVcwjoTQ72iD1W76/PRMlnkzG0yVh7nwOOMOOUfKmg=="
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-buffer": {
       "version": "3.0.1",
@@ -14635,14 +14094,12 @@
     "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
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "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
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -14651,23 +14108,17 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
       "requires": {
         "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
+      "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0="
     },
     "jsonparse": {
       "version": "1.3.1",
@@ -14693,15 +14144,14 @@
       "integrity": "sha1-v7P672WqEqMWBYcSlFwyb9jwFDQ="
     },
     "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz",
+      "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ=="
     },
     "just-extend": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz",
-      "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==",
+      "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
     },
     "karma": {
@@ -14738,12 +14188,102 @@
         "useragent": "2.3.0"
       },
       "dependencies": {
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "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
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "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==",
+          "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"
+          }
+        },
+        "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,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "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,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "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,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "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
+        },
         "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         },
+        "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==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -14758,6 +14298,15 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "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,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
         }
       }
     },
@@ -14798,9 +14347,9 @@
       }
     },
     "karma-coverage": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.0.2.tgz",
-      "integrity": "sha512-zge5qiGEIKDdzWciQwP4p0LSac4k/L6VfrBsERMUn5mpDvxhv1sPVOrSlpzpi70T7NhuEy4bgnpAKIYuumIMCw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-2.0.3.tgz",
+      "integrity": "sha512-atDvLQqvPcLxhED0cmXYdsPMCQuh6Asa9FMZW1bhNqlVEhJoB9qyZ2BY1gu7D/rr5GLGb5QzYO4siQskxaWP/g==",
       "dev": true,
       "requires": {
         "istanbul-lib-coverage": "^3.0.0",
@@ -14811,15 +14360,6 @@
         "minimatch": "^3.0.4"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -14858,27 +14398,6 @@
             "istanbul-lib-report": "^3.0.0"
           }
         },
-        "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,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -14886,9 +14405,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -15012,9 +14531,9 @@
       "dev": true
     },
     "karma-sourcemap-loader": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
-      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
+      "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,
       "requires": {
         "graceful-fs": "^4.1.2"
@@ -15032,7 +14551,7 @@
     "karma-webpack": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.5.tgz",
-      "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==",
+      "integrity": "sha1-H/HjppD7c66V7pX5q1jzQc/HtA8=",
       "dev": true,
       "requires": {
         "async": "^2.0.0",
@@ -15055,15 +14574,15 @@
       }
     },
     "kebab-case": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.0.tgz",
-      "integrity": "sha1-P55JkK3K0MaGwOcB92RYaPdfkes=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.1.tgz",
+      "integrity": "sha512-txPHx6nVLhv8PHGXIlAk0nYoh894SpAqGPXNvbg2hh8spvHXIah3+vT87DLoa59nKgC6scD3u3xAuRIgiMqbfQ==",
       "dev": true
     },
     "keyv": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz",
-      "integrity": "sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
+      "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
       "dev": true,
       "requires": {
         "json-buffer": "3.0.1"
@@ -15072,8 +14591,7 @@
     "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
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "kleur": {
       "version": "3.0.3",
@@ -15085,7 +14603,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
       "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
       "requires": {
         "default-resolution": "^2.0.0",
         "es6-weak-map": "^2.0.1"
@@ -15101,33 +14618,14 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
       "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
       "requires": {
         "readable-stream": "^2.0.5"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "lcid": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
       "requires": {
         "invert-kv": "^1.0.0"
       }
@@ -15142,7 +14640,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
       "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
       "requires": {
         "flush-write-stream": "^1.0.2"
       }
@@ -15159,20 +14656,10 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -15182,7 +14669,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
       "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
       "requires": {
         "extend": "^3.0.0",
         "findup-sync": "^3.0.0",
@@ -15202,6 +14688,23 @@
       "requires": {
         "debug": "^2.6.8",
         "marky": "^1.2.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"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
       }
     },
     "listenercount": {
@@ -15211,27 +14714,22 @@
       "dev": true
     },
     "live-connect-js": {
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-1.1.10.tgz",
-      "integrity": "sha512-G/LJKN3b21DZILCQRyataC/znLvJRyogtu7mAkKlkhP9B9UJ8bcOL7ihW/clD2PsT4hVUkeabHhUGsPCmhsjFw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/live-connect-js/-/live-connect-js-2.0.0.tgz",
+      "integrity": "sha512-Xhrj1JU5LoLjJuujjTlvDfc/n3Shzk2hPlYmLdCx/lsltFFVuCFa9uM8u5mcHlmOUKP5pu9I54bAITxZBMHoXg==",
       "requires": {
-        "@kiosked/ulid": "^3.0.0",
-        "abab": "^2.0.3",
-        "browser-cookies": "^1.2.0",
         "tiny-hashes": "1.0.1"
       }
     },
     "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
+      "integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
     },
     "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,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -15250,7 +14748,6 @@
       "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,
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -15261,7 +14758,6 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -15269,44 +14765,38 @@
       }
     },
     "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "p-locate": "^4.1.0"
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
     "lodash._basecopy": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-      "dev": true
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
     },
     "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
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
     },
     "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
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
     },
     "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,
       "requires": {
         "lodash._htmlescapes": "~2.4.1"
       }
@@ -15314,62 +14804,52 @@
     "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
+      "integrity": "sha1-7P4iYYoq3lC/7qQ5N+Ud9m8O23I="
     },
     "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
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
     },
     "lodash._htmlescapes": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz",
-      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs=",
-      "dev": true
+      "integrity": "sha1-MtFL8IRLbeb4tioFG09nwii2JMs="
     },
     "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
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
     },
     "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
+      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw="
     },
     "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
+      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE="
     },
     "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
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
     },
     "lodash._reevaluate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-      "dev": true
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
     },
     "lodash._reinterpolate": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz",
-      "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI=",
-      "dev": true
+      "integrity": "sha1-TxInqlqHEfxjL1sHofRgequLMiI="
     },
     "lodash._reunescapedhtml": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz",
       "integrity": "sha1-dHxPxAED6zu4oJduVx96JlnpO6c=",
-      "dev": true,
       "requires": {
         "lodash._htmlescapes": "~2.4.1",
         "lodash.keys": "~2.4.1"
@@ -15378,14 +14858,12 @@
     "lodash._root": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-      "dev": true
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
     },
     "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,
       "requires": {
         "lodash._objecttypes": "~2.4.1"
       }
@@ -15402,11 +14880,19 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+    },
     "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
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-2.4.1.tgz",
+      "integrity": "sha1-p+iIXwXmiFEUS24SqPNngCa8TFQ=",
+      "requires": {
+        "lodash._objecttypes": "~2.4.1",
+        "lodash.keys": "~2.4.1"
+      }
     },
     "lodash.difference": {
       "version": "4.5.0",
@@ -15418,7 +14904,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz",
       "integrity": "sha1-LOEsXghNsKV92l5dHu659dF1o7Q=",
-      "dev": true,
       "requires": {
         "lodash._escapehtmlchar": "~2.4.1",
         "lodash._reunescapedhtml": "~2.4.1",
@@ -15446,20 +14931,20 @@
     "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
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
     },
     "lodash.isarray": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
     },
     "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
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+      "requires": {
+        "lodash._objecttypes": "~2.4.1"
+      }
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
@@ -15471,22 +14956,10 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz",
       "integrity": "sha1-SN6kbfj/djKxDXBrissmWR4rNyc=",
-      "dev": true,
       "requires": {
         "lodash._isnative": "~2.4.1",
         "lodash._shimkeys": "~2.4.1",
         "lodash.isobject": "~2.4.1"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1"
-          }
-        }
       }
     },
     "lodash.merge": {
@@ -15504,8 +14977,7 @@
     "lodash.restparam": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-      "dev": true
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
     },
     "lodash.some": {
       "version": "4.6.0",
@@ -15523,7 +14995,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz",
       "integrity": "sha1-nmEQB+32KRKal0qzxIuBez4c8g0=",
-      "dev": true,
       "requires": {
         "lodash._escapestringchar": "~2.4.1",
         "lodash._reinterpolate": "~2.4.1",
@@ -15532,25 +15003,12 @@
         "lodash.keys": "~2.4.1",
         "lodash.templatesettings": "~2.4.1",
         "lodash.values": "~2.4.1"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "lodash._objecttypes": "~2.4.1",
-            "lodash.keys": "~2.4.1"
-          }
-        }
       }
     },
     "lodash.templatesettings": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz",
       "integrity": "sha1-6nbHXRHrhtTb6JqDiTu4YZKaxpk=",
-      "dev": true,
       "requires": {
         "lodash._reinterpolate": "~2.4.1",
         "lodash.escape": "~2.4.1"
@@ -15566,7 +15024,6 @@
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-2.4.1.tgz",
       "integrity": "sha1-q/UUQ2s8twUAFieXjLzzCxKA7qQ=",
-      "dev": true,
       "requires": {
         "lodash.keys": "~2.4.1"
       }
@@ -15584,24 +15041,63 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.2"
-      }
-    },
-    "log-update": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "chalk": "^4.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.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "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"
+          }
+        }
       }
     },
     "log4js": {
@@ -15615,29 +15111,12 @@
         "flatted": "^2.0.0",
         "rfdc": "^1.1.4",
         "streamroller": "^1.0.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "loglevel": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
       "dev": true
     },
     "loglevel-plugin-prefix": {
@@ -15649,7 +15128,7 @@
     "loglevelnext": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz",
-      "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==",
+      "integrity": "sha1-NvxPWZbWZA9Tn/IDuoGWQWgNdaI=",
       "dev": true,
       "requires": {
         "es6-symbol": "^3.1.1",
@@ -15687,7 +15166,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -15703,7 +15181,6 @@
       "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"
@@ -15713,40 +15190,27 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
       "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-      "dev": true,
       "requires": {
         "es5-ext": "~0.10.2"
       }
     },
     "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,
+      "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==",
       "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
+        "semver": "^6.0.0"
       }
     },
     "make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
     },
     "make-error-cause": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
       "integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
-      "dev": true,
       "requires": {
         "make-error": "^1.2.0"
       }
@@ -15755,7 +15219,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
       "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
       "requires": {
         "kind-of": "^6.0.2"
       }
@@ -15772,26 +15235,22 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
     },
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
     "map-stream": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-      "dev": true
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
+      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
     },
     "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,
       "requires": {
         "object-visit": "^1.0.0"
       }
@@ -15809,16 +15268,15 @@
       "dev": true
     },
     "marky": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz",
-      "integrity": "sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.2.tgz",
+      "integrity": "sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==",
       "dev": true
     },
     "matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
       "requires": {
         "findup-sync": "^2.0.0",
         "micromatch": "^3.0.4",
@@ -15826,63 +15284,10 @@
         "stack-trace": "0.0.10"
       },
       "dependencies": {
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
         "findup-sync": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
           "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-          "dev": true,
           "requires": {
             "detect-file": "^1.0.0",
             "is-glob": "^3.1.0",
@@ -15890,71 +15295,13 @@
             "resolve-dir": "^1.0.1"
           }
         },
-        "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-glob": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
@@ -16070,7 +15417,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
     "mem": {
@@ -16080,30 +15427,28 @@
       "dev": true,
       "requires": {
         "mimic-fn": "^1.0.0"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "memoizee": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.14.tgz",
-      "integrity": "sha512-/SWFvWegAIYAO4NQMpcX+gcra0yEZu4OntmUdrBaWrJncxOqAziGFlHxc7yjKVK2uu3lpPW27P27wkR82wA8mg==",
-      "dev": true,
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
+      "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
       "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.45",
-        "es6-weak-map": "^2.0.2",
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.53",
+        "es6-weak-map": "^2.0.3",
         "event-emitter": "^0.3.5",
-        "is-promise": "^2.1",
-        "lru-queue": "0.1",
-        "next-tick": "1",
-        "timers-ext": "^0.1.5"
+        "is-promise": "^2.2.2",
+        "lru-queue": "^0.1.0",
+        "next-tick": "^1.1.0",
+        "timers-ext": "^0.1.7"
+      },
+      "dependencies": {
+        "next-tick": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+          "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
+        }
       }
     },
     "memory-fs": {
@@ -16114,23 +15459,6 @@
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "memorystream": {
@@ -16141,9 +15469,8 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -16155,24 +15482,6 @@
         "read-pkg-up": "^1.0.1",
         "redent": "^1.0.0",
         "trim-newlines": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        },
-        "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,
-          "requires": {
-            "camelcase": "^2.0.0",
-            "map-obj": "^1.0.0"
-          }
-        }
       }
     },
     "merge-descriptors": {
@@ -16198,10 +15507,12 @@
       }
     },
     "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
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
     },
     "methods": {
       "version": "1.1.2",
@@ -16209,13 +15520,23 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "dev": true,
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
+        "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"
       }
     },
     "miller-rabin": {
@@ -16229,9 +15550,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -16242,23 +15563,22 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
     },
     "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.48.0"
       }
     },
     "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
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
     "mimic-response": {
       "version": "1.0.1",
@@ -16282,7 +15602,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -16290,14 +15609,12 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "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,
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -16307,7 +15624,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"
           }
@@ -16315,13 +15631,9 @@
       }
     },
     "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,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+      "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
     },
     "mkdirp-classic": {
       "version": "0.5.3",
@@ -16332,7 +15644,7 @@
     "mocha": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
+      "integrity": "sha1-bYrlCPWRZ/lA8rWzxKYSrlDJCuY=",
       "dev": true,
       "requires": {
         "browser-stdout": "1.3.1",
@@ -16348,25 +15660,25 @@
         "supports-color": "5.4.0"
       },
       "dependencies": {
-        "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
-        },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI=",
+          "dev": true
+        },
         "glob": {
           "version": "7.1.2",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -16398,10 +15710,16 @@
             "minimist": "0.0.8"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "supports-color": {
           "version": "5.4.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "integrity": "sha1-HGszdALCE3YF7+GfEP7DkPb6q1Q=",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -16411,7 +15729,7 @@
     },
     "module-deps-sortable": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-4.0.6.tgz",
+      "resolved": "http://registry.npmjs.org/module-deps-sortable/-/module-deps-sortable-4.0.6.tgz",
       "integrity": "sha1-ElGkuixEqS32mJvQKdoSGk8hCbA=",
       "dev": true,
       "requires": {
@@ -16444,7 +15762,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "2.0.6",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
               "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
               "dev": true,
               "requires": {
@@ -16458,47 +15776,24 @@
             }
           }
         },
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "^2.0.2"
+          }
+        },
         "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
         },
-        "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,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "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
-            },
-            "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_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         }
@@ -16517,24 +15812,38 @@
         "on-headers": "~1.0.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"
+          }
+        },
         "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
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multipipe": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
       "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-      "dev": true,
       "requires": {
         "duplexer2": "0.0.2"
       },
@@ -16556,7 +15865,7 @@
         },
         "readable-stream": {
           "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "dev": true,
           "requires": {
@@ -16568,7 +15877,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         }
@@ -16577,27 +15886,29 @@
     "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
+      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="
     },
     "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": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
     "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
-      "dev": true,
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "optional": true
     },
+    "nanoid": {
+      "version": "3.1.20",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
+      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "dev": true
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -16615,12 +15926,11 @@
     "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
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "ncp": {
       "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+      "resolved": "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
       "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
       "dev": true
     },
@@ -16630,22 +15940,21 @@
       "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
     },
     "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+      "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
     },
     "next-tick": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
       "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
       "dev": true
     },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "nise": {
       "version": "1.5.3",
@@ -16696,15 +16005,11 @@
         }
       }
     },
-    "node-environment-flags": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
-      "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
-      "dev": true,
-      "requires": {
-        "object.getownpropertydescriptors": "^2.0.3",
-        "semver": "^5.7.0"
-      }
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true
     },
     "node-int64": {
       "version": "0.4.0",
@@ -16759,21 +16064,6 @@
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "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,
-          "requires": {
-            "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"
-          }
         }
       }
     },
@@ -16784,9 +16074,9 @@
       "dev": true
     },
     "node-notifier": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz",
+      "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
       "dev": true,
       "requires": {
         "growly": "^1.3.0",
@@ -16801,14 +16091,19 @@
           "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
           "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
           "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
     "node-releases": {
-      "version": "1.1.58",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
-      "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
-      "dev": true
+      "version": "1.1.73",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
     },
     "nopt": {
       "version": "3.0.6",
@@ -16823,31 +16118,35 @@
       "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"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "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
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
     "normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "dev": true
     },
     "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,
       "requires": {
         "once": "^1.3.2"
       }
@@ -16869,19 +16168,6 @@
         "string.prototype.padend": "^3.0.0"
       },
       "dependencies": {
-        "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,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "load-json-file": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -16942,7 +16228,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
       "requires": {
         "path-key": "^2.0.0"
       }
@@ -16956,8 +16241,7 @@
     "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
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "nwsapi": {
       "version": "2.2.0",
@@ -16974,8 +16258,7 @@
     "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
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-component": {
       "version": "0.0.3",
@@ -16987,7 +16270,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -16998,22 +16280,14 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
         },
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -17021,17 +16295,19 @@
       }
     },
     "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "dev": true
     },
     "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "object-keys": {
@@ -17043,27 +16319,25 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
       "requires": {
         "isobject": "^3.0.0"
       }
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       }
     },
     "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,
       "requires": {
         "array-each": "^1.0.1",
         "array-slice": "^1.0.0",
@@ -17072,20 +16346,20 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.2"
       }
     },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
       "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
       "requires": {
         "for-own": "^1.0.0",
         "make-iterator": "^1.0.0"
@@ -17116,7 +16390,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -17125,22 +16398,20 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
       "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
       "requires": {
         "for-own": "^1.0.0",
         "make-iterator": "^1.0.0"
       }
     },
     "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
       }
     },
     "on-finished": {
@@ -17161,24 +16432,22 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
     },
     "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "requires": {
-        "mimic-fn": "^2.1.0"
+        "mimic-fn": "^1.0.0"
       }
     },
     "opener": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
     "opn": {
@@ -17210,7 +16479,7 @@
       "dependencies": {
         "minimist": {
           "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
           "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
           "dev": true
         },
@@ -17226,7 +16495,6 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -17234,32 +16502,21 @@
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2",
         "word-wrap": "~1.2.3"
+      },
+      "dependencies": {
+        "fast-levenshtein": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+          "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+        }
       }
     },
     "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,
       "requires": {
         "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "os-browserify": {
@@ -17270,65 +16527,28 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
     "os-locale": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-      "dev": true,
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
-        "execa": "^0.7.0",
-        "lcid": "^1.0.0",
-        "mem": "^1.1.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.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"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
+        "lcid": "^1.0.0"
       }
     },
     "os-tmpdir": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
     "p-cancelable": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
-      "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+      "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
       "dev": true
     },
     "p-each-series": {
@@ -17343,31 +16563,28 @@
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
     },
     "p-is-promise": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
       "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
       "dev": true
     },
     "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,
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "requires": {
-        "p-limit": "^1.1.0"
+        "p-limit": "^2.2.0"
       }
     },
     "p-reduce": {
@@ -17386,10 +16603,9 @@
       }
     },
     "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
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
     "pako": {
       "version": "1.0.11",
@@ -17407,14 +16623,13 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.0",
         "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
         "evp_bytestokey": "^1.0.0",
         "pbkdf2": "^3.0.3",
         "safe-buffer": "^5.1.1"
@@ -17507,6 +16722,12 @@
           "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
           "dev": true
         },
+        "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
+        },
         "json-buffer": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
@@ -17528,6 +16749,15 @@
           "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
           "dev": true
         },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "normalize-url": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
@@ -17606,7 +16836,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
       "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
       "requires": {
         "is-absolute": "^1.0.0",
         "map-cache": "^0.2.0",
@@ -17615,7 +16844,7 @@
     },
     "parse-git-config": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/parse-git-config/-/parse-git-config-0.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/parse-git-config/-/parse-git-config-0.2.0.tgz",
       "integrity": "sha1-Jygz/dFf6hRvt10zbSNrljtv9wY=",
       "dev": true,
       "requires": {
@@ -17655,7 +16884,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
       "requires": {
         "error-ex": "^1.2.0"
       }
@@ -17669,14 +16897,12 @@
     "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
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
     },
     "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
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
     },
     "parse-path": {
       "version": "3.0.4",
@@ -17746,8 +16972,7 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
     },
     "path-browserify": {
       "version": "0.0.1",
@@ -17758,38 +16983,33 @@
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
     },
     "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
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
     },
     "path-is-absolute": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
     "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
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
     },
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-platform": {
       "version": "0.11.15",
@@ -17801,7 +17021,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
       "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
       "requires": {
         "path-root-regex": "^0.1.0"
       }
@@ -17809,8 +17028,7 @@
     "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
+      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -17821,7 +17039,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "pify": "^2.0.0",
@@ -17829,24 +17046,23 @@
       }
     },
     "pathval": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "dev": true,
       "requires": {
         "through": "~2.3"
       }
     },
     "pbkdf2": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.0.tgz",
-      "integrity": "sha512-wHMFZ6HTLGlB9f/WsQBs5OwMQJoLXYuJUzbA+j+hRBf7+Y8KcXpatzIviIcTy1OAyhWQp08nyiPO8Dnv0z4Sww==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
       "dev": true,
       "requires": {
         "create-hash": "^1.1.2",
@@ -17858,7 +17074,7 @@
     },
     "pbkdf2-compat": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
       "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
       "dev": true
     },
@@ -17875,9 +17091,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "dev": true
     },
     "pidtree": {
@@ -17889,20 +17105,17 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "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,
       "requires": {
         "pinkie": "^2.0.0"
       }
@@ -17917,96 +17130,88 @@
       }
     },
     "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==",
+      "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==",
+      "requires": {
+        "find-up": "^4.0.0"
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
       "dev": true,
       "requires": {
-        "find-up": "^3.0.0"
+        "find-up": "^2.1.0"
       },
       "dependencies": {
         "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "locate-path": "^2.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==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
+            "p-locate": "^2.0.0",
             "path-exists": "^3.0.0"
           }
         },
         "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "p-try": "^1.0.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==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "p-limit": "^1.1.0"
           }
         },
         "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==",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "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
         }
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
-      "requires": {
-        "find-up": "^2.1.0"
-      }
-    },
     "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,
       "requires": {
         "ansi-colors": "^1.0.1",
         "arr-diff": "^4.0.0",
         "arr-union": "^3.1.0",
         "extend-shallow": "^3.0.2"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "ansi-wrap": "^0.1.0"
-          }
-        }
       }
     },
     "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
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
     },
     "pn": {
       "version": "1.1.0",
@@ -18017,14 +17222,12 @@
     "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
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
     "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
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prepend-http": {
       "version": "1.0.4",
@@ -18039,24 +17242,29 @@
       "dev": true
     },
     "pretty-format": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
-      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.5.0",
+        "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
-        "react-is": "^16.12.0"
+        "react-is": "^17.0.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -18079,19 +17287,25 @@
     },
     "pretty-hrtime": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
     "pretty-ms": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz",
-      "integrity": "sha512-J3aPWiC5e9ZeZFuSeBraGxSkGMOvulSWsxDByOcbD1Pr75YL3LSNIKIb52WXbCLE1sS5s4inBBbryjF4Y05Ceg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
+      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
       "dev": true,
       "requires": {
         "parse-ms": "^2.1.0"
       }
     },
+    "printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",
+      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
+      "dev": true
+    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -18107,23 +17321,21 @@
     "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",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "property-information": {
@@ -18133,17 +17345,17 @@
       "dev": true
     },
     "protocols": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz",
-      "integrity": "sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz",
+      "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==",
       "dev": true
     },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "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==",
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
       }
     },
@@ -18171,8 +17383,7 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
       "version": "1.8.0",
@@ -18195,9 +17406,9 @@
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }
@@ -18206,7 +17417,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -18216,7 +17426,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
       "requires": {
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
@@ -18227,7 +17436,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
             "once": "^1.3.1"
@@ -18238,19 +17446,20 @@
     "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
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "puppeteer-core": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-3.3.0.tgz",
-      "integrity": "sha512-hynQ3r0J/lkGrKeBCqu160jrj0WhthYLIzDQPkBxLzxPokjw4elk1sn6mXAian/kfD2NRzpdh9FSykxZyL56uA==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
+      "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
+        "devtools-protocol": "0.0.818844",
         "extract-zip": "^2.0.0",
         "https-proxy-agent": "^4.0.0",
-        "mime": "^2.0.3",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
         "progress": "^2.0.1",
         "proxy-from-env": "^1.0.0",
         "rimraf": "^3.0.2",
@@ -18259,27 +17468,6 @@
         "ws": "^7.2.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "rimraf": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -18331,9 +17519,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
     "quick-lru": {
@@ -18397,16 +17585,15 @@
       }
     },
     "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "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
     },
     "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,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -18417,7 +17604,6 @@
       "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,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -18427,7 +17613,6 @@
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
@@ -18437,7 +17622,6 @@
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
           }
@@ -18445,23 +17629,36 @@
       }
     },
     "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": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "requires": {
+        "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"
+      }
+    },
+    "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,
       "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "minimatch": "^3.0.4"
       }
     },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-      "dev": true,
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "requires": {
-        "picomatch": "^2.2.1"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "realpath-native": {
@@ -18477,60 +17674,52 @@
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
       "requires": {
         "resolve": "^1.1.6"
       }
     },
+    "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,
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
     "redent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
-      },
-      "dependencies": {
-        "indent-string": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-          "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-          "dev": true,
-          "requires": {
-            "repeating": "^2.0.0"
-          }
-        }
       }
     },
     "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
-      "dev": true
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
     },
     "regenerate-unicode-properties": {
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
       "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
-      "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "regenerator-transform": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
-      "dev": true,
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "requires": {
-        "@babel/runtime": "^7.8.4",
-        "private": "^0.1.8"
+        "@babel/runtime": "^7.8.4"
       }
     },
     "regex-cache": {
@@ -18546,32 +17735,31 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
-      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "dev": true,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "regexpp": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
       "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-      "dev": true,
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
       "requires": {
         "regenerate": "^1.4.0",
         "regenerate-unicode-properties": "^8.2.0",
@@ -18584,21 +17772,19 @@
     "regjsgen": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
-      "dev": true
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="
     },
     "regjsparser": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-      "dev": true,
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "requires": {
         "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
           "dev": true
         }
@@ -18704,7 +17890,7 @@
     },
     "remote-origin-url": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/remote-origin-url/-/remote-origin-url-0.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/remote-origin-url/-/remote-origin-url-0.4.0.tgz",
       "integrity": "sha1-TT4pAvNOLTfRwmPYdxC3frQIajA=",
       "dev": true,
       "requires": {
@@ -18715,25 +17901,15 @@
       "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,
       "requires": {
         "is-buffer": "^1.1.5",
         "is-utf8": "^0.2.1"
-      },
-      "dependencies": {
-        "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
-        }
       }
     },
     "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,
       "requires": {
         "remove-bom-buffer": "^3.0.0",
         "safe-buffer": "^5.1.0",
@@ -18743,41 +17919,35 @@
     "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
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
+      "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=="
     },
     "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
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "repeating": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
     },
     "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
     },
     "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,
       "requires": {
         "homedir-polyfill": "^1.0.1",
         "is-absolute": "^1.0.0",
@@ -18788,28 +17958,10 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
       "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
-      "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.3",
         "object-assign": "^4.0.1",
         "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "request": {
@@ -18855,21 +18007,21 @@
       }
     },
     "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.19"
       }
     },
     "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.3",
+        "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       }
@@ -18877,20 +18029,17 @@
     "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
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "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
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
     "require-uncached": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
       "requires": {
         "caller-path": "^0.1.0",
         "resolve-from": "^1.0.0"
@@ -18899,8 +18048,7 @@
         "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
+          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
         }
       }
     },
@@ -18911,18 +18059,18 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-      "dev": true,
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
       "requires": {
+        "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
       }
     },
     "resolve-alpn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
-      "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz",
+      "integrity": "sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==",
       "dev": true
     },
     "resolve-cwd": {
@@ -18946,7 +18094,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
       "requires": {
         "expand-tilde": "^2.0.0",
         "global-modules": "^1.0.0"
@@ -18962,7 +18109,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
       "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
       "requires": {
         "value-or-function": "^3.0.0"
       }
@@ -18970,8 +18116,7 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
     "responselike": {
       "version": "2.0.0",
@@ -18983,9 +18128,9 @@
       }
     },
     "resq": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/resq/-/resq-1.7.1.tgz",
-      "integrity": "sha512-09u9Q5SAuJfAW5UoVAmvRtLvCOMaKP+djiixTXsZvPaojGKhuvc0Nfvp84U1rIfopJWEOXi5ywpCFwCk7mj8Xw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/resq/-/resq-1.10.0.tgz",
+      "integrity": "sha512-hCUd0xMalqtPDz4jXIqs0M5Wnv/LZXN8h7unFOo4/nvExT9dDPbhwd3udRxLlp0HgBnHcV009UlduE9NZi7A6w==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1"
@@ -19000,31 +18145,29 @@
       }
     },
     "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,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "requires": {
-        "onetime": "^5.1.0",
+        "onetime": "^2.0.0",
         "signal-exit": "^3.0.2"
       }
     },
     "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
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
     "rgb2hex": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.0.tgz",
-      "integrity": "sha512-cHdNTwmTMPu/TpP1bJfdApd6MbD+Kzi4GNnM6h35mdFChhQPSi9cAI8J7DMn5kQDKX8NuBaQXAyo360Oa7tOEA==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.2.3.tgz",
+      "integrity": "sha512-clEe0m1xv+Tva1B/TOepuIcvLAxP0U+sCDfgt1SX1HmI2Ahr5/Cd/nzJM1e78NKVtWdoo0s33YehpFA8UfIShQ==",
       "dev": true
     },
     "right-align": {
@@ -19037,13 +18180,9 @@
       }
     },
     "rimraf": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
-      "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.5"
-      }
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+      "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
     },
     "ripemd160": {
       "version": "2.0.2",
@@ -19064,209 +18203,74 @@
     "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
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
     },
     "rx-lite": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
     },
     "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,
-      "requires": {
-        "rx-lite": "*"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "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=="
-    },
-    "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
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
       "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "samsam": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
-      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
-      "dev": true
-    },
-    "sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "dev": true,
-      "requires": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "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-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
+        "rx-lite": "*"
+      }
+    },
+    "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"
+      }
+    },
+    "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=="
+    },
+    "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="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "samsam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz",
+      "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==",
+      "dev": true
+    },
+    "sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "dev": true,
+      "requires": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
       }
     },
     "sax": {
@@ -19276,21 +18280,19 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "dev": true,
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "requires": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
-          "dev": true,
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -19301,16 +18303,14 @@
       }
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "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,
       "requires": {
         "sver-compat": "^1.5.0"
       }
@@ -19335,6 +18335,21 @@
         "statuses": "~1.5.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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+            }
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -19343,27 +18358,35 @@
       }
     },
     "serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
+      "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.13.1"
+        "type-fest": "^0.20.2"
       },
       "dependencies": {
         "type-fest": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+          "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
         }
       }
     },
+    "serialize-javascript": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
+      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
     "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,
       "requires": {
         "accepts": "~1.3.4",
         "batch": "0.6.1",
@@ -19374,11 +18397,18 @@
         "parseurl": "~1.3.2"
       },
       "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"
+          }
+        },
         "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,
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
@@ -19386,11 +18416,15 @@
             "statuses": ">= 1.4.0 < 2"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
         }
       }
     },
@@ -19408,14 +18442,12 @@
     "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
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "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,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -19427,7 +18459,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -19447,7 +18478,7 @@
     },
     "sha.js": {
       "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
@@ -19459,7 +18490,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
       }
@@ -19467,8 +18497,7 @@
     "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
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
     },
     "shell-quote": {
       "version": "1.7.2",
@@ -19493,15 +18522,25 @@
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
       "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==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "sinon": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
+      "resolved": "http://registry.npmjs.org/sinon/-/sinon-4.5.0.tgz",
       "integrity": "sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==",
       "dev": true,
       "requires": {
@@ -19512,6 +18551,14 @@
         "nise": "^1.2.0",
         "supports-color": "^5.1.0",
         "type-detect": "^4.0.5"
+      },
+      "dependencies": {
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "dev": true
+        }
       }
     },
     "sisteransi": {
@@ -19527,40 +18574,17 @@
       "dev": true
     },
     "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,
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "is-fullwidth-code-point": "^2.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "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
+        "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="
         }
       }
     },
@@ -19568,7 +18592,6 @@
       "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,
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -19580,11 +18603,18 @@
         "use": "^3.1.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"
+          }
+        },
         "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,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -19593,10 +18623,14 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
         }
       }
     },
@@ -19604,7 +18638,6 @@
       "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,
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -19615,7 +18648,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -19624,7 +18656,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -19633,7 +18664,6 @@
           "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,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -19642,7 +18672,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -19655,22 +18684,14 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
       },
       "dependencies": {
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -19680,7 +18701,7 @@
     "socket.io": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "integrity": "sha1-oGnF/qvuPmshSnW0DOBlLhz7mYA=",
       "dev": true,
       "requires": {
         "debug": "~3.1.0",
@@ -19694,11 +18715,17 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -19711,7 +18738,7 @@
     "socket.io-client": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "integrity": "sha1-3LOBA0NqtFeN2wJmOK4vIbYjZx8=",
       "dev": true,
       "requires": {
         "backo2": "1.0.2",
@@ -19739,17 +18766,23 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
     "socket.io-parser": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
       "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
       "dev": true,
       "requires": {
@@ -19767,7 +18800,7 @@
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -19778,6 +18811,12 @@
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
           "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
           "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -19788,6 +18827,14 @@
       "dev": true,
       "requires": {
         "is-plain-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "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
+        }
       }
     },
     "source-list-map": {
@@ -19799,14 +18846,12 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "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==",
-      "dev": true,
       "requires": {
         "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
@@ -19825,10 +18870,9 @@
       }
     },
     "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
     },
     "space-separated-tokens": {
       "version": "1.1.5",
@@ -19839,14 +18883,12 @@
     "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
+      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
     },
     "spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -19855,30 +18897,26 @@
     "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
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
     },
     "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,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ=="
     },
     "split": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-      "dev": true,
       "requires": {
         "through": "2"
       }
@@ -19887,7 +18925,6 @@
       "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,
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -19895,8 +18932,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
       "version": "1.16.1",
@@ -19918,14 +18954,24 @@
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
     },
     "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "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
+        }
+      }
     },
     "state-toggle": {
       "version": "1.0.3",
@@ -19937,7 +18983,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
       "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -19947,7 +18992,6 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -19982,7 +19026,7 @@
         },
         "readable-stream": {
           "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz",
           "integrity": "sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=",
           "dev": true,
           "requires": {
@@ -19997,7 +19041,7 @@
         },
         "string_decoder": {
           "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
           "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
           "dev": true
         }
@@ -20011,23 +19055,6 @@
       "requires": {
         "inherits": "~2.0.1",
         "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "stream-buffers": {
@@ -20038,9 +19065,8 @@
     },
     "stream-combiner": {
       "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-      "dev": true,
       "requires": {
         "duplexer": "~0.1.1"
       }
@@ -20055,19 +19081,13 @@
         "readable-stream": "^2.0.2"
       },
       "dependencies": {
-        "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==",
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
           "requires": {
-            "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"
+            "readable-stream": "^2.0.2"
           }
         }
       }
@@ -20075,8 +19095,7 @@
     "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
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw=="
     },
     "stream-http": {
       "version": "2.8.3",
@@ -20089,30 +19108,12 @@
         "readable-stream": "^2.3.6",
         "to-arraybuffer": "^1.0.0",
         "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "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
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
     },
     "streamroller": {
       "version": "1.0.6",
@@ -20137,9 +19138,9 @@
           }
         },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -20165,12 +19166,6 @@
             "graceful-fs": "^4.1.6"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -20201,12 +19196,6 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "astral-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-          "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -20221,73 +19210,53 @@
     "string-template": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
-      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
-      "dev": true
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0="
     },
     "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-      "dev": true,
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string.prototype.padend": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
-      "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.2.tgz",
+      "integrity": "sha512-/AQFLdYvePENU3W5rgurfWSMU6n+Ww8n/3cUt7E+vPBB/D7YDG8x+qjoFs4M/alR2bW7Qg6xMjVwWUOvuQ0XpQ==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.18.0-next.2"
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
-      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimstart": "^1.0.0"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
-      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+      "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,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5",
-        "string.prototype.trimend": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "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,
       "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
     "string_decoder": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "resolved": "http://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"
       }
@@ -20305,19 +19274,17 @@
       }
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^2.0.0"
       }
     },
     "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,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -20325,12 +19292,11 @@
     "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
+      "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI="
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
@@ -20338,7 +19304,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
       "requires": {
         "get-stdin": "^4.0.1"
       }
@@ -20346,8 +19311,7 @@
     "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
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
     "subarg": {
       "version": "1.0.0",
@@ -20368,7 +19332,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
       }
@@ -20377,7 +19340,6 @@
       "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,
       "requires": {
         "es6-iterator": "^2.0.1",
         "es6-symbol": "^3.1.1"
@@ -20393,7 +19355,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
       "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-      "dev": true,
       "requires": {
         "ajv": "^5.2.3",
         "ajv-keywords": "^2.1.0",
@@ -20406,35 +19367,22 @@
         "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
+          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
         },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
         },
         "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
-        },
-        "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,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0"
-          }
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
         },
         "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"
@@ -20444,7 +19392,6 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
           "requires": {
             "ansi-regex": "^3.0.0"
           }
@@ -20458,28 +19405,41 @@
       "dev": true
     },
     "tar-fs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
-      "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
+      "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,
       "requires": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
+        "tar-stream": "^2.1.4"
       }
     },
     "tar-stream": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz",
-      "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.1",
+        "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"
+          }
+        }
       }
     },
     "temp-fs": {
@@ -20489,44 +19449,28 @@
       "dev": true,
       "requires": {
         "rimraf": "~2.5.2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.5.4",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
+          "dev": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        }
       }
     },
     "ternary-stream": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-2.1.1.tgz",
       "integrity": "sha512-j6ei9hxSoyGlqTmoMjOm+QNvUKDOIY6bNl4Uh1lhBvl6yjPW2iLqxDUYyfDPZknQ4KdRziFl+ec99iT4l7g0cw==",
-      "dev": true,
       "requires": {
         "duplexify": "^3.5.0",
         "fork-stream": "^0.0.4",
         "merge-stream": "^1.0.0",
         "through2": "^2.0.1"
-      },
-      "dependencies": {
-        "merge-stream": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-          "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "^2.0.1"
-          }
-        },
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "test-exclude": {
@@ -20572,15 +19516,6 @@
             "path-exists": "^3.0.0"
           }
         },
-        "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,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
@@ -20590,12 +19525,6 @@
             "p-limit": "^2.0.0"
           }
         },
-        "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
-        },
         "parse-json": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -20606,6 +19535,12 @@
             "json-parse-better-errors": "^1.0.1"
           }
         },
+        "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
+        },
         "path-type": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
@@ -20642,6 +19577,12 @@
             "read-pkg": "^3.0.0"
           }
         },
+        "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
+        },
         "strip-bom": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -20653,14 +19594,12 @@
     "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
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "textextensions": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz",
-      "integrity": "sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==",
-      "dev": true
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz",
+      "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw=="
     },
     "throat": {
       "version": "4.1.0",
@@ -20670,7 +19609,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
@@ -20678,34 +19617,15 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "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,
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
@@ -20714,8 +19634,7 @@
     "time-stamp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
+      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
     },
     "timed-out": {
       "version": "4.0.1",
@@ -20724,9 +19643,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -20736,7 +19655,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
       "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-      "dev": true,
       "requires": {
         "es5-ext": "~0.10.46",
         "next-tick": "1"
@@ -20751,7 +19669,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
       "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
-      "dev": true,
       "requires": {
         "body": "^5.1.0",
         "debug": "^3.1.0",
@@ -20762,19 +19679,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -20782,7 +19692,6 @@
       "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"
       }
@@ -20797,7 +19706,6 @@
       "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,
       "requires": {
         "is-absolute": "^1.0.0",
         "is-negated-glob": "^1.0.0"
@@ -20818,29 +19726,20 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
     "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,
       "requires": {
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "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
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -20851,7 +19750,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -20860,19 +19758,18 @@
       }
     },
     "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,
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "requires": {
-        "is-number": "^7.0.0"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       }
     },
     "to-through": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
       "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
       "requires": {
         "through2": "^2.0.3"
       }
@@ -20922,8 +19819,7 @@
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
     },
     "trim-right": {
       "version": "1.0.1",
@@ -20932,9 +19828,9 @@
       "dev": true
     },
     "trim-trailing-lines": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
-      "integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
+      "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==",
       "dev": true
     },
     "trough": {
@@ -20949,10 +19845,39 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
       "dev": true
     },
+    "tsconfig-paths": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
+      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.0",
+        "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==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
     "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "tty-browserify": {
@@ -20979,14 +19904,12 @@
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
     },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -20998,9 +19921,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "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
     },
     "type-is": {
@@ -21015,8 +19938,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typescript-compare": {
       "version": "0.0.2",
@@ -21040,19 +19962,15 @@
       }
     },
     "ua-parser-js": {
-      "version": "0.7.21",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
-      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
+      "version": "0.7.28",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
+      "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
       "dev": true
     },
     "uglify-js": {
-      "version": "3.9.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz",
-      "integrity": "sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.20.3"
-      }
+      "version": "3.13.9",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz",
+      "integrity": "sha512-wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="
     },
     "uglify-to-browserify": {
       "version": "1.0.2",
@@ -21125,6 +20043,18 @@
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
       "dev": true
     },
+    "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,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
     "unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -21138,20 +20068,19 @@
     "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
+      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
     },
     "undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-      "dev": true,
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz",
+      "integrity": "sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==",
       "requires": {
         "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",
@@ -21161,8 +20090,7 @@
     "undertaker-registry": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA="
     },
     "unherit": {
       "version": "1.1.3",
@@ -21177,14 +20105,12 @@
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
-      "dev": true
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
     },
     "unicode-match-property-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
       "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
-      "dev": true,
       "requires": {
         "unicode-canonical-property-names-ecmascript": "^1.0.4",
         "unicode-property-aliases-ecmascript": "^1.0.4"
@@ -21193,14 +20119,12 @@
     "unicode-match-property-value-ecmascript": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
-      "dev": true
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="
     },
     "unicode-property-aliases-ecmascript": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
-      "dev": true
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="
     },
     "unified": {
       "version": "6.2.0",
@@ -21214,13 +20138,20 @@
         "trough": "^1.0.0",
         "vfile": "^2.0.0",
         "x-is-string": "^0.1.0"
+      },
+      "dependencies": {
+        "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
+        }
       }
     },
     "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,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -21232,7 +20163,6 @@
       "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,
       "requires": {
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "through2-filter": "^3.0.0"
@@ -21248,9 +20178,9 @@
       }
     },
     "unist-util-generated": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.5.tgz",
-      "integrity": "sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw==",
+      "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
     },
     "unist-util-is": {
@@ -21299,9 +20229,9 @@
       }
     },
     "universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
     "unpipe": {
@@ -21313,7 +20243,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
       "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -21323,7 +20252,6 @@
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
           "requires": {
             "get-value": "^2.0.3",
             "has-values": "^0.1.4",
@@ -21334,7 +20262,6 @@
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
               "requires": {
                 "isarray": "1.0.0"
               }
@@ -21344,8 +20271,7 @@
         "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
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
         }
       }
     },
@@ -21372,19 +20298,13 @@
           "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
           "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==",
+        "duplexer2": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+          "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
           "dev": true,
           "requires": {
-            "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"
+            "readable-stream": "^2.0.2"
           }
         }
       }
@@ -21392,14 +20312,12 @@
     "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -21407,8 +20325,7 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
     },
     "url": {
       "version": "0.11.0",
@@ -21435,9 +20352,9 @@
       "dev": true
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.0.tgz",
+      "integrity": "sha512-9iT6N4s93SMfzunOyDPe4vo4nLcSu1yq0IQK1gURmjm8tQNlM6loiuCRrKG1hHGXfB2EWd6H4cGi7tGdaygMFw==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -21470,13 +20387,12 @@
     "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
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
     },
     "useragent": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
+      "integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
       "dev": true,
       "requires": {
         "lru-cache": "4.1.x",
@@ -21495,19 +20411,19 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz",
+      "integrity": "sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==",
       "dev": true,
       "requires": {
+        "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
+        "for-each": "^0.3.3",
         "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
+        "object.getownpropertydescriptors": "^2.1.1"
       }
     },
     "utils-merge": {
@@ -21516,16 +20432,15 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-      "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true
     },
     "v8flags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
       "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
-      "dev": true,
       "requires": {
         "homedir-polyfill": "^1.0.1"
       }
@@ -21534,7 +20449,6 @@
       "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,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -21543,8 +20457,7 @@
     "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
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
     },
     "vary": {
       "version": "1.1.2",
@@ -21574,10 +20487,10 @@
         "vfile-message": "^1.0.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
           "dev": true
         }
       }
@@ -21589,67 +20502,32 @@
       "dev": true
     },
     "vfile-message": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
-      "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
-      "dev": true,
-      "requires": {
-        "unist-util-stringify-position": "^1.1.1"
-      }
-    },
-    "vfile-reporter": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-4.0.0.tgz",
-      "integrity": "sha1-6m8K4TQvSEFXOYXgX5QXNvJ96do=",
-      "dev": true,
-      "requires": {
-        "repeat-string": "^1.5.0",
-        "string-width": "^1.0.0",
-        "supports-color": "^4.1.0",
-        "unist-util-stringify-position": "^1.0.0",
-        "vfile-statistics": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-          "dev": true
-        },
-        "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,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "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,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
+      "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
+      "dev": true,
+      "requires": {
+        "unist-util-stringify-position": "^1.1.1"
+      }
+    },
+    "vfile-reporter": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-4.0.0.tgz",
+      "integrity": "sha1-6m8K4TQvSEFXOYXgX5QXNvJ96do=",
+      "dev": true,
+      "requires": {
+        "repeat-string": "^1.5.0",
+        "string-width": "^1.0.0",
+        "supports-color": "^4.1.0",
+        "unist-util-stringify-position": "^1.0.0",
+        "vfile-statistics": "^1.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
         },
         "supports-color": {
           "version": "4.5.0",
@@ -21675,10 +20553,9 @@
       "dev": true
     },
     "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dev": true,
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
       "requires": {
         "clone": "^2.1.1",
         "clone-buffer": "^1.0.0",
@@ -21686,21 +20563,12 @@
         "cloneable-readable": "^1.0.0",
         "remove-trailing-separator": "^1.0.1",
         "replace-ext": "^1.0.0"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-          "dev": true
-        }
       }
     },
     "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,
       "requires": {
         "fs-mkdirp-stream": "^1.0.0",
         "glob-stream": "^6.1.0",
@@ -21719,30 +20587,12 @@
         "value-or-function": "^3.0.0",
         "vinyl": "^2.0.0",
         "vinyl-sourcemap": "^1.1.0"
-      },
-      "dependencies": {
-        "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,
-          "requires": {
-            "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"
-          }
-        }
       }
     },
     "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,
       "requires": {
         "append-buffer": "^1.0.2",
         "convert-source-map": "^1.5.0",
@@ -21757,7 +20607,6 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -21768,7 +20617,6 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
       "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
       "requires": {
         "source-map": "^0.5.1"
       }
@@ -21798,7 +20646,6 @@
       "version": "2.3.14",
       "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz",
       "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==",
-      "dev": true,
       "requires": {
         "foreachasync": "^3.0.0"
       }
@@ -21813,270 +20660,138 @@
       }
     },
     "watchpack": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
-      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "requires": {
-        "chokidar": "^3.4.0",
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.0"
-      }
-    },
-    "watchpack-chokidar2": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chokidar": "^2.1.8"
+        "watchpack-chokidar2": "^2.0.1"
       },
       "dependencies": {
         "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
           "dev": true,
           "optional": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "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,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
         },
         "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
           "dev": true,
           "optional": true
         },
         "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "optional": true,
           "requires": {
-            "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"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "fill-range": "^7.0.1"
           }
         },
         "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
           "dev": true,
           "optional": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "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"
+            "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"
           }
         },
         "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "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,
           "optional": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "to-regex-range": "^5.0.1"
           }
         },
         "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
           "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
+          "optional": true
         },
         "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "dev": true,
           "optional": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
+            "is-glob": "^4.0.1"
           }
         },
         "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=",
+          "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,
           "optional": true,
           "requires": {
-            "binary-extensions": "^1.0.0"
+            "binary-extensions": "^2.0.0"
           }
         },
-        "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,
-          "optional": true
-        },
         "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "optional": 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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "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"
-          }
-        },
-        "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==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true,
-          "optional": true,
-          "requires": {
-            "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"
-          }
+          "optional": true
         },
         "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
           "dev": true,
           "optional": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
+            "picomatch": "^2.2.1"
           }
         },
         "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=",
+          "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,
           "optional": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "is-number": "^7.0.0"
           }
         }
       }
     },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      }
+    },
     "wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -22088,41 +20803,78 @@
       }
     },
     "webdriver": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.1.14.tgz",
-      "integrity": "sha512-6fXoGDnxWfJn9zqfYbc6+VEV5N1obd3K7iuRmJ7w/hH9d9XDxcrcx147T5egiy1qziko61hqYE/x9VtSQbjPcA==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.12.1.tgz",
+      "integrity": "sha512-3rZgAj9o2XHp16FDTzvUYaHelPMSPbO1TpLIMUT06DfdZjNYIzZiItpIb/NbQDTPmNhzd9cuGmdI56WFBGY2BA==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/protocols": "6.1.14",
-        "@wdio/utils": "6.1.8",
+        "@wdio/config": "6.12.1",
+        "@wdio/logger": "6.10.10",
+        "@wdio/protocols": "6.12.0",
+        "@wdio/utils": "6.11.0",
         "got": "^11.0.2",
         "lodash.merge": "^4.6.1"
       }
     },
     "webdriverio": {
-      "version": "6.1.16",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.1.16.tgz",
-      "integrity": "sha512-vk6/XeErNnMooebCtxwIR//LqrastXO9gXL+eVUGNRAuG5omp8XCdT+MK2fmlw53xhcPULQ/y3h8ysYlPnPeyA==",
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.12.1.tgz",
+      "integrity": "sha512-Nx7ge0vTWHVIRUbZCT+IuMwB5Q0Q5nLlYdgnmmJviUKLuc3XtaEBkYPTbhHWHgSBXsPZMIc023vZKNkn+6iyeQ==",
       "dev": true,
       "requires": {
-        "@wdio/config": "6.1.14",
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.1.8",
-        "@wdio/utils": "6.1.8",
-        "archiver": "^4.0.1",
+        "@types/puppeteer-core": "^5.4.0",
+        "@wdio/config": "6.12.1",
+        "@wdio/logger": "6.10.10",
+        "@wdio/repl": "6.11.0",
+        "@wdio/utils": "6.11.0",
+        "archiver": "^5.0.0",
+        "atob": "^2.1.2",
+        "css-shorthand-properties": "^1.1.1",
         "css-value": "^0.0.1",
-        "devtools": "6.1.16",
+        "devtools": "6.12.1",
+        "fs-extra": "^9.0.1",
+        "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",
-        "resq": "^1.6.0",
-        "rgb2hex": "^0.2.0",
-        "serialize-error": "^7.0.0",
-        "webdriver": "6.1.14"
+        "minimatch": "^3.0.4",
+        "puppeteer-core": "^5.1.0",
+        "resq": "^1.9.1",
+        "rgb2hex": "0.2.3",
+        "serialize-error": "^8.0.0",
+        "webdriver": "6.12.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "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"
+          }
+        },
+        "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
+        }
       }
     },
     "webidl-conversions": {
@@ -22162,9 +20914,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
-          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -22174,9 +20926,9 @@
           }
         },
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
         "async": {
@@ -22194,34 +20946,45 @@
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
-        "cliui": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+        "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,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
-        "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==",
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.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"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
         "has-flag": {
@@ -22231,32 +20994,89 @@
           "dev": true
         },
         "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=",
+          "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
+        },
+        "json5": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
           }
         },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
+        "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,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
         },
-        "load-json-file": {
+        "p-locate": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "p-limit": "^1.1.0"
           }
         },
+        "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
+        },
+        "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
+        },
         "path-type": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
@@ -22287,12 +21107,6 @@
             "read-pkg": "^2.0.0"
           }
         },
-        "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
-        },
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -22301,38 +21115,15 @@
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
             "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "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": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "strip-bom": {
@@ -22350,33 +21141,10 @@
             "has-flag": "^2.0.0"
           }
         },
-        "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,
-          "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            }
-          }
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+        "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
         },
         "yargs": {
@@ -22412,9 +21180,9 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
+      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
@@ -22426,22 +21194,28 @@
         "express": "^4.16.3",
         "filesize": "^3.6.1",
         "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
         "acorn-walk": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
-          "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
+          "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
+        },
+        "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
         },
         "ejs": {
@@ -22450,10 +21224,19 @@
           "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
           "dev": true
         },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "ws": {
-          "version": "6.2.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+          "version": "6.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
           "dev": true,
           "requires": {
             "async-limiter": "~1.0.0"
@@ -22479,7 +21262,7 @@
         },
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -22490,7 +21273,7 @@
     },
     "webpack-dev-middleware": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
+      "resolved": "http://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz",
       "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==",
       "dev": true,
       "requires": {
@@ -22504,9 +21287,9 @@
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         }
       }
@@ -22514,7 +21297,7 @@
     "webpack-log": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz",
-      "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==",
+      "integrity": "sha1-pLNM2msitRjbsKsy5WeWLVxypD0=",
       "dev": true,
       "requires": {
         "chalk": "^2.1.0",
@@ -22560,7 +21343,7 @@
     },
     "webpack-stream": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-stream/-/webpack-stream-3.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/webpack-stream/-/webpack-stream-3.2.0.tgz",
       "integrity": "sha1-Oh0WD7EdQXJ7fObzL3IkZPmLIYY=",
       "dev": true,
       "requires": {
@@ -22575,7 +21358,7 @@
       "dependencies": {
         "acorn": {
           "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
           "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
           "dev": true
         },
@@ -22604,24 +21387,12 @@
           "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
           "dev": true
         },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "big.js": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
           "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
           "dev": true
         },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
         "braces": {
           "version": "1.8.5",
           "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
@@ -22635,7 +21406,7 @@
         },
         "browserify-aes": {
           "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
+          "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
           "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
           "dev": true,
           "requires": {
@@ -22696,6 +21467,12 @@
             "wordwrap": "0.0.2"
           }
         },
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "dev": true
+        },
         "clone-stats": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
@@ -22704,7 +21481,7 @@
         },
         "crypto-browserify": {
           "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
           "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
           "dev": true,
           "requires": {
@@ -22763,40 +21540,6 @@
             "is-extglob": "^1.0.0"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
         "glob-parent": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
@@ -22824,74 +21567,6 @@
           "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
           "dev": true
         },
-        "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,
-          "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
-            }
-          }
-        },
-        "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,
-          "requires": {
-            "binary-extensions": "^1.0.0"
-          }
-        },
-        "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": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "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
-            }
-          }
-        },
-        "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,
-          "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-extglob": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
@@ -22907,15 +21582,6 @@
             "is-extglob": "^1.0.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
         "json5": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
@@ -22974,6 +21640,15 @@
             "regex-cache": "^0.4.2"
           }
         },
+        "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,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "node-libs-browser": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz",
@@ -23003,14 +21678,6 @@
             "url": "^0.11.0",
             "util": "^0.10.3",
             "vm-browserify": "0.0.4"
-          },
-          "dependencies": {
-            "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
-            }
           }
         },
         "normalize-path": {
@@ -23030,7 +21697,7 @@
         },
         "pako": {
           "version": "0.2.9",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+          "resolved": "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
           "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
           "dev": true
         },
@@ -23046,230 +21713,6 @@
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "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,
-          "requires": {
-            "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"
-          }
-        },
-        "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,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          },
-          "dependencies": {
-            "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
-            },
-            "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
-            },
-            "braces": {
-              "version": "2.3.2",
-              "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-              "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-              "dev": true,
-              "requires": {
-                "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"
-              },
-              "dependencies": {
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                }
-              }
-            },
-            "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,
-              "requires": {
-                "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"
-              },
-              "dependencies": {
-                "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,
-                  "requires": {
-                    "is-descriptor": "^0.1.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "is-extendable": "^0.1.0"
-                  }
-                },
-                "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,
-                  "requires": {
-                    "is-accessor-descriptor": "^0.1.6",
-                    "is-data-descriptor": "^0.1.4",
-                    "kind-of": "^5.0.0"
-                  }
-                },
-                "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
-                }
-              }
-            },
-            "extglob": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-              "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-              "dev": true,
-              "requires": {
-                "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"
-              },
-              "dependencies": {
-                "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,
-                  "requires": {
-                    "is-descriptor": "^1.0.0"
-                  }
-                },
-                "extend-shallow": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                  "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                  "dev": true,
-                  "requires": {
-                    "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": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "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,
-              "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": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "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",
-              "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-              "dev": true,
-              "requires": {
-                "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"
-              }
-            }
-          }
-        },
         "replace-ext": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -23278,16 +21721,22 @@
         },
         "ripemd160": {
           "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
           "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
           "dev": true
         },
         "sha.js": {
           "version": "2.2.6",
-          "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
+          "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
           "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
           "dev": true
         },
+        "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
+        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -23299,23 +21748,13 @@
         },
         "tapable": {
           "version": "0.1.10",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "resolved": "http://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
           "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
           "dev": true
         },
-        "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,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        },
         "uglify-js": {
           "version": "2.7.5",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
+          "resolved": "http://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
           "dev": true,
           "requires": {
@@ -23327,7 +21766,7 @@
           "dependencies": {
             "async": {
               "version": "0.2.10",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz",
               "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
               "dev": true
             }
@@ -23375,7 +21814,7 @@
           "dependencies": {
             "async": {
               "version": "0.9.2",
-              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+              "resolved": "http://registry.npmjs.org/async/-/async-0.9.2.tgz",
               "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
               "dev": true
             }
@@ -23412,7 +21851,7 @@
         },
         "yargs": {
           "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
           "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
           "dev": true,
           "requires": {
@@ -23428,7 +21867,6 @@
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
       "requires": {
         "http-parser-js": ">=0.5.1",
         "safe-buffer": ">=5.1.0",
@@ -23438,8 +21876,7 @@
     "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
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
     },
     "whatwg-encoding": {
       "version": "1.0.5",
@@ -23467,20 +21904,58 @@
         "webidl-conversions": "^4.0.2"
       }
     },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "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,
+      "requires": {
+        "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"
+      }
+    },
+    "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,
       "requires": {
-        "isexe": "^2.0.0"
+        "is-map": "^2.0.1",
+        "is-set": "^2.0.1",
+        "is-weakmap": "^2.0.1",
+        "is-weakset": "^2.0.1"
       }
     },
     "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
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+    },
+    "which-typed-array": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz",
+      "integrity": "sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==",
+      "dev": true,
+      "requires": {
+        "available-typed-arrays": "^1.0.2",
+        "call-bind": "^1.0.0",
+        "es-abstract": "^1.18.0-next.1",
+        "foreach": "^2.0.5",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.1",
+        "is-typed-array": "^1.1.3"
+      }
     },
     "wide-align": {
       "version": "1.1.3",
@@ -23489,39 +21964,6 @@
       "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "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": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "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": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
       }
     },
     "window-size": {
@@ -23533,8 +21975,7 @@
     "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
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
     "wordwrap": {
       "version": "1.0.0",
@@ -23542,57 +21983,42 @@
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
+    "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
+    },
     "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,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "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
-        }
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true,
       "requires": {
         "mkdirp": "^0.5.1"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "write-file-atomic": {
@@ -23607,9 +22033,9 @@
       }
     },
     "ws": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
-      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==",
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "dev": true
     },
     "x-is-string": {
@@ -23633,178 +22059,56 @@
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
     },
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
+      "resolved": "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz",
       "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=",
       "dev": true
     },
     "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,
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+      "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
       "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+        "camelcase": "^3.0.0",
+        "object.assign": "^4.1.0"
       }
     },
     "yargs-unparser": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
-      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
       "dev": true,
       "requires": {
-        "flat": "^4.1.0",
-        "lodash": "^4.17.15",
-        "yargs": "^13.3.0"
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "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"
-          }
-        },
-        "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=",
+        "camelcase": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
         },
-        "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"
-          }
-        },
-        "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,
-          "requires": {
-            "p-try": "^2.0.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"
-          }
-        },
-        "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==",
+        "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
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "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"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "yargs": {
-          "version": "13.3.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.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": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "13.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
@@ -23819,12 +22123,6 @@
         "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": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -23844,10 +22142,20 @@
             "supports-color": "^2.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "cross-spawn": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+          "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
+        "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,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -23877,15 +22185,34 @@
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
       "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
+    },
     "zip-stream": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-3.0.1.tgz",
-      "integrity": "sha512-r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.0.tgz",
+      "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
       "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
-        "compress-commons": "^3.0.0",
+        "compress-commons": "^4.1.0",
         "readable-stream": "^3.6.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"
+          }
+        }
       }
     }
   }
diff --git a/package.json b/package.json
index 62988fa3d27..1895af53a7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "3.25.0",
+  "version": "4.43.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -39,6 +39,7 @@
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
+    "deep-equal": "^2.0.3",
     "documentation": "^5.2.2",
     "es5-shim": "^4.5.14",
     "eslint-config-standard": "^10.2.1",
@@ -48,7 +49,7 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-standard": "^3.0.1",
     "execa": "^1.0.0",
-    "faker": "^3.1.0",
+    "faker": "5.5.3",
     "fs.extra": "^1.3.2",
     "gulp": "^4.0.0",
     "gulp-clean": "^0.3.2",
@@ -85,7 +86,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.31",
     "karma-webpack": "^3.0.5",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.21",
     "mocha": "^5.0.0",
     "morgan": "^1.10.0",
     "opn": "^5.4.0",
@@ -101,44 +102,21 @@
   },
   "dependencies": {
     "@babel/core": "^7.2.2",
-    "babel-loader": "^8.0.5",
     "@babel/preset-env": "^7.2.3",
-    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-loader": "^8.0.5",
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "core-js": "^3.0.0",
     "core-js-pure": "^3.6.5",
     "criteo-direct-rsa-validate": "^1.1.0",
     "crypto-js": "^3.3.0",
-    "deep-equal": "^1.0.1",
     "dlv": "1.1.3",
     "dset": "2.0.1",
+    "execa": "^1.0.0",
     "express": "^4.15.4",
+    "fs.extra": "^1.3.2",
     "fun-hooks": "^0.9.9",
-    "jsencrypt": "^3.0.0-rc.1",
     "just-clone": "^1.0.2",
-    "karma": "^4.0.0",
-    "live-connect-js": "1.1.10",
-    "gulp": "^4.0.0",
-    "gulp-clean": "^0.3.2",
-    "gulp-concat": "^2.6.0",
-    "gulp-connect": "^5.7.0",
-    "yargs": "^1.3.1",
-    "lodash": "^4.17.4",
-    "gulp-replace": "^1.0.0",
-    "gulp-shell": "^0.5.2",
-    "gulp-sourcemaps": "^2.6.0",
-    "gulp-uglify": "^3.0.0",
-    "gulp-util": "^3.0.0",
-    "gulp-eslint": "^4.0.0",
-    "gulp-if": "^2.0.2",
-    "gulp-js-escape": "^1.0.1",
-    "execa": "^1.0.0",
-    "fs.extra": "^1.3.2",
-    "gulp-footer": "github:prebid/gulp-footer#master",
-    "gulp-header": "^1.7.1",
-    "webpack": "^3.0.0",
-    "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-stream": "^3.2.0",
-    "opn": "^5.4.0"
+    "live-connect-js": "2.0.0",
+    "yargs": "^1.3.1"
   }
 }
diff --git a/src/AnalyticsAdapter.js b/src/AnalyticsAdapter.js
index f3297412a35..80c12a3eb8e 100644
--- a/src/AnalyticsAdapter.js
+++ b/src/AnalyticsAdapter.js
@@ -18,6 +18,7 @@ const {
     BIDDER_DONE,
     SET_TARGETING,
     AD_RENDER_FAILED,
+    AUCTION_DEBUG,
     ADD_AD_UNITS
   }
 } = CONSTANTS;
@@ -112,6 +113,7 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
         [SET_TARGETING]: args => this.enqueue({ eventType: SET_TARGETING, args }),
         [AUCTION_END]: args => this.enqueue({ eventType: AUCTION_END, args }),
         [AD_RENDER_FAILED]: args => this.enqueue({ eventType: AD_RENDER_FAILED, args }),
+        [AUCTION_DEBUG]: args => this.enqueue({ eventType: AUCTION_DEBUG, args }),
         [ADD_AD_UNITS]: args => this.enqueue({ eventType: ADD_AD_UNITS, args }),
         [AUCTION_INIT]: args => {
           args.config = typeof config === 'object' ? config.options || {} : {}; // enableAnaltyics configuration object
diff --git a/src/Renderer.js b/src/Renderer.js
index 85bcbb383e8..c997658b30b 100644
--- a/src/Renderer.js
+++ b/src/Renderer.js
@@ -39,17 +39,22 @@ export function Renderer(options) {
 
   // use a function, not an arrow, in order to be able to pass "arguments" through
   this.render = function () {
-    if (!isRendererDefinedOnAdUnit(adUnitCode)) {
+    const renderArgs = arguments
+    const runRender = () => {
+      if (this._render) {
+        this._render.apply(this, renderArgs)
+      } else {
+        utils.logWarn(`No render function was provided, please use .setRender on the renderer`);
+      }
+    }
+
+    if (!isRendererPreferredFromAdUnit(adUnitCode)) {
       // 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);
     } else {
       utils.logWarn(`External Js not loaded by Renderer since renderer url and callback is already defined on adUnit ${adUnitCode}`);
-    }
-
-    if (this._render) {
-      this._render.apply(this, arguments) // _render is expected to use push as appropriate
-    } else {
-      utils.logWarn(`No render function was provided, please use .setRender on the renderer`);
+      runRender()
     }
   }.bind(this) // bind the function to this object to avoid 'this' errors
 }
@@ -110,10 +115,26 @@ export function executeRenderer(renderer, bid) {
   renderer.render(bid);
 }
 
-function isRendererDefinedOnAdUnit(adUnitCode) {
+function isRendererPreferredFromAdUnit(adUnitCode) {
   const adUnits = $$PREBID_GLOBAL$$.adUnits;
   const adUnit = find(adUnits, adUnit => {
     return adUnit.code === adUnitCode;
   });
-  return !!(adUnit && adUnit.renderer && adUnit.renderer.url && adUnit.renderer.render);
+
+  if (!adUnit) {
+    return false
+  }
+
+  // renderer defined at adUnit level
+  const adUnitRenderer = utils.deepAccess(adUnit, 'renderer');
+  const hasValidAdUnitRenderer = !!(adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render);
+
+  // renderer defined at adUnit.mediaTypes level
+  const mediaTypeRenderer = utils.deepAccess(adUnit, 'mediaTypes.video.renderer');
+  const hasValidMediaTypeRenderer = !!(mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render)
+
+  return !!(
+    (hasValidAdUnitRenderer && !(adUnitRenderer.backupOnly === true)) ||
+    (hasValidMediaTypeRenderer && !(mediaTypeRenderer.backupOnly === true))
+  );
 }
diff --git a/src/adapterManager.js b/src/adapterManager.js
index 2108bb7a4f6..5f8f2e5721c 100644
--- a/src/adapterManager.js
+++ b/src/adapterManager.js
@@ -22,9 +22,11 @@ let adapterManager = {};
 let _bidderRegistry = adapterManager.bidderRegistry = {};
 let _aliasRegistry = adapterManager.aliasRegistry = {};
 
-let _s2sConfig = {};
+let _s2sConfigs = [];
 config.getConfig('s2sConfig', config => {
-  _s2sConfig = config.s2sConfig;
+  if (config && config.s2sConfig) {
+    _s2sConfigs = Array.isArray(config.s2sConfig) ? config.s2sConfig : [config.s2sConfig];
+  }
 });
 
 var _analyticsRegistry = {};
@@ -66,7 +68,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src})
           }
 
           bid = Object.assign({}, bid, getDefinedParams(adUnit, [
-            'fpd',
+            'ortb2Imp',
             'mediaType',
             'renderer',
             'storedAuctionResponse'
@@ -118,15 +120,15 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, labels, src})
 
 const hookedGetBids = hook('sync', getBids, 'getBids');
 
-function getAdUnitCopyForPrebidServer(adUnits) {
-  let adaptersServerSide = _s2sConfig.bidders;
+function getAdUnitCopyForPrebidServer(adUnits, s2sConfig) {
+  let adaptersServerSide = s2sConfig.bidders;
   let adUnitsCopy = utils.deepClone(adUnits);
 
   adUnitsCopy.forEach((adUnit) => {
     // filter out client side bids
     adUnit.bids = adUnit.bids.filter((bid) => {
       return includes(adaptersServerSide, bid.bidder) &&
-        (!doingS2STesting() || bid.finalSource !== s2sTestingModule.CLIENT);
+        (!doingS2STesting(s2sConfig) || bid.finalSource !== s2sTestingModule.CLIENT);
     }).map((bid) => {
       bid.bid_id = utils.getUniqueIdentifierStr();
       return bid;
@@ -145,7 +147,7 @@ function getAdUnitCopyForClientAdapters(adUnits) {
   // filter out s2s bids
   adUnitsClientCopy.forEach((adUnit) => {
     adUnit.bids = adUnit.bids.filter((bid) => {
-      return !doingS2STesting() || bid.finalSource !== s2sTestingModule.SERVER;
+      return !clientTestAdapters.length || bid.finalSource !== s2sTestingModule.SERVER;
     })
   });
 
@@ -177,6 +179,27 @@ export let uspDataHandler = {
   }
 };
 
+export let coppaDataHandler = {
+  getCoppa: function() {
+    return !!(config.getConfig('coppa'))
+  }
+};
+
+// export for testing
+export let clientTestAdapters = [];
+export const allS2SBidders = [];
+
+export function getAllS2SBidders() {
+  adapterManager.s2STestingEnabled = false;
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if (s2sConfig.bidders && s2sConfig.bidders.length) {
+        allS2SBidders.push(...s2sConfig.bidders);
+      }
+    }
+  })
+}
+
 adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels) {
   /**
    * emit and pass adunits for external modification
@@ -184,8 +207,6 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
    */
   events.emit(CONSTANTS.EVENTS.BEFORE_REQUEST_BIDS, adUnits);
 
-  let bidRequests = [];
-
   let bidderCodes = getBidderCodes(adUnits);
   if (config.getConfig('bidderSequence') === RANDOM) {
     bidderCodes = shuffle(bidderCodes);
@@ -193,70 +214,86 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
   const refererInfo = getRefererInfo();
 
   let clientBidderCodes = bidderCodes;
-  let clientTestAdapters = [];
-
-  if (_s2sConfig.enabled) {
-    // if s2sConfig.bidderControl testing is turned on
-    if (doingS2STesting()) {
-      // get all adapters doing client testing
-      const bidderMap = s2sTestingModule.getSourceBidderMap(adUnits);
-      clientTestAdapters = bidderMap[s2sTestingModule.CLIENT];
-    }
 
-    // these are called on the s2s adapter
-    let adaptersServerSide = _s2sConfig.bidders;
-
-    // don't call these client side (unless client request is needed for testing)
-    clientBidderCodes = bidderCodes.filter(elm =>
-      !includes(adaptersServerSide, elm) || includes(clientTestAdapters, elm)
-    );
+  let bidRequests = [];
 
-    const adUnitsContainServerRequests = adUnits => Boolean(
-      find(adUnits, adUnit => find(adUnit.bids, bid => (
-        bid.bidSource ||
-        (_s2sConfig.bidderControl && _s2sConfig.bidderControl[bid.bidder])
-      ) && bid.finalSource === s2sTestingModule.SERVER))
-    );
+  if (allS2SBidders.length === 0) {
+    getAllS2SBidders();
+  }
 
-    if (isTestingServerOnly() && adUnitsContainServerRequests(adUnits)) {
-      clientBidderCodes.length = 0;
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if (doingS2STesting(s2sConfig)) {
+        s2sTestingModule.calculateBidSources(s2sConfig);
+        const bidderMap = s2sTestingModule.getSourceBidderMap(adUnits, allS2SBidders);
+        // get all adapters doing client testing
+        bidderMap[s2sTestingModule.CLIENT].forEach(bidder => {
+          if (!includes(clientTestAdapters, bidder)) {
+            clientTestAdapters.push(bidder);
+          }
+        })
+      }
     }
+  })
 
-    let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits);
-    let tid = utils.generateUUID();
-    adaptersServerSide.forEach(bidderCode => {
-      const bidderRequestId = utils.getUniqueIdentifierStr();
-      const bidderRequest = {
-        bidderCode,
-        auctionId,
-        bidderRequestId,
-        tid,
-        bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
-        auctionStart: auctionStart,
-        timeout: _s2sConfig.timeout,
-        src: CONSTANTS.S2S.SRC,
-        refererInfo
-      };
-      if (bidderRequest.bids.length !== 0) {
-        bidRequests.push(bidderRequest);
+  // don't call these client side (unless client request is needed for testing)
+  clientBidderCodes = bidderCodes.filter(bidderCode => {
+    return !includes(allS2SBidders, bidderCode) || includes(clientTestAdapters, bidderCode)
+  });
+
+  // these are called on the s2s adapter
+  let adaptersServerSide = allS2SBidders;
+
+  const adUnitsContainServerRequests = (adUnits, s2sConfig) => Boolean(
+    find(adUnits, adUnit => find(adUnit.bids, bid => (
+      bid.bidSource ||
+      (s2sConfig.bidderControl && s2sConfig.bidderControl[bid.bidder])
+    ) && bid.finalSource === s2sTestingModule.SERVER))
+  );
+
+  _s2sConfigs.forEach(s2sConfig => {
+    if (s2sConfig && s2sConfig.enabled) {
+      if ((isTestingServerOnly(s2sConfig) && adUnitsContainServerRequests(adUnits, s2sConfig))) {
+        utils.logWarn('testServerOnly: True.  All client requests will be suppressed.');
+        clientBidderCodes.length = 0;
       }
-    });
 
-    // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
-    // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
-    adUnitsS2SCopy.forEach((adUnitCopy) => {
-      let validBids = adUnitCopy.bids.filter((adUnitBid) => {
-        return find(bidRequests, request => {
-          return find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id);
-        });
+      let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits, s2sConfig);
+      let tid = utils.generateUUID();
+      adaptersServerSide.forEach(bidderCode => {
+        const bidderRequestId = utils.getUniqueIdentifierStr();
+        const bidderRequest = {
+          bidderCode,
+          auctionId,
+          bidderRequestId,
+          tid,
+          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': utils.deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
+          auctionStart: auctionStart,
+          timeout: s2sConfig.timeout,
+          src: CONSTANTS.S2S.SRC,
+          refererInfo
+        };
+        if (bidderRequest.bids.length !== 0) {
+          bidRequests.push(bidderRequest);
+        }
       });
-      adUnitCopy.bids = validBids;
-    });
 
-    bidRequests.forEach(request => {
-      request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
-    });
-  }
+      // update the s2sAdUnits object and remove all bids that didn't pass sizeConfig/label checks from getBids()
+      // this is to keep consistency and only allow bids/adunits that passed the checks to go to pbs
+      adUnitsS2SCopy.forEach((adUnitCopy) => {
+        let validBids = adUnitCopy.bids.filter((adUnitBid) =>
+          find(bidRequests, request =>
+            find(request.bids, (reqBid) => reqBid.bidId === adUnitBid.bid_id)));
+        adUnitCopy.bids = validBids;
+      });
+
+      bidRequests.forEach(request => {
+        if (request.adUnitsS2SCopy === undefined) {
+          request.adUnitsS2SCopy = adUnitsS2SCopy.filter(adUnitCopy => adUnitCopy.bids.length > 0);
+        }
+      });
+    }
+  })
 
   // client adapters
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
@@ -306,64 +343,84 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     return partitions;
   }, [[], []]);
 
-  if (serverBidRequests.length) {
-    // s2s should get the same client side timeout as other client side requests.
-    const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
-      request: requestCallbacks.request.bind(null, 's2s'),
-      done: requestCallbacks.done
-    } : undefined);
-    let adaptersServerSide = _s2sConfig.bidders;
-    const s2sAdapter = _bidderRegistry[_s2sConfig.adapter];
-    let tid = serverBidRequests[0].tid;
-    let adUnitsS2SCopy = serverBidRequests[0].adUnitsS2SCopy;
-
-    if (s2sAdapter) {
-      let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy};
-      if (s2sBidRequest.ad_units.length) {
-        let doneCbs = serverBidRequests.map(bidRequest => {
-          bidRequest.start = timestamp();
-          return doneCb.bind(bidRequest);
-        });
-
-        // only log adapters that actually have adUnit bids
-        let allBidders = s2sBidRequest.ad_units.reduce((adapters, adUnit) => {
-          return adapters.concat((adUnit.bids || []).reduce((adapters, bid) => { return adapters.concat(bid.bidder) }, []));
-        }, []);
-        utils.logMessage(`CALLING S2S HEADER BIDDERS ==== ${adaptersServerSide.filter(adapter => {
-          return includes(allBidders, adapter);
-        }).join(',')}`);
-
-        // fire BID_REQUESTED event for each s2s bidRequest
-        serverBidRequests.forEach(bidRequest => {
-          events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
-        });
+  var uniqueServerBidRequests = [];
+  serverBidRequests.forEach(serverBidRequest => {
+    var index = -1;
+    for (var i = 0; i < uniqueServerBidRequests.length; ++i) {
+      if (serverBidRequest.tid === uniqueServerBidRequests[i].tid) {
+        index = i;
+        break;
+      }
+    }
+    if (index <= -1) {
+      uniqueServerBidRequests.push(serverBidRequest);
+    }
+  });
 
-        // make bid requests
-        s2sAdapter.callBids(
-          s2sBidRequest,
-          serverBidRequests,
-          function(adUnitCode, bid) {
-            let bidderRequest = getBidderRequest(serverBidRequests, bid.bidderCode, adUnitCode);
-            if (bidderRequest) {
-              addBidResponse.call(bidderRequest, adUnitCode, bid)
-            }
-          },
-          () => doneCbs.forEach(done => done()),
-          s2sAjax
-        );
+  let counter = 0
+  _s2sConfigs.forEach((s2sConfig) => {
+    if (s2sConfig && uniqueServerBidRequests[counter] && includes(s2sConfig.bidders, uniqueServerBidRequests[counter].bidderCode)) {
+      // s2s should get the same client side timeout as other client side requests.
+      const s2sAjax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
+        request: requestCallbacks.request.bind(null, 's2s'),
+        done: requestCallbacks.done
+      } : undefined);
+      let adaptersServerSide = s2sConfig.bidders;
+      const s2sAdapter = _bidderRegistry[s2sConfig.adapter];
+      let tid = uniqueServerBidRequests[counter].tid;
+      let adUnitsS2SCopy = uniqueServerBidRequests[counter].adUnitsS2SCopy;
+
+      let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.tid === tid)
+
+      if (s2sAdapter) {
+        let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy, s2sConfig};
+        if (s2sBidRequest.ad_units.length) {
+          let doneCbs = uniqueServerRequests.map(bidRequest => {
+            bidRequest.start = timestamp();
+            return doneCb.bind(bidRequest);
+          });
+
+          // only log adapters that actually have adUnit bids
+          let allBidders = s2sBidRequest.ad_units.reduce((adapters, adUnit) => {
+            return adapters.concat((adUnit.bids || []).reduce((adapters, bid) => adapters.concat(bid.bidder), []));
+          }, []);
+          utils.logMessage(`CALLING S2S HEADER BIDDERS ==== ${adaptersServerSide.filter(adapter => includes(allBidders, adapter)).join(',')}`);
+
+          // fire BID_REQUESTED event for each s2s bidRequest
+          uniqueServerRequests.forEach(bidRequest => {
+            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+          });
+
+          // make bid requests
+          s2sAdapter.callBids(
+            s2sBidRequest,
+            serverBidRequests,
+            (adUnitCode, bid) => {
+              let bidderRequest = getBidderRequest(serverBidRequests, bid.bidderCode, adUnitCode);
+              if (bidderRequest) {
+                addBidResponse.call(bidderRequest, adUnitCode, bid)
+              }
+            },
+            () => doneCbs.forEach(done => done()),
+            s2sAjax
+          );
+        }
+      } else {
+        utils.logError('missing ' + s2sConfig.adapter);
       }
-    } else {
-      utils.logError('missing ' + _s2sConfig.adapter);
+      counter++
     }
-  }
+  });
 
   // handle client adapter requests
   clientBidRequests.forEach(bidRequest => {
     bidRequest.start = timestamp();
     // TODO : Do we check for bid in pool from here and skip calling adapter again ?
     const adapter = _bidderRegistry[bidRequest.bidderCode];
-    utils.logMessage(`CALLING BIDDER ======= ${bidRequest.bidderCode}`);
-    events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    config.runWithBidder(bidRequest.bidderCode, () => {
+      utils.logMessage(`CALLING BIDDER`);
+      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    });
     let ajax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
       request: requestCallbacks.request.bind(null, bidRequest.bidderCode),
       done: requestCallbacks.done
@@ -390,27 +447,27 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
   });
 };
 
-function doingS2STesting() {
-  return _s2sConfig && _s2sConfig.enabled && _s2sConfig.testing && s2sTestingModule;
+function doingS2STesting(s2sConfig) {
+  return s2sConfig && s2sConfig.enabled && s2sConfig.testing && s2sTestingModule;
 }
 
-function isTestingServerOnly() {
-  return Boolean(doingS2STesting() && _s2sConfig.testServerOnly);
+function isTestingServerOnly(s2sConfig) {
+  return Boolean(doingS2STesting(s2sConfig) && s2sConfig.testServerOnly);
 };
 
 function getSupportedMediaTypes(bidderCode) {
-  let result = [];
-  if (includes(adapterManager.videoAdapters, bidderCode)) result.push('video');
-  if (includes(nativeAdapters, bidderCode)) result.push('native');
-  return result;
+  let supportedMediaTypes = [];
+  if (includes(adapterManager.videoAdapters, bidderCode)) supportedMediaTypes.push('video');
+  if (includes(nativeAdapters, bidderCode)) supportedMediaTypes.push('native');
+  return supportedMediaTypes;
 }
 
 adapterManager.videoAdapters = []; // added by adapterLoader for now
 
-adapterManager.registerBidAdapter = function (bidAdaptor, bidderCode, {supportedMediaTypes = []} = {}) {
-  if (bidAdaptor && bidderCode) {
-    if (typeof bidAdaptor.callBids === 'function') {
-      _bidderRegistry[bidderCode] = bidAdaptor;
+adapterManager.registerBidAdapter = function (bidAdapter, bidderCode, {supportedMediaTypes = []} = {}) {
+  if (bidAdapter && bidderCode) {
+    if (typeof bidAdapter.callBids === 'function') {
+      _bidderRegistry[bidderCode] = bidAdapter;
 
       if (includes(supportedMediaTypes, 'video')) {
         adapterManager.videoAdapters.push(bidderCode);
@@ -422,37 +479,45 @@ adapterManager.registerBidAdapter = function (bidAdaptor, bidderCode, {supported
       utils.logError('Bidder adaptor error for bidder code: ' + bidderCode + 'bidder must implement a callBids() function');
     }
   } else {
-    utils.logError('bidAdaptor or bidderCode not specified');
+    utils.logError('bidAdapter or bidderCode not specified');
   }
 };
 
-adapterManager.aliasBidAdapter = function (bidderCode, alias) {
+adapterManager.aliasBidAdapter = function (bidderCode, alias, options) {
   let existingAlias = _bidderRegistry[alias];
 
   if (typeof existingAlias === 'undefined') {
-    let bidAdaptor = _bidderRegistry[bidderCode];
-    if (typeof bidAdaptor === 'undefined') {
+    let bidAdapter = _bidderRegistry[bidderCode];
+    if (typeof bidAdapter === 'undefined') {
       // check if alias is part of s2sConfig and allow them to register if so (as base bidder may be s2s-only)
-      const s2sConfig = config.getConfig('s2sConfig');
-      const s2sBidders = s2sConfig && s2sConfig.bidders;
-
-      if (!(s2sBidders && includes(s2sBidders, alias))) {
+      const nonS2SAlias = [];
+      _s2sConfigs.forEach(s2sConfig => {
+        if (s2sConfig.bidders && s2sConfig.bidders.length) {
+          const s2sBidders = s2sConfig && s2sConfig.bidders;
+          if (!(s2sConfig && includes(s2sBidders, alias))) {
+            nonS2SAlias.push(bidderCode);
+          } else {
+            _aliasRegistry[alias] = bidderCode;
+          }
+        }
+      });
+      nonS2SAlias.forEach(bidderCode => {
         utils.logError('bidderCode "' + bidderCode + '" is not an existing bidder.', 'adapterManager.aliasBidAdapter');
-      } else {
-        _aliasRegistry[alias] = bidderCode;
-      }
+      })
     } else {
       try {
         let newAdapter;
         let supportedMediaTypes = getSupportedMediaTypes(bidderCode);
         // Have kept old code to support backward compatibilitiy.
         // Remove this if loop when all adapters are supporting bidderFactory. i.e When Prebid.js is 1.0
-        if (bidAdaptor.constructor.prototype != Object.prototype) {
-          newAdapter = new bidAdaptor.constructor();
+        if (bidAdapter.constructor.prototype != Object.prototype) {
+          newAdapter = new bidAdapter.constructor();
           newAdapter.setBidderCode(alias);
         } else {
-          let spec = bidAdaptor.getSpec();
-          newAdapter = newBidder(Object.assign({}, spec, { code: alias }));
+          let spec = bidAdapter.getSpec();
+          let gvlid = options && options.gvlid;
+          let skipPbsAliasing = options && options.skipPbsAliasing;
+          newAdapter = newBidder(Object.assign({}, spec, { code: alias, gvlid, skipPbsAliasing }));
           _aliasRegistry[alias] = bidderCode;
         }
         adapterManager.registerBidAdapter(newAdapter, alias, {
@@ -467,11 +532,11 @@ adapterManager.aliasBidAdapter = function (bidderCode, alias) {
   }
 };
 
-adapterManager.registerAnalyticsAdapter = function ({adapter, code}) {
+adapterManager.registerAnalyticsAdapter = function ({adapter, code, gvlid}) {
   if (adapter && code) {
     if (typeof adapter.enableAnalytics === 'function') {
       adapter.code = code;
-      _analyticsRegistry[code] = adapter;
+      _analyticsRegistry[code] = { adapter, gvlid };
     } else {
       utils.logError(`Prebid Error: Analytics adaptor error for analytics "${code}"
         analytics adapter must implement an enableAnalytics() function`);
@@ -487,7 +552,7 @@ adapterManager.enableAnalytics = function (config) {
   }
 
   utils._each(config, adapterConfig => {
-    var adapter = _analyticsRegistry[adapterConfig.provider];
+    var adapter = _analyticsRegistry[adapterConfig.provider].adapter;
     if (adapter) {
       adapter.enableAnalytics(adapterConfig);
     } else {
@@ -495,12 +560,16 @@ adapterManager.enableAnalytics = function (config) {
         ${adapterConfig.provider}.`);
     }
   });
-};
+}
 
 adapterManager.getBidAdapter = function(bidder) {
   return _bidderRegistry[bidder];
 };
 
+adapterManager.getAnalyticsAdapter = function(code) {
+  return _analyticsRegistry[code];
+}
+
 // the s2sTesting module is injected when it's loaded rather than being imported
 // importing it causes the packager to include it even when it's not explicitly included in the build
 export function setS2STestingModule(module) {
@@ -545,4 +614,8 @@ adapterManager.callSetTargetingBidder = function(bidder, bid) {
   tryCallBidderMethod(bidder, 'onSetTargeting', bid);
 };
 
+adapterManager.callBidViewableBidder = function(bidder, bid) {
+  tryCallBidderMethod(bidder, 'onBidViewable', bid);
+};
+
 export default adapterManager;
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index 08d31e8dc3d..c71c4ee355b 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -9,7 +9,7 @@ import CONSTANTS from '../constants.json';
 import events from '../events.js';
 import includes from 'core-js-pure/features/array/includes.js';
 import { ajax } from '../ajax.js';
-import { logWarn, logError, parseQueryStringParameters, delayExecution, parseSizesInput, getBidderRequest, flatten, uniques, timestamp, deepAccess, isArray } from '../utils.js';
+import { logWarn, logError, parseQueryStringParameters, delayExecution, parseSizesInput, getBidderRequest, flatten, uniques, timestamp, deepAccess, isArray, isPlainObject } from '../utils.js';
 import { ADPOD } from '../mediaTypes.js';
 import { getHook, hook } from '../hook.js';
 import { getCoreStorageManager } from '../storageManager.js';
@@ -153,8 +153,16 @@ export function registerBidder(spec) {
   putBidder(spec);
   if (Array.isArray(spec.aliases)) {
     spec.aliases.forEach(alias => {
-      adapterManager.aliasRegistry[alias] = spec.code;
-      putBidder(Object.assign({}, spec, { code: alias }));
+      let aliasCode = alias;
+      let gvlid;
+      let skipPbsAliasing;
+      if (isPlainObject(alias)) {
+        aliasCode = alias.code;
+        gvlid = alias.gvlid;
+        skipPbsAliasing = alias.skipPbsAliasing
+      }
+      adapterManager.aliasRegistry[aliasCode] = spec.code;
+      putBidder(Object.assign({}, spec, { code: aliasCode, gvlid, skipPbsAliasing }));
     });
   }
 }
@@ -189,14 +197,10 @@ export function newBidder(spec) {
       const responses = [];
       function afterAllResponses() {
         done();
-        events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
-        registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
-        if (window['owpbjs'] &&
-          window['owpbjs'].getConfig('userSync') &&
-          window['owpbjs'].getConfig('userSync').hasOwnProperty('enableOverride') &&
-          window['owpbjs'].getConfig('userSync')['enableOverride']) {
-          owpbjs.triggerUserSyncs();
-        }
+        config.runWithBidder(spec.code, () => {
+          events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
+          registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
+        });
       }
 
       const validBidRequests = bidderRequest.bids.filter(filterAndWarn);
@@ -313,6 +317,7 @@ export function newBidder(spec) {
               // 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);
               addBidWithCode(bidRequest.adUnitCode, prebidBid);
             } else {
diff --git a/src/adloader.js b/src/adloader.js
index 1c18ce82b16..270dfb46b00 100644
--- a/src/adloader.js
+++ b/src/adloader.js
@@ -4,10 +4,12 @@ import * as utils from './utils.js';
 const _requestCache = {};
 // The below list contains modules or vendors whom Prebid allows to load external JS.
 const _approvedLoadExternalJSList = [
+  'adloox',
   'criteo',
   'outstream',
   'adagio',
-  'browsi'
+  'browsi',
+  'pbjs-debug-ui'
 ]
 
 /**
diff --git a/src/auction.js b/src/auction.js
index b82b4752479..a6f0342e582 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -66,6 +66,7 @@ import { config } from './config.js';
 import { userSync } from './userSync.js';
 import { hook } from './hook.js';
 import find from 'core-js-pure/features/array/find.js';
+import includes from 'core-js-pure/features/array/includes.js';
 import { OUTSTREAM } from './video.js';
 import { VIDEO } from './mediaTypes.js';
 
@@ -196,6 +197,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
     utils.logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived);
     _auctionStatus = AUCTION_COMPLETED;
@@ -397,10 +399,19 @@ export function auctionCallbacks(auctionDone, auctionInstance) {
 
   function adapterDone() {
     let bidderRequest = this;
+    let bidderRequests = auctionInstance.getBidRequests();
+    const auctionOptionsConfig = config.getConfig('auctionOptions');
 
     bidderRequestsDone.add(bidderRequest);
-    allAdapterCalledDone = auctionInstance.getBidRequests()
-      .every(bidderRequest => bidderRequestsDone.has(bidderRequest));
+
+    if (auctionOptionsConfig && !utils.isEmpty(auctionOptionsConfig)) {
+      const secondaryBidders = auctionOptionsConfig.secondaryBidders;
+      if (secondaryBidders && !bidderRequests.every(bidder => includes(secondaryBidders, bidder.bidderCode))) {
+        bidderRequests = bidderRequests.filter(request => !includes(secondaryBidders, request.bidderCode));
+      }
+    }
+
+    allAdapterCalledDone = bidderRequests.every(bidderRequest => bidderRequestsDone.has(bidderRequest));
 
     bidderRequest.bids.forEach(bid => {
       if (!bidResponseMap[bid.bidId]) {
@@ -442,13 +453,13 @@ export function addBidToAuction(auctionInstance, bidResponse) {
 function tryAddVideoBid(auctionInstance, bidResponse, bidRequests, afterBidAdded) {
   let addBid = true;
 
-  const bidderRequest = getBidRequest(bidResponse.requestId, [bidRequests]);
+  const bidderRequest = getBidRequest(bidResponse.originalRequestId || bidResponse.requestId, [bidRequests]);
   const videoMediaType =
   bidderRequest && deepAccess(bidderRequest, 'mediaTypes.video');
   const context = videoMediaType && deepAccess(videoMediaType, 'context');
 
   if (config.getConfig('cache.url') && context !== OUTSTREAM) {
-    if (!bidResponse.videoCacheKey) {
+    if (!bidResponse.videoCacheKey || config.getConfig('cache.ignoreBidderCacheKey')) {
       addBid = false;
       callPrebidCache(auctionInstance, bidResponse, afterBidAdded, bidderRequest);
     } else if (!bidResponse.vastUrl) {
@@ -509,12 +520,29 @@ function getPreparedBidForAuction({adUnitCode, bid, bidderRequest, auctionId}) {
   events.emit(CONSTANTS.EVENTS.BID_ADJUSTMENT, bidObject);
 
   // a publisher-defined renderer can be used to render bids
-  const bidReq = bidderRequest.bids && find(bidderRequest.bids, bid => bid.adUnitCode == adUnitCode);
+  const bidReq = bidderRequest.bids && find(bidderRequest.bids, bid => bid.adUnitCode == adUnitCode && bid.bidId == bidObject.requestId);
   const adUnitRenderer = bidReq && bidReq.renderer;
 
-  if (adUnitRenderer && adUnitRenderer.url) {
-    bidObject.renderer = Renderer.install({ url: adUnitRenderer.url });
-    bidObject.renderer.setRender(adUnitRenderer.render);
+  // a publisher can also define a renderer for a mediaType
+  const bidObjectMediaType = bidObject.mediaType;
+  const bidMediaType = bidReq &&
+        bidReq.mediaTypes &&
+        bidReq.mediaTypes[bidObjectMediaType];
+
+  var mediaTypeRenderer = bidMediaType && bidMediaType.renderer;
+
+  var renderer = null;
+
+  // the renderer for the mediaType takes precendence
+  if (mediaTypeRenderer && mediaTypeRenderer.url && mediaTypeRenderer.render && !(mediaTypeRenderer.backupOnly === true && bid.renderer)) {
+    renderer = mediaTypeRenderer;
+  } else if (adUnitRenderer && adUnitRenderer.url && adUnitRenderer.render && !(adUnitRenderer.backupOnly === true && bid.renderer)) {
+    renderer = adUnitRenderer;
+  }
+
+  if (renderer) {
+    bidObject.renderer = Renderer.install({ url: renderer.url });
+    bidObject.renderer.setRender(renderer.render);
   }
 
   // Use the config value 'mediaTypeGranularity' if it has been defined for mediaType, else use 'customPriceBucket'
@@ -599,6 +627,16 @@ export const getPriceByGranularity = (granularity) => {
   }
 }
 
+/**
+ * This function returns a function to get first advertiser domain from bid response meta
+ * @returns {function}
+ */
+export const getAdvertiserDomain = () => {
+  return (bid) => {
+    return (bid.meta && bid.meta.advertiserDomains && bid.meta.advertiserDomains.length > 0) ? bid.meta.advertiserDomains[0] : '';
+  }
+}
+
 /**
  * @param {string} mediaType
  * @param {string} bidderCode
@@ -635,6 +673,7 @@ export function getStandardBidderSettings(mediaType, bidderCode, bidReq) {
       createKeyVal(TARGETING_KEYS.DEAL, 'dealId'),
       createKeyVal(TARGETING_KEYS.SOURCE, 'source'),
       createKeyVal(TARGETING_KEYS.FORMAT, 'mediaType'),
+      createKeyVal(TARGETING_KEYS.ADOMAIN, getAdvertiserDomain()),
     ]
   }
 
diff --git a/src/auctionManager.js b/src/auctionManager.js
index 3d4bd0afe99..bbafd7426d5 100644
--- a/src/auctionManager.js
+++ b/src/auctionManager.js
@@ -9,11 +9,14 @@
  *
  * @property {function(): Array} getBidsRequested - returns consolidated bid requests
  * @property {function(): Array} getBidsReceived - returns consolidated bid received
+ * @property {function(): Array} getAllBidsForAdUnitCode - returns consolidated bid received for a given adUnit
  * @property {function(): Array} getAdUnits - returns consolidated adUnits
  * @property {function(): Array} getAdUnitCodes - returns consolidated adUnitCodes
  * @property {function(): Object} createAuction - creates auction instance and stores it for future reference
  * @property {function(): Object} findBidByAdId - find bid received by adId. This function will be called by $$PREBID_GLOBAL$$.renderAd
  * @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
  */
 
 import { uniques, flatten, logWarn } from './utils.js';
@@ -66,6 +69,13 @@ export function newAuctionManager() {
       .filter(bid => bid);
   };
 
+  auctionManager.getAllBidsForAdUnitCode = function(adUnitCode) {
+    return _auctions.map((auction) => {
+      return auction.getBidsReceived();
+    }).reduce(flatten, [])
+      .filter(bid => bid && bid.adUnitCode === adUnitCode)
+  };
+
   auctionManager.getAdUnits = function() {
     return _auctions.map(auction => auction.getAdUnits())
       .reduce(flatten, []);
@@ -105,6 +115,10 @@ export function newAuctionManager() {
     return _auctions.length && _auctions[_auctions.length - 1].getAuctionId()
   };
 
+  auctionManager.clearAllAuctions = function() {
+    _auctions.length = 0;
+  }
+
   function _addAuction(auction) {
     _auctions.push(auction);
   }
diff --git a/src/config.js b/src/config.js
index 298f59d181b..4a9fed2c356 100644
--- a/src/config.js
+++ b/src/config.js
@@ -29,6 +29,8 @@ 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_TIMEOUTBUFFER = 400;
 export const RANDOM = 'random';
 const FIXED = 'fixed';
@@ -197,6 +199,25 @@ export function newConfig() {
       set disableAjaxTimeout(val) {
         this._disableAjaxTimeout = val;
       },
+
+      // default max nested iframes for referer detection
+      _maxNestedIframes: DEFAULT_MAX_NESTED_IFRAMES,
+      get maxNestedIframes() {
+        return this._maxNestedIframes;
+      },
+      set maxNestedIframes(val) {
+        this._maxNestedIframes = val;
+      },
+
+      _auctionOptions: {},
+      get auctionOptions() {
+        return this._auctionOptions;
+      },
+      set auctionOptions(val) {
+        if (validateauctionOptions(val)) {
+          this._auctionOptions = val;
+        }
+      },
     };
 
     if (config) {
@@ -235,6 +256,35 @@ export function newConfig() {
       }
       return true;
     }
+
+    function validateauctionOptions(val) {
+      if (!utils.isPlainObject(val)) {
+        utils.logWarn('Auction Options must be an object')
+        return false
+      }
+
+      for (let k of Object.keys(val)) {
+        if (k !== 'secondaryBidders' && k !== 'suppressStaleRender') {
+          utils.logWarn(`Auction Options given an incorrect param: ${k}`)
+          return false
+        }
+        if (k === 'secondaryBidders') {
+          if (!utils.isArray(val[k])) {
+            utils.logWarn(`Auction Options ${k} must be of type Array`);
+            return false
+          } else if (!val[k].every(utils.isStr)) {
+            utils.logWarn(`Auction Options ${k} must be only string`);
+            return false
+          }
+        } else if (k === 'suppressStaleRender') {
+          if (!utils.isBoolean(val[k])) {
+            utils.logWarn(`Auction Options ${k} must be of type boolean`);
+            return false;
+          }
+        }
+      }
+      return true;
+    }
   }
 
   /**
@@ -288,6 +338,119 @@ export function newConfig() {
     return bidderConfig;
   }
 
+  /**
+   * Returns backwards compatible FPD data for modules
+   */
+  function getLegacyFpd(obj) {
+    if (typeof obj !== 'object') return;
+
+    let duplicate = {};
+
+    Object.keys(obj).forEach((type) => {
+      let prop = (type === 'site') ? 'context' : type;
+      duplicate[prop] = (prop === 'context' || prop === 'user') ? Object.keys(obj[type]).filter(key => key !== 'data').reduce((result, key) => {
+        if (key === 'ext') {
+          utils.mergeDeep(result, obj[type][key]);
+        } else {
+          utils.mergeDeep(result, {[key]: obj[type][key]});
+        }
+
+        return result;
+      }, {}) : obj[type];
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Returns backwards compatible FPD data for modules
+   */
+  function getLegacyImpFpd(obj) {
+    if (typeof obj !== 'object') return;
+
+    let duplicate = {};
+
+    if (utils.deepAccess(obj, 'ext.data')) {
+      Object.keys(obj.ext.data).forEach((key) => {
+        if (key === 'pbadslot') {
+          utils.mergeDeep(duplicate, {context: {pbAdSlot: obj.ext.data[key]}});
+        } else if (key === 'adserver') {
+          utils.mergeDeep(duplicate, {context: {adServer: obj.ext.data[key]}});
+        } else {
+          utils.mergeDeep(duplicate, {context: {data: {[key]: obj.ext.data[key]}}});
+        }
+      });
+    }
+
+    return duplicate;
+  }
+
+  /**
+   * Copy FPD over to OpenRTB standard format in config
+   */
+  function convertFpd(opt) {
+    let duplicate = {};
+
+    Object.keys(opt).forEach((type) => {
+      let prop = (type === 'context') ? 'site' : type;
+      duplicate[prop] = (prop === 'site' || prop === 'user') ? Object.keys(opt[type]).reduce((result, key) => {
+        if (key === 'data') {
+          utils.mergeDeep(result, {ext: {data: opt[type][key]}});
+        } else {
+          utils.mergeDeep(result, {[key]: opt[type][key]});
+        }
+
+        return result;
+      }, {}) : opt[type];
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Copy Impression FPD over to OpenRTB standard format in config
+   * Only accepts bid level context.data values with pbAdSlot and adServer exceptions
+   */
+  function convertImpFpd(opt) {
+    let duplicate = {};
+
+    Object.keys(opt).filter(prop => prop === 'context').forEach((type) => {
+      Object.keys(opt[type]).forEach((key) => {
+        if (key === 'data') {
+          utils.mergeDeep(duplicate, {ext: {data: opt[type][key]}});
+        } else {
+          if (typeof opt[type][key] === 'object' && !Array.isArray(opt[type][key])) {
+            Object.keys(opt[type][key]).forEach(data => {
+              utils.mergeDeep(duplicate, {ext: {data: {[key.toLowerCase()]: {[data.toLowerCase()]: opt[type][key][data]}}}});
+            });
+          } else {
+            utils.mergeDeep(duplicate, {ext: {data: {[key.toLowerCase()]: opt[type][key]}}});
+          }
+        }
+      });
+    });
+
+    return duplicate;
+  }
+
+  /**
+   * Copy FPD over to OpenRTB standard format in each adunit
+   */
+  function convertAdUnitFpd(arr) {
+    let convert = [];
+
+    arr.forEach((adunit) => {
+      if (adunit.fpd) {
+        (adunit['ortb2Imp']) ? utils.mergeDeep(adunit['ortb2Imp'], convertImpFpd(adunit.fpd)) : adunit['ortb2Imp'] = convertImpFpd(adunit.fpd);
+        convert.push((({ fpd, ...duplicate }) => duplicate)(adunit));
+      } else {
+        convert.push(adunit);
+      }
+    });
+
+    return convert;
+  }
+
   /*
    * Sets configuration given an object containing key-value pairs and calls
    * listeners that were added by the `subscribe` function
@@ -302,13 +465,14 @@ export function newConfig() {
     let topicalConfig = {};
 
     topics.forEach(topic => {
-      let option = options[topic];
+      let prop = (topic === 'fpd') ? 'ortb2' : topic;
+      let option = (topic === 'fpd') ? convertFpd(options[topic]) : options[topic];
 
-      if (utils.isPlainObject(defaults[topic]) && utils.isPlainObject(option)) {
-        option = Object.assign({}, defaults[topic], option);
+      if (utils.isPlainObject(defaults[prop]) && utils.isPlainObject(option)) {
+        option = Object.assign({}, defaults[prop], option);
       }
 
-      topicalConfig[topic] = config[topic] = option;
+      topicalConfig[prop] = config[prop] = option;
     });
 
     callSubscribers(topicalConfig);
@@ -401,11 +565,13 @@ export function newConfig() {
           bidderConfig[bidder] = {};
         }
         Object.keys(config.config).forEach(topic => {
-          let option = config.config[topic];
+          let prop = (topic === 'fpd') ? 'ortb2' : topic;
+          let option = (topic === 'fpd') ? convertFpd(config.config[topic]) : config.config[topic];
+
           if (utils.isPlainObject(option)) {
-            bidderConfig[bidder][topic] = Object.assign({}, bidderConfig[bidder][topic] || {}, option);
+            bidderConfig[bidder][prop] = Object.assign({}, bidderConfig[bidder][prop] || {}, option);
           } else {
-            bidderConfig[bidder][topic] = option;
+            bidderConfig[bidder][prop] = option;
           }
         });
       });
@@ -433,7 +599,7 @@ export function newConfig() {
     try {
       return fn();
     } finally {
-      currBidder = null;
+      resetBidder();
     }
   }
   function callbackWithBidder(bidder) {
@@ -452,10 +618,15 @@ export function newConfig() {
     return currBidder;
   }
 
+  function resetBidder() {
+    currBidder = null;
+  }
+
   resetConfig();
 
   return {
     getCurrentBidder,
+    resetBidder,
     getConfig,
     setConfig,
     setDefaults,
@@ -463,7 +634,10 @@ export function newConfig() {
     runWithBidder,
     callbackWithBidder,
     setBidderConfig,
-    getBidderConfig
+    getBidderConfig,
+    convertAdUnitFpd,
+    getLegacyFpd,
+    getLegacyImpFpd
   };
 }
 
diff --git a/src/constants.json b/src/constants.json
index bb69cf3564e..383638a8bd9 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -36,10 +36,14 @@
     "BEFORE_REQUEST_BIDS": "beforeRequestBids",
     "REQUEST_BIDS": "requestBids",
     "ADD_AD_UNITS": "addAdUnits",
-    "AD_RENDER_FAILED" : "adRenderFailed"
+    "AD_RENDER_FAILED": "adRenderFailed",
+    "TCF2_ENFORCEMENT": "tcf2Enforcement",
+    "AUCTION_DEBUG": "auctionDebug",
+    "BID_VIEWABLE": "bidViewable",
+    "STALE_RENDER": "staleRender"
   },
   "AD_RENDER_FAILED_REASON" : {
-    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocuemnt",
+    "PREVENT_WRITING_ON_MAIN_DOCUMENT": "preventWritingOnMainDocument",
     "NO_AD": "noAd",
     "EXCEPTION": "exception",
     "CANNOT_FIND_AD": "cannotFindAd",
@@ -56,7 +60,8 @@
     "DENSE": "dense",
     "CUSTOM": "custom"
   },
-  "TARGETING_KEYS": {
+  "TARGETING_KEYS": "%%TG_KEYS%%",
+  "DEFAULT_TARGETING_KEYS": {
     "BIDDER": "hb_bidder",
     "AD_ID": "hb_adid",
     "PRICE_BUCKET": "hb_pb",
@@ -68,33 +73,15 @@
     "CACHE_ID": "hb_cache_id",
     "CACHE_HOST": "hb_cache_host"
   },
-  "NATIVE_KEYS": {
-    "title": "pwt_native_title",
-    "body": "pwt_native_body",
-    "body2": "pwt_native_body2",
-    "privacyLink": "pwt_native_privacy",
-    "sponsoredBy": "pwt_native_brand",
-    "image": "pwt_native_image",
-    "icon": "pwt_native_icon",
-    "clickUrl": "pwt_native_linkurl",
-    "displayUrl": "pwt_native_displayurl",
-    "cta": "pwt_native_cta",
-    "rating": "pwt_native_rating",
-    "address": "pwt_native_address",
-    "downloads": "pwt_native_downloads",
-    "likes": "pwt_native_likes",
-    "phone": "pwt_native_phone",
-    "price": "pwt_native_price",
-    "salePrice": "pwt_native_saleprice"
-  },
-  "S2S" : {
-    "SRC" : "s2s",
-    "DEFAULT_ENDPOINT" : "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
+  "NATIVE_KEYS": "%%TG_NATIVE_KEYS%%",
+  "S2S": {
+    "SRC": "s2s",
+    "DEFAULT_ENDPOINT": "https://prebid.adnxs.com/pbs/v1/openrtb2/auction",
     "SYNCED_BIDDERS_KEY": "pbjsSyncs"
   },
-  "BID_STATUS" : {
+  "BID_STATUS": {
     "BID_TARGETING_SET": "targetingSet",
     "RENDERED": "rendered",
     "BID_REJECTED": "bidRejected"
   }
-}
+}
\ No newline at end of file
diff --git a/src/events.js b/src/events.js
index e7a11635476..8749ddf206b 100644
--- a/src/events.js
+++ b/src/events.js
@@ -44,7 +44,8 @@ module.exports = (function () {
     eventsFired.push({
       eventType: eventString,
       args: eventPayload,
-      id: key
+      id: key,
+      elapsedTime: utils.getPerformanceNow(),
     });
 
     /** Push each specific callback to the `callbacks` array.
diff --git a/src/native.js b/src/native.js
index e41d7740ffa..7596b38534d 100644
--- a/src/native.js
+++ b/src/native.js
@@ -77,18 +77,6 @@ export function nativeBidIsValid(bid, bidRequests) {
     return false;
   }
 
-  if (deepAccess(bid, 'native.image')) {
-    if (!deepAccess(bid, 'native.image.height') || !deepAccess(bid, 'native.image.width')) {
-      return false;
-    }
-  }
-
-  if (deepAccess(bid, 'native.icon')) {
-    if (!deepAccess(bid, 'native.icon.height') || !deepAccess(bid, 'native.icon.width')) {
-      return false;
-    }
-  }
-
   const requestedAssets = bidRequest.nativeParams;
   if (!requestedAssets) {
     return true;
@@ -154,21 +142,48 @@ export function fireNativeTrackers(message, adObject) {
 export function getNativeTargeting(bid, bidReq) {
   let keyValues = {};
 
-  Object.keys(bid['native']).forEach(asset => {
-    const key = CONSTANTS.NATIVE_KEYS[asset];
-    let value = getAssetValue(bid['native'][asset]);
+  if (deepAccess(bidReq, 'nativeParams.rendererUrl')) {
+    bid['native']['rendererUrl'] = getAssetValue(bidReq.nativeParams['rendererUrl']);
+  } else if (deepAccess(bidReq, 'nativeParams.adTemplate')) {
+    bid['native']['adTemplate'] = getAssetValue(bidReq.nativeParams['adTemplate']);
+  }
+
+  const globalSendTargetingKeys = deepAccess(
+    bidReq,
+    `nativeParams.sendTargetingKeys`
+  ) !== false;
+
+  const nativeKeys = getNativeKeys(bidReq);
 
-    const sendPlaceholder = deepAccess(
-      bidReq,
-      `mediaTypes.native.${asset}.sendId`
-    );
+  const flatBidNativeKeys = { ...bid.native, ...bid.native.ext };
+  delete flatBidNativeKeys.ext;
+
+  Object.keys(flatBidNativeKeys).forEach(asset => {
+    const key = nativeKeys[asset];
+    let value = getAssetValue(bid.native[asset]) || getAssetValue(deepAccess(bid, `native.ext.${asset}`));
+
+    if (asset === 'adTemplate' || !key || !value) {
+      return;
+    }
+
+    let sendPlaceholder = deepAccess(bidReq, `nativeParams.${asset}.sendId`);
+    if (typeof sendPlaceholder !== 'boolean') {
+      sendPlaceholder = deepAccess(bidReq, `nativeParams.ext.${asset}.sendId`);
+    }
 
     if (sendPlaceholder) {
       const placeholder = `${key}:${bid.adId}`;
       value = placeholder;
     }
 
-    if (key && value) {
+    let assetSendTargetingKeys = deepAccess(bidReq, `nativeParams.${asset}.sendTargetingKeys`)
+    if (typeof assetSendTargetingKeys !== 'boolean') {
+      assetSendTargetingKeys = deepAccess(bidReq, `nativeParams.ext.${asset}.sendTargetingKeys`);
+    }
+
+    const sendTargeting = typeof assetSendTargetingKeys === 'boolean' ? assetSendTargetingKeys : globalSendTargetingKeys;
+
+    if (sendTargeting) {
       keyValues[key] = value;
     }
   });
@@ -187,6 +202,12 @@ export function getAssetMessage(data, adObject) {
     assets: [],
   };
 
+  if (adObject.native.hasOwnProperty('adTemplate')) {
+    message.adTemplate = getAssetValue(adObject.native['adTemplate']);
+  } if (adObject.native.hasOwnProperty('rendererUrl')) {
+    message.rendererUrl = getAssetValue(adObject.native['rendererUrl']);
+  }
+
   data.assets.forEach(asset => {
     const key = getKeyByValue(CONSTANTS.NATIVE_KEYS, asset);
     const value = getAssetValue(adObject.native[key]);
@@ -197,6 +218,35 @@ export function getAssetMessage(data, adObject) {
   return message;
 }
 
+export function getAllAssetsMessage(data, adObject) {
+  const message = {
+    message: 'assetResponse',
+    adId: data.adId,
+    assets: []
+  };
+
+  Object.keys(adObject.native).forEach(function(key, index) {
+    if (key === 'adTemplate' && adObject.native[key]) {
+      message.adTemplate = getAssetValue(adObject.native[key]);
+    } else if (key === 'rendererUrl' && adObject.native[key]) {
+      message.rendererUrl = getAssetValue(adObject.native[key]);
+    } else if (key === 'ext') {
+      Object.keys(adObject.native[key]).forEach(extKey => {
+        if (adObject.native[key][extKey]) {
+          const value = getAssetValue(adObject.native[key][extKey]);
+          message.assets.push({ key: extKey, value });
+        }
+      })
+    } else if (adObject.native[key] && CONSTANTS.NATIVE_KEYS.hasOwnProperty(key)) {
+      const value = getAssetValue(adObject.native[key]);
+
+      message.assets.push({ key, value });
+    }
+  });
+
+  return message;
+}
+
 /**
  * Native assets can be a string or an object with a url prop. Returns the value
  * appropriate for sending in adserver targeting or placeholder replacement.
@@ -208,3 +258,18 @@ function getAssetValue(value) {
 
   return value;
 }
+
+function getNativeKeys(bidReq) {
+  const extraNativeKeys = {}
+
+  if (deepAccess(bidReq, 'nativeParams.ext')) {
+    Object.keys(bidReq.nativeParams.ext).forEach(extKey => {
+      extraNativeKeys[extKey] = `hb_native_${extKey}`;
+    })
+  }
+
+  return {
+    ...CONSTANTS.NATIVE_KEYS,
+    ...extraNativeKeys
+  }
+}
diff --git a/src/prebid.js b/src/prebid.js
index 1710849ba92..f58c97ec581 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -1,17 +1,17 @@
 /** @module pbjs */
 
 import { getGlobal } from './prebidGlobal.js';
-import { flatten, uniques, isGptPubadsDefined, adUnitsFilter, isArrayOfNums } from './utils.js';
+import { adUnitsFilter, flatten, getHighestCpm, isArrayOfNums, isGptPubadsDefined, uniques } from './utils.js';
 import { listenMessagesFromCreative } from './secureCreatives.js';
 import { userSync } from './userSync.js';
 import { config } from './config.js';
 import { auctionManager } from './auctionManager.js';
-import { targeting } from './targeting.js';
+import { filters, targeting } from './targeting.js';
 import { hook } from './hook.js';
 import { sessionLoader } from './debugging.js';
 import includes from 'core-js-pure/features/array/includes.js';
 import { adunitCounter } from './adUnits.js';
-import { isRendererRequired, executeRenderer } from './Renderer.js';
+import { executeRenderer, isRendererRequired } from './Renderer.js';
 import { createBid } from './bidfactory.js';
 import { storageCallbacks } from './storageManager.js';
 
@@ -23,7 +23,7 @@ const events = require('./events.js');
 const { triggerUserSyncs } = userSync;
 
 /* private variables */
-const { ADD_AD_UNITS, BID_WON, REQUEST_BIDS, SET_TARGETING, AD_RENDER_FAILED } = CONSTANTS.EVENTS;
+const { ADD_AD_UNITS, BID_WON, REQUEST_BIDS, SET_TARGETING, AD_RENDER_FAILED, 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 eventValidators = {
@@ -43,6 +43,9 @@ $$PREBID_GLOBAL$$.libLoaded = true;
 $$PREBID_GLOBAL$$.version = 'v$prebid.version$';
 utils.logInfo('Prebid.js v$prebid.version$ loaded');
 
+// modules list generated from build
+$$PREBID_GLOBAL$$.installedModules = ['v$prebid.modulesList$'];
+
 // create adUnit array
 $$PREBID_GLOBAL$$.adUnits = $$PREBID_GLOBAL$$.adUnits || [];
 
@@ -83,50 +86,58 @@ function validateSizes(sizes, targLength) {
 }
 
 function validateBannerMediaType(adUnit) {
-  const banner = adUnit.mediaTypes.banner;
+  const validatedAdUnit = utils.deepClone(adUnit);
+  const banner = validatedAdUnit.mediaTypes.banner;
   const bannerSizes = validateSizes(banner.sizes);
   if (bannerSizes.length > 0) {
     banner.sizes = bannerSizes;
     // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.banner.sizes
-    adUnit.sizes = bannerSizes;
+    validatedAdUnit.sizes = bannerSizes;
   } else {
     utils.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 adUnit.mediaTypes.banner
+    delete validatedAdUnit.mediaTypes.banner
   }
+  return validatedAdUnit;
 }
 
 function validateVideoMediaType(adUnit) {
-  const video = adUnit.mediaTypes.video;
-  let tarPlayerSizeLen = (typeof video.playerSize[0] === 'number') ? 2 : 1;
-
-  const videoSizes = validateSizes(video.playerSize, tarPlayerSizeLen);
-  if (videoSizes.length > 0) {
-    if (tarPlayerSizeLen === 2) {
-      utils.logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
+  const validatedAdUnit = utils.deepClone(adUnit);
+  const video = validatedAdUnit.mediaTypes.video;
+  if (video.playerSize) {
+    let tarPlayerSizeLen = (typeof video.playerSize[0] === 'number') ? 2 : 1;
+
+    const videoSizes = validateSizes(video.playerSize, tarPlayerSizeLen);
+    if (videoSizes.length > 0) {
+      if (tarPlayerSizeLen === 2) {
+        utils.logInfo('Transforming video.playerSize from [640,480] to [[640,480]] so it\'s in the proper format.');
+      }
+      video.playerSize = videoSizes;
+      // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.video.playerSize
+      validatedAdUnit.sizes = videoSizes;
+    } else {
+      utils.logError('Detected incorrect configuration of mediaTypes.video.playerSize.  Please specify only one set of dimensions in a format like: [[640, 480]]. Removing invalid mediaTypes.video.playerSize property from request.');
+      delete validatedAdUnit.mediaTypes.video.playerSize;
     }
-    video.playerSize = videoSizes;
-    // Deprecation Warning: This property will be deprecated in next release in favor of adUnit.mediaTypes.video.playerSize
-    adUnit.sizes = videoSizes;
-  } else {
-    utils.logError('Detected incorrect configuration of mediaTypes.video.playerSize.  Please specify only one set of dimensions in a format like: [[640, 480]]. Removing invalid mediaTypes.video.playerSize property from request.');
-    delete adUnit.mediaTypes.video.playerSize;
   }
+  return validatedAdUnit;
 }
 
 function validateNativeMediaType(adUnit) {
-  const native = adUnit.mediaTypes.native;
+  const validatedAdUnit = utils.deepClone(adUnit);
+  const native = validatedAdUnit.mediaTypes.native;
   if (native.image && native.image.sizes && !Array.isArray(native.image.sizes)) {
     utils.logError('Please use an array of sizes for native.image.sizes field.  Removing invalid mediaTypes.native.image.sizes property from request.');
-    delete adUnit.mediaTypes.native.image.sizes;
+    delete validatedAdUnit.mediaTypes.native.image.sizes;
   }
   if (native.image && native.image.aspect_ratios && !Array.isArray(native.image.aspect_ratios)) {
     utils.logError('Please use an array of sizes for native.image.aspect_ratios field.  Removing invalid mediaTypes.native.image.aspect_ratios property from request.');
-    delete adUnit.mediaTypes.native.image.aspect_ratios;
+    delete validatedAdUnit.mediaTypes.native.image.aspect_ratios;
   }
   if (native.icon && native.icon.sizes && !Array.isArray(native.icon.sizes)) {
     utils.logError('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.');
-    delete adUnit.mediaTypes.native.icon.sizes;
+    delete validatedAdUnit.mediaTypes.native.icon.sizes;
   }
+  return validatedAdUnit;
 }
 
 export const adUnitSetupChecks = {
@@ -137,29 +148,41 @@ export const adUnitSetupChecks = {
 };
 
 export const checkAdUnitSetup = hook('sync', function (adUnits) {
-  return adUnits.filter(adUnit => {
+  const validatedAdUnits = [];
+
+  adUnits.forEach(adUnit => {
     const mediaTypes = adUnit.mediaTypes;
+    const bids = adUnit.bids;
+    let validatedBanner, validatedVideo, validatedNative;
+
+    if (!bids || !utils.isArray(bids)) {
+      utils.logError(`Detected adUnit.code '${adUnit.code}' did not have 'adUnit.bids' defined or 'adUnit.bids' is not an array. Removing adUnit from auction.`);
+      return;
+    }
+
     if (!mediaTypes || Object.keys(mediaTypes).length === 0) {
       utils.logError(`Detected adUnit.code '${adUnit.code}' did not have a 'mediaTypes' object defined.  This is a required field for the auction, so this adUnit has been removed.`);
-      return false;
+      return;
     }
 
     if (mediaTypes.banner) {
-      validateBannerMediaType(adUnit);
+      validatedBanner = validateBannerMediaType(adUnit);
     }
 
     if (mediaTypes.video) {
-      const video = mediaTypes.video;
-      if (video.playerSize) {
-        validateVideoMediaType(adUnit);
-      }
+      validatedVideo = validatedBanner ? validateVideoMediaType(validatedBanner) : validateVideoMediaType(adUnit);
     }
 
     if (mediaTypes.native) {
-      validateNativeMediaType(adUnit);
+      validatedNative = validatedVideo ? validateNativeMediaType(validatedVideo) : validatedBanner ? validateNativeMediaType(validatedBanner) : validateNativeMediaType(adUnit);
     }
-    return true;
+
+    const validatedAdUnit = Object.assign({}, validatedBanner, validatedVideo, validatedNative);
+
+    validatedAdUnits.push(validatedAdUnit);
   });
+
+  return validatedAdUnits;
 }, 'checkAdUnitSetup');
 
 /// ///////////////////////////////
@@ -186,13 +209,31 @@ $$PREBID_GLOBAL$$.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
+ * @alias module:pbjs.getHighestUnusedBidResponseForAdUnitCode
+ * @returns {Object}  returnObj return bid
+ */
+$$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode = function (adunitCode) {
+  if (adunitCode) {
+    const bid = auctionManager.getAllBidsForAdUnitCode(adunitCode)
+      .filter(filters.isUnusedBid)
+      .filter(filters.isBidNotExpired)
+
+    return bid.length ? bid.reduce(getHighestCpm) : {}
+  } else {
+    utils.logMessage('Need to call getHighestUnusedBidResponseForAdUnitCode with 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
  * @alias module:pbjs.getAdserverTargetingForAdUnitCode
  * @returns {Object}  returnObj return bids
  */
-$$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function(adUnitCode) {
+$$PREBID_GLOBAL$$.getAdserverTargetingForAdUnitCode = function (adUnitCode) {
   return $$PREBID_GLOBAL$$.getAdserverTargeting(adUnitCode)[adUnitCode];
 };
 
@@ -238,6 +279,18 @@ $$PREBID_GLOBAL$$.getNoBids = function () {
   return getBids('getNoBids');
 };
 
+/**
+ * This function returns the bids requests involved in an auction but not bid on or the specified adUnitCode
+ * @param  {string} adUnitCode adUnitCode
+ * @alias module:pbjs.getNoBidsForAdUnitCode
+ * @return {Object}           bidResponse object
+ */
+
+$$PREBID_GLOBAL$$.getNoBidsForAdUnitCode = function (adUnitCode) {
+  const bids = auctionManager.getNoBids().filter(bid => bid.adUnitCode === adUnitCode);
+  return { bids };
+};
+
 /**
  * This function returns the bid responses at the given moment.
  * @alias module:pbjs.getBidResponses
@@ -300,7 +353,7 @@ $$PREBID_GLOBAL$$.setTargetingForGPTAsync = function (adUnit, customSlotMatching
  * @param  {(string|string[])} adUnitCode adUnitCode or array of adUnitCodes
  * @alias module:pbjs.setTargetingForAst
  */
-$$PREBID_GLOBAL$$.setTargetingForAst = function(adUnitCodes) {
+$$PREBID_GLOBAL$$.setTargetingForAst = function (adUnitCodes) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.setTargetingForAn', arguments);
   if (!targeting.isApntagDefined()) {
     utils.logError('window.apntag is not defined on the page');
@@ -329,7 +382,7 @@ function emitAdRenderFail({ reason, message, bid, id }) {
  * @param  {string} id bid id to locate the ad
  * @alias module:pbjs.renderAd
  */
-$$PREBID_GLOBAL$$.renderAd = function (doc, id) {
+$$PREBID_GLOBAL$$.renderAd = function (doc, id, options) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.renderAd', arguments);
   utils.logMessage('Calling renderAd with adId :' + id);
 
@@ -337,55 +390,75 @@ $$PREBID_GLOBAL$$.renderAd = function (doc, id) {
     try {
       // lookup ad by ad Id
       const bid = auctionManager.findBidByAdId(id);
+
       if (bid) {
-        // replace macros according to openRTB with price paid = bid.cpm
-        bid.ad = utils.replaceAuctionPrice(bid.ad, bid.cpm);
-        bid.adUrl = utils.replaceAuctionPrice(bid.adUrl, bid.cpm);
-        // save winning bids
-        auctionManager.addWinningBid(bid);
-
-        // emit 'bid won' event here
-        events.emit(BID_WON, bid);
-
-        const { height, width, ad, mediaType, adUrl, renderer } = bid;
-
-        const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
-        utils.insertElement(creativeComment, doc, 'body');
-
-        if (isRendererRequired(renderer)) {
-          executeRenderer(renderer, bid);
-        } else if ((doc === document && !utils.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) {
-          // will check if browser is firefox and below version 67, if so execute special doc.open()
-          // for details see: https://github.com/prebid/Prebid.js/pull/3524
-          // TODO remove this browser specific code at later date (when Firefox < 67 usage is mostly gone)
-          if (navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('firefox/') > -1) {
-            const firefoxVerRegx = /firefox\/([\d\.]+)/;
-            let firefoxVer = navigator.userAgent.toLowerCase().match(firefoxVerRegx)[1]; // grabs the text in the 1st matching group
-            if (firefoxVer && parseInt(firefoxVer, 10) < 67) {
-              doc.open('text/html', 'replace');
+        let shouldRender = true;
+        if (bid && bid.status === CONSTANTS.BID_STATUS.RENDERED) {
+          utils.logWarn(`Ad id ${bid.adId} has been rendered before`);
+          events.emit(STALE_RENDER, bid);
+          if (utils.deepAccess(config.getConfig('auctionOptions'), 'suppressStaleRender')) {
+            shouldRender = false;
+          }
+        }
+
+        if (shouldRender) {
+          // replace macros according to openRTB with price paid = bid.cpm
+          bid.ad = utils.replaceAuctionPrice(bid.ad, bid.cpm);
+          bid.adUrl = utils.replaceAuctionPrice(bid.adUrl, bid.cpm);
+
+          // replacing clickthrough if submitted
+          if (options && options.clickThrough) {
+            const {clickThrough} = options;
+            bid.ad = utils.replaceClickThrough(bid.ad, clickThrough);
+            bid.adUrl = utils.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;
+
+          const creativeComment = document.createComment(`Creative ${bid.creativeId} served by ${bid.bidder} Prebid.js Header Bidding`);
+          utils.insertElement(creativeComment, doc, 'body');
+
+          if (isRendererRequired(renderer)) {
+            executeRenderer(renderer, bid);
+          } else if ((doc === document && !utils.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) {
+            // will check if browser is firefox and below version 67, if so execute special doc.open()
+            // for details see: https://github.com/prebid/Prebid.js/pull/3524
+            // TODO remove this browser specific code at later date (when Firefox < 67 usage is mostly gone)
+            if (navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('firefox/') > -1) {
+              const firefoxVerRegx = /firefox\/([\d\.]+)/;
+              let firefoxVer = navigator.userAgent.toLowerCase().match(firefoxVerRegx)[1]; // grabs the text in the 1st matching group
+              if (firefoxVer && parseInt(firefoxVer, 10) < 67) {
+                doc.open('text/html', 'replace');
+              }
             }
+            doc.write(ad);
+            doc.close();
+            setRenderSize(doc, width, height);
+            utils.callBurl(bid);
+          } else if (adUrl) {
+            const iframe = utils.createInvisibleIframe();
+            iframe.height = height;
+            iframe.width = width;
+            iframe.style.display = 'inline';
+            iframe.style.overflow = 'hidden';
+            iframe.src = adUrl;
+
+            utils.insertElement(iframe, doc, 'body');
+            setRenderSize(doc, width, height);
+            utils.callBurl(bid);
+          } else {
+            const message = `Error trying to write ad. No ad for bid response id: ${id}`;
+            emitAdRenderFail({reason: NO_AD, message, bid, id});
           }
-          doc.write(ad);
-          doc.close();
-          setRenderSize(doc, width, height);
-          utils.callBurl(bid);
-        } else if (adUrl) {
-          const iframe = utils.createInvisibleIframe();
-          iframe.height = height;
-          iframe.width = width;
-          iframe.style.display = 'inline';
-          iframe.style.overflow = 'hidden';
-          iframe.src = adUrl;
-
-          utils.insertElement(iframe, doc, 'body');
-          setRenderSize(doc, width, height);
-          utils.callBurl(bid);
-        } else {
-          const message = `Error trying to write ad. No ad for bid response id: ${id}`;
-          emitAdRenderFail({ reason: NO_AD, message, bid, id });
         }
       } else {
         const message = `Error trying to write ad. Cannot find ad by given id : ${id}`;
@@ -444,10 +517,24 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
 $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels, auctionId } = {}) {
   events.emit(REQUEST_BIDS);
   const cbTimeout = timeout || config.getConfig('bidderTimeout');
-  adUnits = adUnits || $$PREBID_GLOBAL$$.adUnits;
+  adUnits = (adUnits && config.convertAdUnitFpd(utils.isArray(adUnits) ? adUnits : [adUnits])) || $$PREBID_GLOBAL$$.adUnits;
 
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.requestBids', arguments);
 
+  let _s2sConfigs = [];
+  const s2sBidders = [];
+  config.getConfig('s2sConfig', config => {
+    if (config && config.s2sConfig) {
+      _s2sConfigs = Array.isArray(config.s2sConfig) ? config.s2sConfig : [config.s2sConfig];
+    }
+  });
+
+  _s2sConfigs.forEach(s2sConfig => {
+    s2sBidders.push(...s2sConfig.bidders);
+  });
+
+  adUnits = checkAdUnitSetup(adUnits);
+
   if (adUnitCodes && adUnitCodes.length) {
     // if specific adUnitCodes supplied filter adUnits for those codes
     adUnits = adUnits.filter(unit => includes(adUnitCodes, unit.code));
@@ -456,8 +543,6 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
     adUnitCodes = adUnits && adUnits.map(unit => unit.code);
   }
 
-  adUnits = checkAdUnitSetup(adUnits);
-
   /*
    * for a given adunit which supports a set of mediaTypes
    * and a given bidder which supports a set of mediaTypes
@@ -466,17 +551,13 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
    */
   adUnits.forEach(adUnit => {
     // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
-    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || {'banner': 'banner'});
+    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || { 'banner': 'banner' });
 
     // get the bidder's mediaTypes
     const allBidders = adUnit.bids.map(bid => bid.bidder);
     const bidderRegistry = adapterManager.bidderRegistry;
 
-    const s2sConfig = config.getConfig('s2sConfig');
-    const s2sBidders = s2sConfig && s2sConfig.bidders;
-    const bidders = (s2sBidders) ? allBidders.filter(bidder => {
-      return !includes(s2sBidders, bidder);
-    }) : allBidders;
+    const bidders = (s2sBidders) ? allBidders.filter(bidder => !includes(s2sBidders, bidder)) : allBidders;
 
     adUnit.transactionId = utils.generateUUID();
 
@@ -512,7 +593,7 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
     return;
   }
 
-  const auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout, labels, auctionId});
+  const auction = auctionManager.createAuction({ adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout, labels, auctionId });
 
   let adUnitsLen = adUnits.length;
   if (adUnitsLen > 15) {
@@ -523,9 +604,11 @@ $$PREBID_GLOBAL$$.requestBids = hook('async', function ({ bidsBackHandler, timeo
   auction.callBids();
 });
 
-export function executeStorageCallbacks(fn, reqBidsConfigObj) {
+export function executeCallbacks(fn, reqBidsConfigObj) {
   runAll(storageCallbacks);
+  runAll(enableAnalyticsCallbacks);
   fn.call(this, reqBidsConfigObj);
+
   function runAll(queue) {
     var queued;
     while ((queued = queue.shift())) {
@@ -535,7 +618,7 @@ export function executeStorageCallbacks(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
-$$PREBID_GLOBAL$$.requestBids.before(executeStorageCallbacks, 49);
+$$PREBID_GLOBAL$$.requestBids.before(executeCallbacks, 49);
 
 /**
  *
@@ -545,11 +628,7 @@ $$PREBID_GLOBAL$$.requestBids.before(executeStorageCallbacks, 49);
  */
 $$PREBID_GLOBAL$$.addAdUnits = function (adUnitArr) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.addAdUnits', arguments);
-  if (utils.isArray(adUnitArr)) {
-    $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, adUnitArr);
-  } else if (typeof adUnitArr === 'object') {
-    $$PREBID_GLOBAL$$.adUnits.push(adUnitArr);
-  }
+  $$PREBID_GLOBAL$$.adUnits.push.apply($$PREBID_GLOBAL$$.adUnits, config.convertAdUnitFpd(utils.isArray(adUnitArr) ? adUnitArr : [adUnitArr]));
   // emit event
   events.emit(ADD_AD_UNITS);
 };
@@ -600,6 +679,16 @@ $$PREBID_GLOBAL$$.offEvent = function (event, handler, id) {
   events.off(event, handler, id);
 };
 
+/**
+ * Return a copy of all events emitted
+ *
+ * @alias module:pbjs.getEvents
+ */
+$$PREBID_GLOBAL$$.getEvents = function () {
+  utils.logInfo('Invoking $$PREBID_GLOBAL$$.getEvents');
+  return events.getEvents();
+};
+
 /*
  * Wrapper to register bidderAdapter externally (adapterManager.registerBidAdapter())
  * @param  {Function} bidderAdaptor [description]
@@ -654,22 +743,30 @@ $$PREBID_GLOBAL$$.createBid = function (statusCode) {
  * @param {Object} config.options The options for this particular analytics adapter.  This will likely vary between adapters.
  * @alias module:pbjs.enableAnalytics
  */
-$$PREBID_GLOBAL$$.enableAnalytics = function (config) {
+
+// Stores 'enableAnalytics' callbacks for later execution.
+const enableAnalyticsCallbacks = [];
+
+const enableAnalyticsCb = hook('async', function (config) {
   if (config && !utils.isEmpty(config)) {
     utils.logInfo('Invoking $$PREBID_GLOBAL$$.enableAnalytics for: ', config);
     adapterManager.enableAnalytics(config);
   } else {
     utils.logError('$$PREBID_GLOBAL$$.enableAnalytics should be called with option {}');
   }
+}, 'enableAnalyticsCb');
+
+$$PREBID_GLOBAL$$.enableAnalytics = function (config) {
+  enableAnalyticsCallbacks.push(enableAnalyticsCb.bind(this, config));
 };
 
 /**
  * @alias module:pbjs.aliasBidder
  */
-$$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias) {
+$$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias, options) {
   utils.logInfo('Invoking $$PREBID_GLOBAL$$.aliasBidder', arguments);
   if (bidderCode && alias) {
-    adapterManager.aliasBidAdapter(bidderCode, alias);
+    adapterManager.aliasBidAdapter(bidderCode, alias, options);
   } else {
     utils.logError('bidderCode and alias must be passed as arguments', '$$PREBID_GLOBAL$$.aliasBidder');
   }
@@ -708,12 +805,12 @@ $$PREBID_GLOBAL$$.aliasBidder = function (bidderCode, alias) {
  * @property {string} adserverTargeting.hb_adid The ad ID of the creative, as understood by the ad server.
  * @property {string} adserverTargeting.hb_pb The price paid to show the creative, as logged in the ad server.
  * @property {string} adserverTargeting.hb_bidder The winning bidder whose ad creative will be served by the ad server.
-*/
+ */
 
 /**
  * Get all of the bids that have been rendered.  Useful for [troubleshooting your integration](http://prebid.org/dev-docs/prebid-troubleshooting-guide.html).
  * @return {Array} A list of bids that have been rendered.
-*/
+ */
 $$PREBID_GLOBAL$$.getAllWinningBids = function () {
   return auctionManager.getAllWinningBids();
 };
@@ -745,7 +842,7 @@ $$PREBID_GLOBAL$$.getHighestCpmBids = function (adUnitCode) {
  * @property {string} adId The id representing the ad we want to mark
  *
  * @alias module:pbjs.markWinningBidAsUsed
-*/
+ */
 $$PREBID_GLOBAL$$.markWinningBidAsUsed = function (markBidRequest) {
   let bids = [];
 
@@ -757,7 +854,7 @@ $$PREBID_GLOBAL$$.markWinningBidAsUsed = function (markBidRequest) {
   } else if (markBidRequest.adId) {
     bids = auctionManager.getBidsReceived().filter(bid => bid.adId === markBidRequest.adId);
   } else {
-    utils.logWarn('Inproper usage of markWinningBidAsUsed. It\'ll need an adUnitCode and/or adId to function.');
+    utils.logWarn('Improper use of markWinningBidAsUsed. It needs an adUnitCode or an adId to function.');
   }
 
   if (bids.length > 0) {
@@ -843,7 +940,7 @@ $$PREBID_GLOBAL$$.que.push(() => listenMessagesFromCreative());
  *                            the Prebid script has been fully loaded.
  * @alias module:pbjs.cmd.push
  */
-$$PREBID_GLOBAL$$.cmd.push = function(command) {
+$$PREBID_GLOBAL$$.cmd.push = function (command) {
   if (typeof command === 'function') {
     try {
       command.call();
@@ -858,7 +955,7 @@ $$PREBID_GLOBAL$$.cmd.push = function(command) {
 $$PREBID_GLOBAL$$.que.push = $$PREBID_GLOBAL$$.cmd.push;
 
 function processQueue(queue) {
-  queue.forEach(function(cmd) {
+  queue.forEach(function (cmd) {
     if (typeof cmd.called === 'undefined') {
       try {
         cmd.call();
@@ -873,7 +970,7 @@ function processQueue(queue) {
 /**
  * @alias module:pbjs.processQueue
  */
-$$PREBID_GLOBAL$$.processQueue = function() {
+$$PREBID_GLOBAL$$.processQueue = function () {
   hook.ready();
   processQueue($$PREBID_GLOBAL$$.que);
   processQueue($$PREBID_GLOBAL$$.cmd);
diff --git a/src/refererDetection.js b/src/refererDetection.js
index 60198678666..56d1fa43f7b 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -3,160 +3,56 @@
  * The information that it tries to collect includes:
  * The detected top url in the nav bar,
  * Whether it was able to reach the top most window (if for example it was embedded in several iframes),
- * The number of iframes it was embedded in if applicable,
+ * The number of iframes it was embedded in if applicable (by default max ten iframes),
  * A list of the domains of each embedded window if applicable.
  * Canonical URL which refers to an HTML link element, with the attribute of rel="canonical", found in the  element of your webpage
  */
 
+import { config } from './config.js';
 import { logWarn } from './utils.js';
 
+/**
+ * @param {Window} win Window
+ * @returns {Function}
+ */
 export function detectReferer(win) {
-  /**
-   * Returns number of frames to reach top from current frame where prebid.js sits
-   * @returns {Array} levels
-   */
-  function getLevels() {
-    let levels = walkUpWindows();
-    let ancestors = getAncestorOrigins();
-
-    if (ancestors) {
-      for (let i = 0, l = ancestors.length; i < l; i++) {
-        levels[i].ancestor = ancestors[i];
-      }
-    }
-    return levels;
-  }
-
   /**
    * This function would return a read-only array of hostnames for all the parent frames.
    * win.location.ancestorOrigins is only supported in webkit browsers. For non-webkit browsers it will return undefined.
+   *
+   * @param {Window} win Window object
    * @returns {(undefined|Array)} Ancestor origins or undefined
    */
-  function getAncestorOrigins() {
+  function getAncestorOrigins(win) {
     try {
       if (!win.location.ancestorOrigins) {
         return;
       }
+
       return win.location.ancestorOrigins;
     } catch (e) {
       // Ignore error
     }
   }
 
-  /**
-   * This function would try to get referer and urls for all parent frames in case of win.location.ancestorOrigins undefined.
-   * @param {Array} levels
-   * @returns {Object} urls for all parent frames and top most detected referer url
-   */
-  function getPubUrlStack(levels) {
-    let stack = [];
-    let defUrl = null;
-    let frameLocation = null;
-    let prevFrame = null;
-    let prevRef = null;
-    let ancestor = null;
-    let detectedRefererUrl = null;
-
-    let i;
-    for (i = levels.length - 1; i >= 0; i--) {
-      try {
-        frameLocation = levels[i].location;
-      } catch (e) {
-        // Ignore error
-      }
-
-      if (frameLocation) {
-        stack.push(frameLocation);
-        if (!detectedRefererUrl) {
-          detectedRefererUrl = frameLocation;
-        }
-      } else if (i !== 0) {
-        prevFrame = levels[i - 1];
-        try {
-          prevRef = prevFrame.referrer;
-          ancestor = prevFrame.ancestor;
-        } catch (e) {
-          // Ignore error
-        }
-
-        if (prevRef) {
-          stack.push(prevRef);
-          if (!detectedRefererUrl) {
-            detectedRefererUrl = prevRef;
-          }
-        } else if (ancestor) {
-          stack.push(ancestor);
-          if (!detectedRefererUrl) {
-            detectedRefererUrl = ancestor;
-          }
-        } else {
-          stack.push(defUrl);
-        }
-      } else {
-        stack.push(defUrl);
-      }
-    }
-    return {
-      stack,
-      detectedRefererUrl
-    };
-  }
-
   /**
    * This function returns canonical URL which refers to an HTML link element, with the attribute of rel="canonical", found in the  element of your webpage
+   *
    * @param {Object} doc document
+   * @returns {string|null}
    */
   function getCanonicalUrl(doc) {
     try {
-      let element = doc.querySelector("link[rel='canonical']");
+      const element = doc.querySelector("link[rel='canonical']");
+
       if (element !== null) {
         return element.href;
       }
     } catch (e) {
+      // Ignore error
     }
-    return null;
-  }
 
-  /**
-   * Walk up to the top of the window to detect origin, number of iframes, ancestor origins and canonical url
-   */
-  function walkUpWindows() {
-    let acc = [];
-    let currentWindow;
-    do {
-      try {
-        currentWindow = currentWindow ? currentWindow.parent : win;
-        try {
-          let isTop = (currentWindow == win.top);
-          let refData = {
-            referrer: currentWindow.document.referrer || null,
-            location: currentWindow.location.href || null,
-            isTop
-          }
-          if (isTop) {
-            refData = Object.assign(refData, {
-              canonicalUrl: getCanonicalUrl(currentWindow.document)
-            })
-          }
-          acc.push(refData);
-        } catch (e) {
-          acc.push({
-            referrer: null,
-            location: null,
-            isTop: (currentWindow == win.top)
-          });
-          logWarn('Trying to access cross domain iframe. Continuing without referrer and location');
-        }
-      } catch (e) {
-        acc.push({
-          referrer: null,
-          location: null,
-          isTop: false
-        });
-        return acc;
-      }
-    } while (currentWindow != win.top);
-    return acc;
+    return null;
   }
 
   /**
@@ -170,31 +66,115 @@ export function detectReferer(win) {
    */
 
   /**
-   * Get referer info
+   * Walk up the windows to get the origin stack and best available referrer, canonical URL, etc.
+   *
    * @returns {refererInfo}
    */
   function refererInfo() {
-    try {
-      let levels = getLevels();
-      let numIframes = levels.length - 1;
-      let reachedTop = (levels[numIframes].location !== null ||
-        (numIframes > 0 && levels[numIframes - 1].referrer !== null));
-      let stackInfo = getPubUrlStack(levels);
-      let canonicalUrl;
-      if (levels[levels.length - 1].canonicalUrl) {
-        canonicalUrl = levels[levels.length - 1].canonicalUrl;
+    const stack = [];
+    const ancestors = getAncestorOrigins(win);
+    const maxNestedIframes = config.getConfig('maxNestedIframes');
+    let currentWindow;
+    let bestReferrer;
+    let bestCanonicalUrl;
+    let reachedTop = false;
+    let level = 0;
+    let valuesFromAmp = false;
+    let inAmpFrame = false;
+
+    do {
+      const previousWindow = currentWindow;
+      const wasInAmpFrame = inAmpFrame;
+      let currentLocation;
+      let crossOrigin = false;
+      let foundReferrer = null;
+
+      inAmpFrame = false;
+      currentWindow = currentWindow ? currentWindow.parent : win;
+
+      try {
+        currentLocation = currentWindow.location.href || null;
+      } catch (e) {
+        crossOrigin = true;
       }
 
-      return {
-        referer: stackInfo.detectedRefererUrl,
-        reachedTop,
-        numIframes,
-        stack: stackInfo.stack,
-        canonicalUrl
-      };
-    } catch (e) {
-      // Ignore error
-    }
+      if (crossOrigin) {
+        if (wasInAmpFrame) {
+          const context = previousWindow.context;
+
+          try {
+            foundReferrer = context.sourceUrl;
+            bestReferrer = foundReferrer;
+
+            valuesFromAmp = true;
+
+            if (currentWindow === win.top) {
+              reachedTop = true;
+            }
+
+            if (context.canonicalUrl) {
+              bestCanonicalUrl = context.canonicalUrl;
+            }
+          } catch (e) { /* Do nothing */ }
+        } else {
+          logWarn('Trying to access cross domain iframe. Continuing without referrer and location');
+
+          try {
+            const referrer = previousWindow.document.referrer;
+
+            if (referrer) {
+              foundReferrer = referrer;
+
+              if (currentWindow === win.top) {
+                reachedTop = true;
+              }
+            }
+          } catch (e) { /* Do nothing */ }
+
+          if (!foundReferrer && ancestors && ancestors[level - 1]) {
+            foundReferrer = ancestors[level - 1];
+          }
+
+          if (foundReferrer && !valuesFromAmp) {
+            bestReferrer = foundReferrer;
+          }
+        }
+      } else {
+        if (currentLocation) {
+          foundReferrer = currentLocation;
+          bestReferrer = foundReferrer;
+          valuesFromAmp = false;
+
+          if (currentWindow === win.top) {
+            reachedTop = true;
+
+            const canonicalUrl = getCanonicalUrl(currentWindow.document);
+
+            if (canonicalUrl) {
+              bestCanonicalUrl = canonicalUrl;
+            }
+          }
+        }
+
+        if (currentWindow.context && currentWindow.context.sourceUrl) {
+          inAmpFrame = true;
+        }
+      }
+
+      stack.push(foundReferrer);
+      level++;
+    } while (currentWindow !== win.top && level < maxNestedIframes);
+
+    stack.reverse();
+
+    return {
+      referer: bestReferrer || null,
+      reachedTop,
+      isAmp: valuesFromAmp,
+      numIframes: level - 1,
+      stack,
+      canonicalUrl: bestCanonicalUrl || null
+    };
   }
 
   return refererInfo;
diff --git a/src/secureCreatives.js b/src/secureCreatives.js
index 34de2be275c..a172ec62630 100644
--- a/src/secureCreatives.js
+++ b/src/secureCreatives.js
@@ -4,21 +4,23 @@
  */
 
 import events from './events.js';
-import { fireNativeTrackers, getAssetMessage } from './native.js';
-import { EVENTS } from './constants.json';
-import { logWarn, replaceAuctionPrice } from './utils.js';
+import { fireNativeTrackers, getAssetMessage, getAllAssetsMessage } from './native.js';
+import constants from './constants.json';
+import { logWarn, replaceAuctionPrice, deepAccess } from './utils.js';
 import { auctionManager } from './auctionManager.js';
 import find from 'core-js-pure/features/array/find.js';
 import { isRendererRequired, executeRenderer } from './Renderer.js';
 import includes from 'core-js-pure/features/array/includes.js';
+import { config } from './config.js';
 
-const BID_WON = EVENTS.BID_WON;
+const BID_WON = constants.EVENTS.BID_WON;
+const STALE_RENDER = constants.EVENTS.STALE_RENDER;
 
 export function listenMessagesFromCreative() {
   window.addEventListener('message', receiveMessage, false);
 }
 
-function receiveMessage(ev) {
+export function receiveMessage(ev) {
   var key = ev.message ? 'message' : 'data';
   var data = {};
   try {
@@ -33,6 +35,14 @@ function receiveMessage(ev) {
     });
 
     if (adObject && data.message === 'Prebid Request') {
+      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;
+        }
+      }
+
       _sendAdToCreative(adObject, ev);
 
       // save winning bids
@@ -51,6 +61,13 @@ function receiveMessage(ev) {
         const message = getAssetMessage(data, adObject);
         ev.source.postMessage(JSON.stringify(message), ev.origin);
         return;
+      } else if (data.action === 'allAssetRequest') {
+        const message = getAllAssetsMessage(data, adObject);
+        ev.source.postMessage(JSON.stringify(message), ev.origin);
+      } else if (data.action === 'resizeNativeHeight') {
+        adObject.height = data.height;
+        adObject.width = data.width;
+        resizeRemoteCreative(adObject);
       }
 
       const trackerType = fireNativeTrackers(data, adObject);
diff --git a/src/storageManager.js b/src/storageManager.js
index 0d88a8ccea1..66a0cf68cbf 100644
--- a/src/storageManager.js
+++ b/src/storageManager.js
@@ -1,4 +1,4 @@
-import { hook } from './hook.js';
+import {hook} from './hook.js';
 import * as utils from './utils.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
@@ -110,7 +110,12 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
         try {
           localStorage.setItem('prebid.cookieTest', '1');
           return localStorage.getItem('prebid.cookieTest') === '1';
-        } catch (error) {}
+        } catch (error) {
+        } finally {
+          try {
+            localStorage.removeItem('prebid.cookieTest');
+          } catch (error) {}
+        }
       }
       return false;
     }
@@ -154,7 +159,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const setDataInLocalStorage = function (key, value, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         window.localStorage.setItem(key, value);
       }
     }
@@ -174,7 +179,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const getDataFromLocalStorage = function (key, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         return window.localStorage.getItem(key);
       }
       return null;
@@ -194,7 +199,7 @@ export function newStorageManager({gvlid, moduleName, moduleType} = {}) {
    */
   const removeDataFromLocalStorage = function (key, done) {
     let cb = function (result) {
-      if (result && result.valid) {
+      if (result && result.valid && hasLocalStorage()) {
         window.localStorage.removeItem(key);
       }
     }
diff --git a/src/targeting.js b/src/targeting.js
index 45c098554a5..edf9521c251 100644
--- a/src/targeting.js
+++ b/src/targeting.js
@@ -4,7 +4,9 @@ import { NATIVE_TARGETING_KEYS } from './native.js';
 import { auctionManager } from './auctionManager.js';
 import { sizeSupported } from './sizeMapping.js';
 import { ADPOD } from './mediaTypes.js';
+import { hook } from './hook.js';
 import includes from 'core-js-pure/features/array/includes.js';
+import find from 'core-js-pure/features/array/find.js';
 
 const utils = require('./utils.js');
 var CONSTANTS = require('./constants.json');
@@ -19,7 +21,7 @@ export const TARGETING_KEYS = Object.keys(CONSTANTS.TARGETING_KEYS).map(
 );
 
 // return unexpired bids
-const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 + TTL_BUFFER) > timestamp();
+const isBidNotExpired = (bid) => (bid.responseTimestamp + bid.ttl * 1000 - TTL_BUFFER) > 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);
@@ -32,26 +34,31 @@ export let filters = {
 // 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 function getHighestCpmBidsFromBidPool(bidsReceived, highestCpmCallback, adUnitBidLimit = 0) {
-  const bids = [];
-  const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
-  // bucket by adUnitcode
-  let buckets = groupBy(bidsReceived, 'adUnitCode');
-  // 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)));
-    // if adUnitBidLimit is set, pass top N number bids
-    if (adUnitBidLimit > 0) {
-      bucketBids = dealPrioritization ? bucketBids(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
-      bids.push(...bucketBids.slice(0, adUnitBidLimit));
-    } else {
-      bids.push(...bucketBids);
-    }
-  });
-  return bids;
-}
+export const getHighestCpmBidsFromBidPool = hook('sync', function(bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+  if (!hasModified) {
+    const bids = [];
+    const dealPrioritization = config.getConfig('sendBidsControl.dealPrioritization');
+    // bucket by adUnitcode
+    let buckets = groupBy(bidsReceived, 'adUnitCode');
+    // 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)));
+      // if adUnitBidLimit is set, pass top N number bids
+      if (adUnitBidLimit > 0) {
+        bucketBids = dealPrioritization ? bucketBids.sort(sortByDealAndPriceBucketOrCpm(true)) : bucketBids.sort((a, b) => b.cpm - a.cpm);
+        bids.push(...bucketBids.slice(0, adUnitBidLimit));
+      } else {
+        bids.push(...bucketBids);
+      }
+    });
+
+    return bids;
+  }
+
+  return bidsReceived;
+})
 
 /**
 * A descending sort function that will sort the list of objects based on the following two dimensions:
@@ -76,11 +83,11 @@ export function getHighestCpmBidsFromBidPool(bidsReceived, highestCpmCallback, a
 */
 export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
   return function(a, b) {
-    if (a.adUnitTargeting.hb_deal !== undefined && b.adUnitTargeting.hb_deal === undefined) {
+    if (a.adserverTargeting.hb_deal !== undefined && b.adserverTargeting.hb_deal === undefined) {
       return -1;
     }
 
-    if ((a.adUnitTargeting.hb_deal === undefined && b.adUnitTargeting.hb_deal !== undefined)) {
+    if ((a.adserverTargeting.hb_deal === undefined && b.adserverTargeting.hb_deal !== undefined)) {
       return 1;
     }
 
@@ -89,7 +96,7 @@ export function sortByDealAndPriceBucketOrCpm(useCpm = false) {
       return b.cpm - a.cpm;
     }
 
-    return b.adUnitTargeting.hb_pb - a.adUnitTargeting.hb_pb;
+    return b.adserverTargeting.hb_pb - a.adserverTargeting.hb_pb;
   }
 }
 
@@ -181,6 +188,48 @@ export function newTargeting(auctionManager) {
     return [];
   };
 
+  /**
+   * Returns filtered ad server targeting for custom and allowed keys.
+   * @param {targetingArray} targeting
+   * @param {string[]} allowedKeys
+   * @return {targetingArray} filtered targeting
+   */
+  function getAllowedTargetingKeyValues(targeting, allowedKeys) {
+    const defaultKeyring = Object.assign({}, CONSTANTS.TARGETING_KEYS, CONSTANTS.NATIVE_KEYS);
+    const defaultKeys = Object.keys(defaultKeyring);
+    const keyDispositions = {};
+    logInfo(`allowTargetingKeys - allowed keys [ ${allowedKeys.map(k => defaultKeyring[k]).join(', ')} ]`);
+    targeting.map(adUnit => {
+      const adUnitCode = Object.keys(adUnit)[0];
+      const keyring = adUnit[adUnitCode];
+      const keys = keyring.filter(kvPair => {
+        const key = Object.keys(kvPair)[0];
+        // check if key is in default keys, if not, it's custom, we won't remove it.
+        const isCustom = defaultKeys.filter(defaultKey => key.indexOf(defaultKeyring[defaultKey]) === 0).length === 0;
+        // check if key explicitly allowed, if not, we'll remove it.
+        const found = isCustom || find(allowedKeys, allowedKey => {
+          const allowedKeyName = defaultKeyring[allowedKey];
+          // we're looking to see if the key exactly starts with one of our default keys.
+          // (which hopefully means it's not custom)
+          const found = key.indexOf(allowedKeyName) === 0;
+          return found;
+        });
+        keyDispositions[key] = !found;
+        return found;
+      });
+      adUnit[adUnitCode] = keys;
+    });
+    const removedKeys = Object.keys(keyDispositions).filter(d => keyDispositions[d]);
+    logInfo(`allowTargetingKeys - removed keys [ ${removedKeys.join(', ')} ]`);
+    // remove any empty targeting objects, as they're unnecessary.
+    const filteredTargeting = targeting.filter(adUnit => {
+      const adUnitCode = Object.keys(adUnit)[0];
+      const keyring = adUnit[adUnitCode];
+      return keyring.length > 0;
+    });
+    return filteredTargeting
+  }
+
   /**
    * Returns all ad server targeting for all ad units.
    * @param {string=} adUnitCode
@@ -193,7 +242,8 @@ export function newTargeting(auctionManager) {
     // `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(config.getConfig('enableSendAllBids') ? getBidLandscapeTargeting(adUnitCodes, bidsReceived) : getDealBids(adUnitCodes, bidsReceived))
+      .concat(getAdUnitTargeting(adUnitCodes));
 
     // store a reference of the targeting keys
     targeting.map(adUnitCode => {
@@ -206,6 +256,12 @@ export function newTargeting(auctionManager) {
       });
     });
 
+    const defaultKeys = Object.keys(Object.assign({}, CONSTANTS.DEFAULT_TARGETING_KEYS, CONSTANTS.NATIVE_KEYS));
+    const allowedKeys = config.getConfig('targetingControls.allowTargetingKeys') || defaultKeys;
+    if (Array.isArray(allowedKeys) && allowedKeys.length > 0) {
+      targeting = getAllowedTargetingKeyValues(targeting, allowedKeys);
+    }
+
     targeting = flattenTargeting(targeting);
 
     const auctionKeysThreshold = config.getConfig('targetingControls.auctionKeyMaxChars');
@@ -240,13 +296,13 @@ export function newTargeting(auctionManager) {
     let targetingMap = Object.keys(targetingCopy).map(adUnitCode => {
       return {
         adUnitCode,
-        adUnitTargeting: targetingCopy[adUnitCode]
+        adserverTargeting: targetingCopy[adUnitCode]
       };
     }).sort(sortByDealAndPriceBucketOrCpm());
 
     // iterate through the targeting based on above list and transform the keys into the query-equivalent and count characters
     return targetingMap.reduce(function (accMap, currMap, index, arr) {
-      let adUnitQueryString = convertKeysToQueryForm(currMap.adUnitTargeting);
+      let adUnitQueryString = convertKeysToQueryForm(currMap.adserverTargeting);
 
       // for the last adUnit - trim last encoded ampersand from the converted query string
       if ((index + 1) === arr.length) {
@@ -325,7 +381,10 @@ export function newTargeting(auctionManager) {
       Object.keys(targetingConfig).filter(customSlotMatching ? customSlotMatching(slot) : isAdUnitCodeMatchingSlot(slot))
         .forEach(targetId =>
           Object.keys(targetingConfig[targetId]).forEach(key => {
-            let valueArr = targetingConfig[targetId][key].split(',');
+            let valueArr = targetingConfig[targetId][key];
+            if (typeof valueArr === 'string') {
+              valueArr = valueArr.split(',');
+            }
             valueArr = (valueArr.length > 1) ? [valueArr] : valueArr;
             valueArr.map((value) => {
               utils.logMessage(`Attempting to set key value for slot: ${slot.getSlotElementId()} key: ${key} value: ${value}`);
@@ -538,13 +597,19 @@ export function newTargeting(auctionManager) {
     const standardKeys = TARGETING_KEYS.concat(NATIVE_TARGETING_KEYS);
     const adUnitBidLimit = config.getConfig('sendBidsControl.bidLimit');
     const bids = getHighestCpmBidsFromBidPool(bidsReceived, getHighestCpm, adUnitBidLimit);
+    const allowSendAllBidsTargetingKeys = config.getConfig('targetingControls.allowSendAllBidsTargetingKeys');
+
+    const allowedSendAllBidTargeting = allowSendAllBidsTargetingKeys
+      ? allowSendAllBidsTargetingKeys.map((key) => CONSTANTS.TARGETING_KEYS[key])
+      : standardKeys;
 
     // 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')
+            key => typeof bid.adserverTargeting[key] !== 'undefined' &&
+            allowedSendAllBidTargeting.indexOf(key) !== -1)
           )
         };
       }
@@ -559,6 +624,27 @@ export function newTargeting(auctionManager) {
     });
   }
 
+  function getAdUnitTargeting(adUnitCodes) {
+    function getTargetingObj(adUnit) {
+      return deepAccess(adUnit, CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING);
+    }
+
+    function getTargetingValues(adUnit) {
+      const aut = getTargetingObj(adUnit);
+
+      return Object.keys(aut)
+        .map(function(key) {
+          return {[key]: utils.isArray(aut[key]) ? aut[key] : aut[key].split(',')};
+        });
+    }
+
+    return auctionManager.getAdUnits()
+      .filter(adUnit => includes(adUnitCodes, adUnit.code) && getTargetingObj(adUnit))
+      .map(adUnit => {
+        return {[adUnit.code]: getTargetingValues(adUnit)}
+      });
+  }
+
   targeting.isApntagDefined = function() {
     if (window.apntag && utils.isFn(window.apntag.setKeywords)) {
       return true;
diff --git a/src/userSync.js b/src/userSync.js
index fceeb1d722d..f653880fa29 100644
--- a/src/userSync.js
+++ b/src/userSync.js
@@ -225,7 +225,7 @@ export function newUserSync(userSyncDependencies) {
       }
       return checkForFiltering[filterType](biddersToFilter, bidder);
     }
-    return false;
+    return !permittedPixels[type];
   }
 
   /**
diff --git a/src/utils.js b/src/utils.js
index 88328ff10aa..75b8bf9911e 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 import { config } from './config.js';
 import clone from 'just-clone';
-import deepequal from 'deep-equal';
 import find from 'core-js-pure/features/array/find.js';
 import includes from 'core-js-pure/features/array/includes.js';
 
@@ -22,6 +21,7 @@ let consoleLogExists = Boolean(consoleExists && window.console.log);
 let consoleInfoExists = Boolean(consoleExists && window.console.info);
 let consoleWarnExists = Boolean(consoleExists && window.console.warn);
 let consoleErrorExists = Boolean(consoleExists && window.console.error);
+var events = require('./events.js');
 
 // this allows stubbing of utility functions that are used internally by other utility functions
 export const internal = {
@@ -43,6 +43,14 @@ export const internal = {
   deepEqual
 };
 
+let prebidInternal = {}
+/**
+ * Returns object that is used as internal prebid namespace
+ */
+export function getPrebidInternal() {
+  return prebidInternal;
+}
+
 var uniqueRef = {};
 export let bind = function(a, b) { return b; }.bind(null, 1, uniqueRef)() === uniqueRef
   ? Function.prototype.bind
@@ -256,20 +264,31 @@ export function logWarn() {
   if (debugTurnedOn() && consoleWarnExists) {
     console.warn.apply(console, decorateLog(arguments, 'WARNING:'));
   }
+  events.emit(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'WARNING', arguments: arguments});
 }
 
 export function logError() {
   if (debugTurnedOn() && consoleErrorExists) {
     console.error.apply(console, decorateLog(arguments, 'ERROR:'));
   }
+  events.emit(CONSTANTS.EVENTS.AUCTION_DEBUG, {type: 'ERROR', arguments: arguments});
 }
 
 function decorateLog(args, prefix) {
   args = [].slice.call(args);
+  let bidder = config.getCurrentBidder();
+
   prefix && args.unshift(prefix);
-  args.unshift('display: inline-block; color: #fff; background: #3b88c3; padding: 1px 4px; border-radius: 3px;');
-  args.unshift('%cPrebid');
+  if (bidder) {
+    args.unshift(label('#aaa'));
+  }
+  args.unshift(label('#3b88c3'));
+  args.unshift('%cPrebid' + (bidder ? `%c${bidder}` : ''));
   return args;
+
+  function label(color) {
+    return `display: inline-block; color: #fff; background: ${color}; padding: 1px 4px; border-radius: 3px;`
+  }
 }
 
 export function hasConsoleLogger() {
@@ -717,10 +736,23 @@ export function replaceAuctionPrice(str, cpm) {
   return str.replace(/\$\{AUCTION_PRICE\}/g, cpm);
 }
 
+export function replaceClickThrough(str, clicktag) {
+  if (!str || !clicktag || typeof clicktag !== 'string') return;
+  return str.replace(/\${CLICKTHROUGH}/g, clicktag);
+}
+
 export function timestamp() {
   return new Date().getTime();
 }
 
+/**
+ * The returned value represents the time elapsed since the time origin. @see https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
+ * @returns {number}
+ */
+export function getPerformanceNow() {
+  return (window.performance && window.performance.now && window.performance.now()) || 0;
+}
+
 /**
  * When the deviceAccess flag config option is false, no cookies should be read or set
  * @returns {boolean}
@@ -1169,13 +1201,28 @@ export function buildUrl(obj) {
 }
 
 /**
- * This function compares two objects for checking their equivalence.
+ * This function deeply compares two objects checking for their equivalence.
  * @param {Object} obj1
  * @param {Object} obj2
  * @returns {boolean}
  */
 export function deepEqual(obj1, obj2) {
-  return deepequal(obj1, obj2);
+  if (obj1 === obj2) return true;
+  else if ((typeof obj1 === 'object' && obj1 !== null) && (typeof obj2 === 'object' && obj2 !== null)) {
+    if (Object.keys(obj1).length !== Object.keys(obj2).length) return false;
+    for (let prop in obj1) {
+      if (obj2.hasOwnProperty(prop)) {
+        if (!deepEqual(obj1[prop], obj2[prop])) {
+          return false;
+        }
+      } else {
+        return false;
+      }
+    }
+    return true;
+  } else {
+    return false;
+  }
 }
 
 export function mergeDeep(target, ...sources) {
@@ -1191,7 +1238,13 @@ export function mergeDeep(target, ...sources) {
         if (!target[key]) {
           Object.assign(target, { [key]: source[key] });
         } else if (isArray(target[key])) {
-          target[key] = target[key].concat(source[key]);
+          source[key].forEach(function(ele, idx) {
+            if (target[key].indexOf(ele) < 0) {
+              target[key].push(ele);
+            }
+          });
+          // Commenting below as Set and Array.from is not supported in IE
+          // target[key] = Array.from(new Set(target[key].concat(source[key]))); // This will ensure unique values in target object.
         }
       } else {
         Object.assign(target, { [key]: source[key] });
@@ -1201,3 +1254,43 @@ export function mergeDeep(target, ...sources) {
 
   return mergeDeep(target, ...sources);
 }
+
+/**
+ * returns a hash of a string using a fast algorithm
+ * source: https://stackoverflow.com/a/52171480/845390
+ * @param str
+ * @param seed (optional)
+ * @returns {string}
+ */
+export function cyrb53Hash(str, seed = 0) {
+  // IE doesn't support imul
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul#Polyfill
+  let imul = function(opA, opB) {
+    if (isFn(Math.imul)) {
+      return Math.imul(opA, opB);
+    } else {
+      opB |= 0; // ensure that opB is an integer. opA will automatically be coerced.
+      // floating points give us 53 bits of precision to work with plus 1 sign bit
+      // automatically handled for our convienence:
+      // 1. 0x003fffff /*opA & 0x000fffff*/ * 0x7fffffff /*opB*/ = 0x1fffff7fc00001
+      //    0x1fffff7fc00001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/
+      var result = (opA & 0x003fffff) * opB;
+      // 2. We can remove an integer coersion from the statement above because:
+      //    0x1fffff7fc00001 + 0xffc00000 = 0x1fffffff800001
+      //    0x1fffffff800001 < Number.MAX_SAFE_INTEGER /*0x1fffffffffffff*/
+      if (opA & 0xffc00000) result += (opA & 0xffc00000) * opB | 0;
+      return result | 0;
+    }
+  };
+
+  let h1 = 0xdeadbeef ^ seed;
+  let h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = imul(h1 ^ ch, 2654435761);
+    h2 = imul(h2 ^ ch, 1597334677);
+  }
+  h1 = imul(h1 ^ (h1 >>> 16), 2246822507) ^ imul(h2 ^ (h2 >>> 13), 3266489909);
+  h2 = imul(h2 ^ (h2 >>> 16), 2246822507) ^ imul(h1 ^ (h1 >>> 13), 3266489909);
+  return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString();
+}
diff --git a/src/video.js b/src/video.js
index befeb2ded39..20df7a92442 100644
--- a/src/video.js
+++ b/src/video.js
@@ -59,7 +59,7 @@ export const checkVideoBidSetup = hook('sync', function(bid, bidRequest, videoMe
 
   // outstream bids require a renderer on the bid or pub-defined on adunit
   if (context === OUTSTREAM) {
-    return !!(bid.renderer || bidRequest.renderer);
+    return !!(bid.renderer || bidRequest.renderer || videoMediaType.renderer);
   }
 
   return true;
diff --git a/src/videoCache.js b/src/videoCache.js
index 827325ebe78..284bd4d1ce7 100644
--- a/src/videoCache.js
+++ b/src/videoCache.js
@@ -74,6 +74,7 @@ function toStorageRequest(bid) {
   if (config.getConfig('cache.vasttrack')) {
     payload.bidder = bid.bidder;
     payload.bidid = bid.requestId;
+    payload.aid = bid.auctionId;
     // function has a thisArg set to bidderRequest for accessing the auctionStart
     if (utils.isPlainObject(this) && this.hasOwnProperty('auctionStart')) {
       payload.timestamp = this.auctionStart;
diff --git a/test/fixtures/fixtures.js b/test/fixtures/fixtures.js
index 2a0a7638fc4..908382f8daa 100644
--- a/test/fixtures/fixtures.js
+++ b/test/fixtures/fixtures.js
@@ -676,7 +676,13 @@ export function getAdUnits() {
           'bidder': 'appnexus',
           'params': {
             'placementId': '543221',
-            'test': 'me'
+          }
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'publisherId': 1234567,
+            'adSlot': '1234567@728x90'
           }
         }
       ]
diff --git a/test/fixtures/video/adUnit.json b/test/fixtures/video/adUnit.json
index df55eb25d79..0773d7f3a62 100644
--- a/test/fixtures/video/adUnit.json
+++ b/test/fixtures/video/adUnit.json
@@ -1,7 +1,11 @@
 {
   "code": "video1",
-  "sizes": [640,480],
-  "mediaType": "video",
+  "mediaTypes": {
+    "video": {
+      "context": "instream",
+      "playerSize": [640, 480]
+    }
+  },
   "bids": [
     {
       "bidder": "appnexus",
diff --git a/test/mocks/adloaderStub.js b/test/mocks/adloaderStub.js
index b52ca5e9280..6e7f5756100 100644
--- a/test/mocks/adloaderStub.js
+++ b/test/mocks/adloaderStub.js
@@ -4,7 +4,7 @@ import * as adloader from 'src/adloader.js';
 // this export is for adloader's tests against actual implementation
 export let loadExternalScript = adloader.loadExternalScript;
 
-let stub = createStub();
+export let loadExternalScriptStub = createStub();
 
 function createStub() {
   return sinon.stub(adloader, 'loadExternalScript').callsFake((...args) => {
@@ -18,6 +18,6 @@ function createStub() {
 }
 
 beforeEach(function() {
-  stub.restore();
-  stub = createStub();
+  loadExternalScriptStub.restore();
+  loadExternalScriptStub = createStub();
 });
diff --git a/test/mocks/fabrickId.json b/test/mocks/fabrickId.json
new file mode 100644
index 00000000000..a8723ec88ec
--- /dev/null
+++ b/test/mocks/fabrickId.json
@@ -0,0 +1,3 @@
+{
+  "fabrickId": 1980
+}
diff --git a/test/spec/AnalyticsAdapter_spec.js b/test/spec/AnalyticsAdapter_spec.js
index 4afa430f81e..2b36848bd8f 100644
--- a/test/spec/AnalyticsAdapter_spec.js
+++ b/test/spec/AnalyticsAdapter_spec.js
@@ -9,6 +9,7 @@ const BID_RESPONSE = CONSTANTS.EVENTS.BID_RESPONSE;
 const BID_WON = CONSTANTS.EVENTS.BID_WON;
 const BID_TIMEOUT = CONSTANTS.EVENTS.BID_TIMEOUT;
 const AD_RENDER_FAILED = CONSTANTS.EVENTS.AD_RENDER_FAILED;
+const AUCTION_DEBUG = CONSTANTS.EVENTS.AUCTION_DEBUG;
 const ADD_AD_UNITS = CONSTANTS.EVENTS.ADD_AD_UNITS;
 
 const AnalyticsAdapter = require('src/AnalyticsAdapter').default;
@@ -48,8 +49,10 @@ FEATURE: Analytics Adapters API
     events.emit(eventType, args);
     adapter.enableAnalytics();
 
-    let result = JSON.parse(server.requests[0].requestBody);
-    expect(result).to.deep.equal({args: {wat: 'wot'}, eventType: 'bidResponse'});
+    // As now AUCTION_DEBUG is triggered for WARNINGS too, the BID_RESPONSE goes last in the array
+    const index = server.requests.length - 1;
+    let result = JSON.parse(server.requests[index].requestBody);
+    expect(result).to.deep.equal({eventType: 'bidResponse', args: {wat: 'wot'}});
   });
 
   describe(`WHEN an event occurs after enable analytics\n`, function () {
@@ -83,6 +86,17 @@ FEATURE: Analytics Adapters API
       expect(result).to.deep.equal({args: {call: 'adRenderFailed'}, eventType: 'adRenderFailed'});
     });
 
+    it('SHOULD call global when an auction debug event occurs', function () {
+      const eventType = AUCTION_DEBUG;
+      const args = { call: 'auctionDebug' };
+
+      adapter.enableAnalytics();
+      events.emit(eventType, args);
+
+      let result = JSON.parse(server.requests[0].requestBody);
+      expect(result).to.deep.equal({args: {call: 'auctionDebug'}, eventType: 'auctionDebug'});
+    });
+
     it('SHOULD call global when an addAdUnits event occurs', function () {
       const eventType = ADD_AD_UNITS;
       const args = { call: 'addAdUnits' };
diff --git a/test/spec/adUnits_spec.js b/test/spec/adUnits_spec.js
index 7dd48a13208..baa5b4ac8c4 100644
--- a/test/spec/adUnits_spec.js
+++ b/test/spec/adUnits_spec.js
@@ -23,6 +23,16 @@ describe('Publisher API _ AdUnits', function () {
         }
       ]
     }, {
+      fpd: {
+        context: {
+          pbAdSlot: 'adSlotTest',
+          data: {
+            inventory: [4],
+            keywords: 'foo,bar',
+            visitor: [1, 2, 3],
+          }
+        }
+      },
       code: '/1996833/slot-2',
       sizes: [[468, 60]],
       bids: [
@@ -85,6 +95,7 @@ describe('Publisher API _ AdUnits', function () {
     it('the second adUnits value should be same with the adUnits that is added by $$PREBID_GLOBAL$$.addAdUnits();', function () {
       assert.strictEqual(adUnit2.code, '/1996833/slot-2', 'adUnit2 code');
       assert.deepEqual(adUnit2.sizes, [[468, 60]], 'adUnit2 sizes');
+      assert.deepEqual(adUnit2['ortb2Imp'], {'ext': {'data': {'pbadslot': 'adSlotTest', 'inventory': [4], 'keywords': 'foo,bar', 'visitor': [1, 2, 3]}}}, 'adUnit2 ortb2Imp');
       assert.strictEqual(bids2[0].bidder, 'rubicon', 'adUnit2 bids1 bidder');
       assert.strictEqual(bids2[0].params.rp_account, '4934', 'adUnit2 bids1 params.rp_account');
       assert.strictEqual(bids2[0].params.rp_zonesize, '23948-15', 'adUnit2 bids1 params.rp_zonesize');
diff --git a/test/spec/adapters/adbutler_spec.js b/test/spec/adapters/adbutler_spec.js
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/spec/api_spec.js b/test/spec/api_spec.js
index 6f21eba7aaf..cb6c7aa87a3 100755
--- a/test/spec/api_spec.js
+++ b/test/spec/api_spec.js
@@ -43,10 +43,14 @@ describe('Publisher API', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponses);
     });
 
-    it('should have function $$PREBID_GLOBAL$$.getBidResponses', function () {
+    it('should have function $$PREBID_GLOBAL$$.getNoBids', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getNoBids);
     });
 
+    it('should have function $$PREBID_GLOBAL$$.getNoBidsForAdUnitCode', function () {
+      assert.isFunction($$PREBID_GLOBAL$$.getNoBidsForAdUnitCode);
+    });
+
     it('should have function $$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getBidResponsesForAdUnitCode);
     });
@@ -78,5 +82,9 @@ describe('Publisher API', function () {
     it('should have function $$PREBID_GLOBAL$$.getAllWinningBids', function () {
       assert.isFunction($$PREBID_GLOBAL$$.getAllWinningBids);
     });
+
+    it('should have function $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode', function () {
+      assert.isFunction($$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode);
+    });
   });
 });
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 35a29727614..69e34c4a07a 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -143,6 +143,9 @@ describe('auctionmanager.js', function () {
       adId: '1adId',
       source: 'client',
       mediaType: 'banner',
+      meta: {
+        advertiserDomains: ['adomain']
+      }
     };
 
     /* return the expected response for a given bid, filter by keys if given */
@@ -154,6 +157,7 @@ describe('auctionmanager.js', function () {
       expected[ CONSTANTS.TARGETING_KEYS.SIZE ] = bid.getSize();
       expected[ CONSTANTS.TARGETING_KEYS.SOURCE ] = bid.source;
       expected[ CONSTANTS.TARGETING_KEYS.FORMAT ] = bid.mediaType;
+      expected[ CONSTANTS.TARGETING_KEYS.ADOMAIN ] = bid.meta.advertiserDomains[0];
       if (bid.mediaType === 'video') {
         expected[ CONSTANTS.TARGETING_KEYS.UUID ] = bid.videoCacheKey;
         expected[ CONSTANTS.TARGETING_KEYS.CACHE_ID ] = bid.videoCacheKey;
@@ -239,6 +243,12 @@ describe('auctionmanager.js', function () {
                 return bidResponse.mediaType;
               }
             },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
+            }
           ]
 
         }
@@ -309,6 +319,12 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.videoCacheKey;
               }
+            },
+            {
+              key: CONSTANTS.TARGETING_KEYS.ADOMAIN,
+              val: function (bidResponse) {
+                return bidResponse.meta.advertiserDomains[0];
+              }
             }
           ]
 
@@ -740,6 +756,91 @@ describe('auctionmanager.js', function () {
         assert.equal(addedBid.renderer.url, 'renderer.js');
       });
 
+      it('installs publisher-defined backup renderers on bids', function () {
+        let renderer = {
+          url: 'renderer.js',
+          backupOnly: true,
+          render: (bid) => bid
+        };
+        let bidRequests = [Object.assign({}, TEST_BID_REQS[0])];
+        bidRequests[0].bids[0] = Object.assign({ renderer }, bidRequests[0].bids[0]);
+        makeRequestsStub.returns(bidRequests);
+
+        let bids1 = Object.assign({},
+          bids[0],
+          {
+            bidderCode: BIDDER_CODE,
+            mediaType: 'video-outstream',
+          }
+        );
+        spec.interpretResponse.returns(bids1);
+        auction.callBids();
+        const addedBid = auction.getBidsReceived().pop();
+        assert.equal(addedBid.renderer.url, 'renderer.js');
+      });
+
+      it('installs publisher-defined renderers for a media type', function () {
+        const renderer = {
+          url: 'videoRenderer.js',
+          render: (bid) => bid
+        };
+        let myBid = mockBid();
+        let bidRequest = mockBidRequest(myBid);
+
+        bidRequest.bids[0] = {
+          ...bidRequest.bids[0],
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            },
+            video: {
+              context: 'outstream',
+              renderer
+            }
+          }
+        };
+        makeRequestsStub.returns([bidRequest]);
+
+        myBid.mediaType = 'video';
+        spec.interpretResponse.returns(myBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.equal(addedBid.renderer.url, renderer.url);
+      });
+
+      it('installs bidder-defined renderer when onlyBackup is true in mediaTypes.video options ', function () {
+        const renderer = {
+          url: 'videoRenderer.js',
+          backupOnly: true,
+          render: (bid) => bid
+        };
+        let myBid = mockBid();
+        let bidRequest = mockBidRequest(myBid);
+
+        bidRequest.bids[0] = {
+          ...bidRequest.bids[0],
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              renderer
+            }
+          }
+        };
+        makeRequestsStub.returns([bidRequest]);
+
+        myBid.mediaType = 'video';
+        myBid.renderer = {
+          url: 'renderer.js',
+          render: sinon.spy()
+        };
+        spec.interpretResponse.returns(myBid);
+        auction.callBids();
+
+        const addedBid = auction.getBidsReceived().pop();
+        assert.strictEqual(addedBid.renderer.url, myBid.renderer.url);
+      });
+
       it('bid for a regular unit and a video unit', function() {
         let renderer = {
           url: 'renderer.js',
@@ -1229,4 +1330,119 @@ describe('auctionmanager.js', function () {
       assert.equal(doneSpy.callCount, 1);
     })
   });
+
+  describe('auctionOptions', function() {
+    let bidRequests;
+    let doneSpy;
+    let clock;
+    let auction = {
+      getBidRequests: () => bidRequests,
+      getAuctionId: () => '1',
+      addBidReceived: () => true,
+      getTimeout: () => 1000
+    }
+    let requiredBidder = BIDDER_CODE;
+    let requiredBidder1 = BIDDER_CODE1;
+    let secondaryBidder = 'doNotWaitForMe';
+
+    beforeEach(() => {
+      clock = sinon.useFakeTimers();
+      doneSpy = sinon.spy();
+      config.setConfig({
+        'auctionOptions': {
+          secondaryBidders: [ secondaryBidder ]
+        }
+      })
+    });
+
+    afterEach(() => {
+      doneSpy.resetHistory();
+      config.resetConfig();
+      clock.restore();
+    });
+
+    it('should not wait to call auction done for secondary bidders', function () {
+      let bids1 = [mockBid({ bidderCode: requiredBidder })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      // required bidder responds immeaditely to auction
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      assert.equal(doneSpy.callCount, 0);
+
+      // auction waits for second required bidder to respond
+      clock.tick(100);
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+
+      // auction done is reported and does not wait for secondaryBidder request
+      assert.equal(doneSpy.callCount, 1);
+
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+    });
+
+    it('should wait for all bidders if they are all secondary', function () {
+      config.setConfig({
+        'auctionOptions': {
+          secondaryBidders: [requiredBidder, requiredBidder1, secondaryBidder]
+        }
+      })
+      let bids1 = [mockBid({ bidderCode: requiredBidder })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0)
+
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+      assert.equal(doneSpy.callCount, 1);
+    });
+
+    it('should allow secondaryBidders to respond in auction before is is done', function () {
+      let bids1 = [mockBid({ bidderCode: requiredBidder })];
+      let bids2 = [mockBid({ bidderCode: requiredBidder1 })];
+      let bids3 = [mockBid({ bidderCode: secondaryBidder })];
+      bidRequests = [
+        mockBidRequest(bids1[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids2[0], { adUnitCode: ADUNIT_CODE1 }),
+        mockBidRequest(bids3[0], { adUnitCode: ADUNIT_CODE1 }),
+      ];
+      let cbs = auctionCallbacks(doneSpy, auction);
+      // secondaryBidder is first to respond
+      cbs.addBidResponse.call(bidRequests[2], ADUNIT_CODE1, bids3[0]);
+      cbs.adapterDone.call(bidRequests[2]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      cbs.addBidResponse.call(bidRequests[1], ADUNIT_CODE1, bids2[0]);
+      cbs.adapterDone.call(bidRequests[1]);
+      clock.tick(100);
+      assert.equal(doneSpy.callCount, 0);
+
+      // first required bidder takes longest to respond, auction isn't marked as done until this occurs
+      cbs.addBidResponse.call(bidRequests[0], ADUNIT_CODE1, bids1[0]);
+      cbs.adapterDone.call(bidRequests[0]);
+      assert.equal(doneSpy.callCount, 1);
+    });
+  });
 });
diff --git a/test/spec/config_spec.js b/test/spec/config_spec.js
index be5b4bbb78b..9492db6e849 100644
--- a/test/spec/config_spec.js
+++ b/test/spec/config_spec.js
@@ -6,6 +6,8 @@ const utils = require('src/utils');
 
 let getConfig;
 let setConfig;
+let getBidderConfig;
+let setBidderConfig;
 let setDefaults;
 
 describe('config API', function () {
@@ -15,6 +17,8 @@ describe('config API', function () {
     const config = newConfig();
     getConfig = config.getConfig;
     setConfig = config.setConfig;
+    getBidderConfig = config.getBidderConfig;
+    setBidderConfig = config.setBidderConfig;
     setDefaults = config.setDefaults;
     logErrorSpy = sinon.spy(utils, 'logError');
     logWarnSpy = sinon.spy(utils, 'logWarn');
@@ -57,6 +61,17 @@ describe('config API', function () {
     expect(getConfig('foo')).to.eql({baz: 'qux'});
   });
 
+  it('moves fpd config into ortb2 properties', function () {
+    setConfig({fpd: {context: {keywords: 'foo,bar', data: {inventory: [1]}}}});
+    expect(getConfig('ortb2')).to.eql({site: {keywords: 'foo,bar', ext: {data: {inventory: [1]}}}});
+    expect(getConfig('fpd')).to.eql(undefined);
+  });
+
+  it('moves fpd bidderconfig into ortb2 properties', function () {
+    setBidderConfig({bidders: ['bidderA'], config: {fpd: {context: {keywords: 'foo,bar', data: {inventory: [1]}}}}});
+    expect(getBidderConfig()).to.eql({'bidderA': {ortb2: {site: {keywords: 'foo,bar', ext: {data: {inventory: [1]}}}}}});
+  });
+
   it('sets debugging', function () {
     setConfig({ debug: true });
     expect(getConfig('debug')).to.be.true;
@@ -195,6 +210,12 @@ describe('config API', function () {
     expect(getConfig('deviceAccess')).to.be.equal(true);
   });
 
+  it('sets maxNestedIframes', function () {
+    expect(getConfig('maxNestedIframes')).to.be.equal(10);
+    setConfig({ maxNestedIframes: 2 });
+    expect(getConfig('maxNestedIframes')).to.be.equal(2);
+  });
+
   it('should log error for invalid priceGranularity', function () {
     setConfig({ priceGranularity: '' });
     const error = 'Prebid Error: no value passed to `setPriceGranularity()`';
@@ -211,4 +232,54 @@ describe('config API', function () {
     setConfig({ bidderSequence: 'random' });
     expect(logWarnSpy.called).to.equal(false);
   });
+
+  it('sets auctionOptions secondaryBidders', function () {
+    const auctionOptionsConfig = {
+      'secondaryBidders': ['rubicon', 'appnexus']
+    }
+    setConfig({ auctionOptions: auctionOptionsConfig });
+    expect(getConfig('auctionOptions')).to.eql(auctionOptionsConfig);
+  });
+
+  it('sets auctionOptions suppressStaleRender', function () {
+    const auctionOptionsConfig = {
+      'suppressStaleRender': true
+    }
+    setConfig({ auctionOptions: auctionOptionsConfig });
+    expect(getConfig('auctionOptions')).to.eql(auctionOptionsConfig);
+  });
+
+  it('should log warning for the wrong value passed to auctionOptions', function () {
+    setConfig({ auctionOptions: '' });
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options must be an object';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid auctionOptions bidder values', function () {
+    setConfig({ auctionOptions: {
+      'secondaryBidders': 'appnexus, rubicon',
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options secondaryBidders must be of type Array';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid auctionOptions suppress stale render', function () {
+    setConfig({ auctionOptions: {
+      'suppressStaleRender': 'test',
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options suppressStaleRender must be of type boolean';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
+
+  it('should log warning for invalid properties to auctionOptions', function () {
+    setConfig({ auctionOptions: {
+      'testing': true
+    }});
+    expect(logWarnSpy.calledOnce).to.equal(true);
+    const warning = 'Auction Options given an incorrect param: testing';
+    assert.ok(logWarnSpy.calledWith(warning), 'expected warning was logged');
+  });
 });
diff --git a/test/spec/integration/faker/googletag.js b/test/spec/integration/faker/googletag.js
index a0ce04402f7..9d91bf315d9 100644
--- a/test/spec/integration/faker/googletag.js
+++ b/test/spec/integration/faker/googletag.js
@@ -43,18 +43,52 @@ export function makeSlot() {
   return slot;
 }
 
-window.googletag = {
-  _slots: [],
-  pubads: function () {
-    var self = this;
-    return {
-      getSlots: function () {
-        return self._slots;
-      },
-
-      setSlots: function (slots) {
-        self._slots = slots;
-      }
-    };
-  }
-};
+export function emitEvent(eventName, params) {
+  (window.googletag._callbackMap[eventName] || []).forEach(eventCb => eventCb({...params, eventName}));
+}
+
+export function enable() {
+  window.googletag = {
+    _slots: [],
+    _callbackMap: {},
+    pubads: function () {
+      var self = this;
+      return {
+        getSlots: function () {
+          return self._slots;
+        },
+
+        setSlots: function (slots) {
+          self._slots = slots;
+        },
+
+        setTargeting: function(key, arrayOfValues) {
+          self._targeting[key] = Array.isArray(arrayOfValues) ? arrayOfValues : [arrayOfValues];
+        },
+
+        getTargeting: function(key) {
+          return self._targeting[key] || [];
+        },
+
+        getTargetingKeys: function() {
+          return Object.getOwnPropertyNames(self._targeting);
+        },
+
+        clearTargeting: function() {
+          self._targeting = {};
+        },
+
+        addEventListener: function (eventName, cb) {
+          self._callbackMap[eventName] = self._callbackMap[eventName] || [];
+          self._callbackMap[eventName].push(cb);
+        }
+      };
+    }
+  };
+}
+
+export function disable() {
+  window.googletag = undefined;
+}
+
+enable();
diff --git a/test/spec/modules/33acrossBidAdapter_spec.js b/test/spec/modules/33acrossBidAdapter_spec.js
index 3721cef18d9..b5443cdd5c2 100644
--- a/test/spec/modules/33acrossBidAdapter_spec.js
+++ b/test/spec/modules/33acrossBidAdapter_spec.js
@@ -5,10 +5,18 @@ import { config } from 'src/config.js';
 
 import { spec } from 'modules/33acrossBidAdapter.js';
 
+function validateBuiltServerRequest(builtReq, expectedReq) {
+  expect(builtReq.url).to.equal(expectedReq.url);
+  expect(builtReq.options).to.deep.equal(expectedReq.options);
+  expect(JSON.parse(builtReq.data)).to.deep.equal(
+    JSON.parse(expectedReq.data)
+  )
+}
+
 describe('33acrossBidAdapter:', function () {
   const BIDDER_CODE = '33across';
-  const SITE_ID = 'pub1234';
-  const PRODUCT_ID = 'product1';
+  const SITE_ID = 'sample33xGUID123456789';
+  const PRODUCT_ID = 'siab';
   const END_POINT = 'https://ssc.33across.com/api/v1/hb';
 
   let element, win;
@@ -17,7 +25,29 @@ describe('33acrossBidAdapter:', function () {
 
   function TtxRequestBuilder() {
     const ttxRequest = {
-      imp: [{
+      imp: [{}],
+      site: {
+        id: SITE_ID
+      },
+      id: 'b1',
+      regs: {
+        ext: {
+          gdpr: 0
+        }
+      },
+      ext: {
+        ttx: {
+          prebidStartedAt: 1,
+          caller: [{
+            'name': 'prebidjs',
+            'version': '$prebid.version$'
+          }]
+        }
+      }
+    };
+
+    this.withBanner = () => {
+      Object.assign(ttxRequest.imp[0], {
         banner: {
           format: [
             {
@@ -36,46 +66,32 @@ describe('33acrossBidAdapter:', function () {
               }
             }
           }
-        },
-        ext: {
-          ttx: {
-            prod: PRODUCT_ID
-          }
-        }
-      }],
-      site: {
-        id: SITE_ID
-      },
-      id: 'b1',
-      user: {
-        ext: {
-          consent: undefined
-        }
-      },
-      regs: {
-        ext: {
-          gdpr: 0,
-          us_privacy: null
         }
-      },
-      ext: {
-        ttx: {
-          prebidStartedAt: 1,
-          caller: [{
-            'name': 'prebidjs',
-            'version': '$prebid.version$'
-          }]
-        }
-      }
+      });
+
+      return this;
     };
 
-    this.withSizes = sizes => {
+    this.withBannerSizes = this.withSizes = sizes => {
       Object.assign(ttxRequest.imp[0].banner, { format: sizes });
       return this;
     };
 
-    this.withViewability = viewability => {
-      Object.assign(ttxRequest.imp[0].banner, {
+    this.withVideo = (params = {}) => {
+      Object.assign(ttxRequest.imp[0], {
+        video: {
+          w: 300,
+          h: 250,
+          placement: 2,
+          ...params
+        }
+      });
+
+      return this;
+    };
+
+    this.withViewability = (viewability, format = 'banner') => {
+      Object.assign(ttxRequest.imp[0][format], {
         ext: {
           ttx: { viewability }
         }
@@ -83,6 +99,18 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
+    this.withProduct = (prod = PRODUCT_ID) => {
+      Object.assign(ttxRequest.imp[0], {
+        ext: {
+          ttx: {
+            prod
+          }
+        }
+      });
+
+      return this;
+    };
+
     this.withGdprConsent = (consent, gdpr) => {
       Object.assign(ttxRequest, {
         user: {
@@ -140,21 +168,46 @@ describe('33acrossBidAdapter:', function () {
       return this;
     };
 
-    this.withFormatFloors = floors => {
-      const format = ttxRequest.imp[0].banner.format.map((fm, i) => {
-        return Object.assign(fm, {
-          ext: {
-            ttx: {
-              bidfloors: [ floors[i] ]
+    this.withFloors = this.withFormatFloors = (mediaType, floors) => {
+      switch (mediaType) {
+        case 'banner':
+          const format = ttxRequest.imp[0].banner.format.map((fm, i) => {
+            return Object.assign(fm, {
+              ext: {
+                ttx: {
+                  bidfloors: [ floors[i] ]
+                }
+              }
+            })
+          });
+
+          ttxRequest.imp[0].banner.format = format;
+          break;
+        case 'video':
+          Object.assign(ttxRequest.imp[0].video, {
+            ext: {
+              ttx: {
+                bidfloors: floors
+              }
             }
+          });
+          break;
+      }
+
+      return this;
+    };
+
+    this.withUserIds = (eids) => {
+      Object.assign(ttxRequest, {
+        user: {
+          ext: {
+            eids
           }
-        })
+        }
       });
 
-      ttxRequest.imp[0].banner.format = format;
-
       return this;
-    };
+    }
 
     this.build = () => ttxRequest;
   }
@@ -162,7 +215,7 @@ describe('33acrossBidAdapter:', function () {
   function ServerRequestBuilder() {
     const serverRequest = {
       'method': 'POST',
-      'url': END_POINT,
+      'url': `${END_POINT}?guid=${SITE_ID}`,
       'data': null,
       'options': {
         'contentType': 'text/plain',
@@ -188,6 +241,59 @@ describe('33acrossBidAdapter:', function () {
     this.build = () => serverRequest;
   }
 
+  function BidRequestsBuilder() {
+    const bidRequests = [
+      {
+        bidId: 'b1',
+        bidder: '33across',
+        bidderRequestId: 'b1a',
+        params: {
+          siteId: SITE_ID,
+          productId: PRODUCT_ID
+        },
+        adUnitCode: 'div-id',
+        auctionId: 'r1',
+        mediaTypes: {},
+        transactionId: 't1'
+      }
+    ];
+
+    this.withBanner = () => {
+      bidRequests[0].mediaTypes.banner = {
+        sizes: [
+          [300, 250],
+          [728, 90]
+        ]
+      };
+
+      return this;
+    };
+
+    this.withProduct = (prod) => {
+      bidRequests[0].params.productId = prod;
+
+      return this;
+    };
+
+    this.withVideo = (params) => {
+      bidRequests[0].mediaTypes.video = {
+        playerSize: [[300, 250]],
+        context: 'outstream',
+        ...params
+      };
+
+      return this;
+    }
+
+    this.withUserIds = (eids) => {
+      bidRequests[0].userIdAsEids = eids;
+
+      return this;
+    };
+
+    this.build = () => bidRequests;
+  }
+
   beforeEach(function() {
     element = {
       x: 0,
@@ -217,24 +323,11 @@ describe('33acrossBidAdapter:', function () {
       innerHeight: 600
     };
 
-    bidRequests = [
-      {
-        bidId: 'b1',
-        bidder: '33across',
-        bidderRequestId: 'b1a',
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        },
-        adUnitCode: 'div-id',
-        auctionId: 'r1',
-        sizes: [
-          [300, 250],
-          [728, 90]
-        ],
-        transactionId: 't1'
-      }
-    ];
+    bidRequests = (
+      new BidRequestsBuilder()
+        .withBanner()
+        .build()
+    );
 
     sandbox = sinon.sandbox.create();
     sandbox.stub(Date, 'now').returns(1);
@@ -248,78 +341,246 @@ describe('33acrossBidAdapter:', function () {
   });
 
   describe('isBidRequestValid:', function() {
-    it('returns true when valid bid request is sent', function() {
-      const validBid = {
-        bidder: BIDDER_CODE,
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        }
-      };
+    context('basic validation', function() {
+      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
+        const validGUIDs = [
+          `${SITE_ID}`,
+          `${SITE_ID} `,
+          ` ${SITE_ID}`,
+          ` ${SITE_ID} `
+        ];
 
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
-    });
+        validGUIDs.forEach((siteId) => {
+          const bid = {
+            bidder: '33across',
+            params: {
+              siteId
+            }
+          };
 
-    it('returns true when valid test bid request is sent', function() {
-      const validBid = {
-        bidder: BIDDER_CODE,
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID,
-          test: 1
-        }
-      };
+          expect(spec.isBidRequestValid(bid)).to.be.true;
+        });
+      });
 
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
-    });
+      it('returns false for invalid guid values', function() {
+        const invalidGUIDs = [
+          undefined,
+          'siab'
+        ];
 
-    it('returns false when bidder not set to "33across"', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          siteId: SITE_ID,
-          productId: PRODUCT_ID
-        }
-      };
+        invalidGUIDs.forEach((siteId) => {
+          const bid = {
+            bidder: '33across',
+            params: {
+              siteId
+            }
+          };
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+          expect(spec.isBidRequestValid(bid)).to.be.false;
+        });
+      });
     });
 
-    it('returns false when params not set', function() {
-      const invalidBid = {
-        bidder: 'foo'
-      };
+    context('banner validation', function() {
+      it('returns true when banner mediaType does not exist', function() {
+        const bid = {
+          bidder: '33across',
+          params: {
+            siteId: 'cxBE0qjUir6iopaKkGJozW'
+          }
+        };
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
-    });
+        expect(spec.isBidRequestValid(bid)).to.be.true;
+      });
 
-    it('returns false when site ID is not set in params', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          productId: PRODUCT_ID
-        }
-      };
+      it('returns true when banner sizes are defined', function() {
+        const bid = {
+          bidder: '33across',
+          mediaTypes: {
+            banner: {
+              sizes: [[250, 300]]
+            }
+          },
+          params: {
+            siteId: 'cxBE0qjUir6iopaKkGJozW'
+          }
+        };
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
-    });
+        expect(spec.isBidRequestValid(bid)).to.be.true;
+      });
 
-    it('returns false when product ID not set in params', function() {
-      const invalidBid = {
-        bidder: 'foo',
-        params: {
-          siteId: SITE_ID
-        }
-      };
+      it('returns false when banner sizes are invalid', function() {
+        const invalidSizes = [
+          undefined,
+          '16:9',
+          300,
+          'foo'
+        ];
 
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+        invalidSizes.forEach((sizes) => {
+          const bid = {
+            bidder: '33across',
+            mediaTypes: {
+              banner: {
+                sizes
+              }
+            },
+            params: {
+              siteId: 'cxBE0qjUir6iopaKkGJozW'
+            }
+          };
+
+          expect(spec.isBidRequestValid(bid)).to.be.false;
+        });
+      });
     });
+
+    context('video validation', function() {
+      beforeEach(function() {
+        // Basic Valid BidRequest
+        this.bid = {
+          bidder: '33across',
+          mediaTypes: {
+            video: {
+              playerSize: [[300, 50]],
+              context: 'outstream',
+              mimes: ['foo', 'bar'],
+              protocols: [1, 2]
+            }
+          },
+          params: {
+            siteId: `${SITE_ID}`
+          }
+        };
+      });
+
+      it('returns true when video mediaType does not exist', function() {
+        const bid = {
+          bidder: '33across',
+          params: {
+            siteId: `${SITE_ID}`
+          }
+        };
+
+        expect(spec.isBidRequestValid(bid)).to.be.true;
+      });
+
+      it('returns true when valid video mediaType is defined', function() {
+        expect(spec.isBidRequestValid(this.bid)).to.be.true;
+      });
+
+      it('returns false when video context is not defined', function() {
+        delete this.bid.mediaTypes.video.context;
+
+        expect(spec.isBidRequestValid(this.bid)).to.be.false;
+      });
+
+      it('returns false when video playserSize is invalid', function() {
+        const invalidSizes = [
+          undefined,
+          '16:9',
+          300,
+          'foo'
+        ];
+
+        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,
+          'foo',
+          1,
+          []
+        ]
+
+        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,
+          'foo',
+          1,
+          []
+        ]
+
+        invalidMimes.forEach((protocols) => {
+          this.bid.mediaTypes.video.protocols = protocols;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        })
+      });
+
+      it('returns false when video placement is invalid', function() {
+        const invalidPlacement = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidPlacement.forEach((placement) => {
+          this.bid.mediaTypes.video.placement = placement;
+          expect(spec.isBidRequestValid(this.bid)).to.be.false;
+        });
+      });
+
+      it('returns false when video startdelay is invalid for instream context', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'instream', protocols: [1, 2], mimes: ['foo', 'bar']})
+            .build()
+        );
+
+        const invalidStartdelay = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidStartdelay.forEach((startdelay) => {
+          bidRequests[0].mediaTypes.video.startdelay = startdelay;
+          expect(spec.isBidRequestValid(bidRequests[0])).to.be.false;
+        });
+      });
+
+      it('returns true when video startdelay is invalid for outstream context', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream', protocols: [1, 2], mimes: ['foo', 'bar']})
+            .build()
+        );
+
+        const invalidStartdelay = [
+          [],
+          '1',
+          {},
+          'foo'
+        ];
+
+        invalidStartdelay.forEach((startdelay) => {
+          bidRequests[0].mediaTypes.video.startdelay = startdelay;
+          expect(spec.isBidRequestValid(bidRequests[0])).to.be.true;
+        });
+      });
+    })
   });
 
   describe('buildRequests:', function() {
     context('when element is fully in view', function() {
       it('returns 100', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: 100})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -328,13 +589,16 @@ describe('33acrossBidAdapter:', function () {
 
         Object.assign(element, { width: 600, height: 400 });
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when element is out of view', function() {
       it('returns 0', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: 0})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -343,13 +607,16 @@ describe('33acrossBidAdapter:', function () {
 
         Object.assign(element, { x: -300, y: 0, width: 207, height: 320 });
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when element is partially in view', function() {
       it('returns percentage', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: 75})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -358,13 +625,16 @@ describe('33acrossBidAdapter:', function () {
 
         Object.assign(element, { width: 800, height: 800 });
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when width or height of the element is zero', function() {
       it('try to use alternative values', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withSizes([{ w: 800, h: 2400 }])
           .withViewability({amount: 25})
           .build();
@@ -373,15 +643,18 @@ describe('33acrossBidAdapter:', function () {
           .build();
 
         Object.assign(element, { width: 0, height: 0 });
-        bidRequests[0].sizes = [[800, 2400]];
+        bidRequests[0].mediaTypes.banner.sizes = [[800, 2400]];
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when nested iframes', function() {
       it('returns \'nm\'', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: spec.NON_MEASURABLE})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -395,13 +668,16 @@ describe('33acrossBidAdapter:', function () {
         sandbox.stub(utils, 'getWindowTop').returns({});
         sandbox.stub(utils, 'getWindowSelf').returns(win);
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
     context('when tab is inactive', function() {
       it('returns 0', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withViewability({amount: 0})
           .build();
         const serverRequest = new ServerRequestBuilder()
@@ -414,7 +690,8 @@ describe('33acrossBidAdapter:', function () {
         win.document.visibilityState = 'hidden';
         sandbox.stub(utils, 'getWindowTop').returns(win);
 
-        expect(spec.buildRequests(bidRequests)).to.deep.equal([ serverRequest ]);
+        const [ buildRequest ] = spec.buildRequests(bidRequests);
+        validateBuiltServerRequest(buildRequest, serverRequest);
       });
     });
 
@@ -432,14 +709,16 @@ describe('33acrossBidAdapter:', function () {
 
       it('returns corresponding server requests with gdpr consent data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withGdprConsent('foobarMyPreference', 1)
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('returns corresponding test server requests with gdpr consent data', function() {
@@ -450,15 +729,17 @@ describe('33acrossBidAdapter:', function () {
         });
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withGdprConsent('foobarMyPreference', 1)
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -471,13 +752,15 @@ describe('33acrossBidAdapter:', function () {
 
       it('returns corresponding server requests with default gdpr consent data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('returns corresponding test server requests with default gdpr consent data', function() {
@@ -488,14 +771,16 @@ describe('33acrossBidAdapter:', function () {
         });
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -510,14 +795,16 @@ describe('33acrossBidAdapter:', function () {
 
       it('returns corresponding server requests with us_privacy consent data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withUspConsent('foo')
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('returns corresponding test server requests with us_privacy consent data', function() {
@@ -528,15 +815,17 @@ describe('33acrossBidAdapter:', function () {
         });
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withUspConsent('foo')
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -549,13 +838,15 @@ describe('33acrossBidAdapter:', function () {
 
       it('returns corresponding server requests with default us_privacy data', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('returns corresponding test server requests with default us_privacy consent data', function() {
@@ -566,14 +857,16 @@ describe('33acrossBidAdapter:', function () {
         });
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .withUrl('https://foo.com/hb/')
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -586,15 +879,17 @@ describe('33acrossBidAdapter:', function () {
         };
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .withPageUrl('http://foo.com/bar')
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -605,14 +900,16 @@ describe('33acrossBidAdapter:', function () {
         };
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, bidderRequest);
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, bidderRequest);
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
@@ -656,15 +953,17 @@ describe('33acrossBidAdapter:', function () {
           bidRequests[0].schain = schain;
 
           const ttxRequest = new TtxRequestBuilder()
+            .withBanner()
+            .withProduct()
             .withSchain(schain)
             .build();
           const serverRequest = new ServerRequestBuilder()
             .withData(ttxRequest)
             .build();
 
-          const builtServerRequests = spec.buildRequests(bidRequests, {});
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-          expect(builtServerRequests).to.deep.equal([serverRequest]);
+          validateBuiltServerRequest(builtServerRequest, serverRequest);
         });
       });
     });
@@ -672,43 +971,49 @@ describe('33acrossBidAdapter:', function () {
     context('when there no schain object is passed', function() {
       it('does not set source field', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
 
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
 
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
-    context('when price floor module is not enabled in bidRequest', function() {
+    context('when price floor module is not enabled for banner in bidRequest', function() {
       it('does not set any bidfloors in ttxRequest', function() {
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
     });
 
-    context('when price floor module is enabled in bidRequest', function() {
+    context('when price floor module is enabled for banner in bidRequest', function() {
       it('does not set any bidfloors in ttxRequest if there is no floor', function() {
         bidRequests[0].getFloor = () => ({});
 
         const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct()
           .build();
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
       });
 
       it('sets bidfloors in ttxRequest if there is a floor', function() {
@@ -723,15 +1028,352 @@ describe('33acrossBidAdapter:', function () {
         };
 
         const ttxRequest = new TtxRequestBuilder()
-          .withFormatFloors([ 1.0, 0.10 ])
+          .withBanner()
+          .withProduct()
+          .withFormatFloors('banner', [ 1.0, 0.10 ])
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    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()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct('instream')
           .build();
 
+        ttxRequest.imp[0].video.placement = 1;
+        ttxRequest.imp[0].video.startdelay = 0;
+
         const serverRequest = new ServerRequestBuilder()
           .withData(ttxRequest)
           .build();
-        const builtServerRequests = spec.buildRequests(bidRequests, {});
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      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 [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        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()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct('siab')
+          .build();
+
+        ttxRequest.imp[0].video.placement = 2;
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('builds siab request with video params passed', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream', placement: 3, playbackmethod: [2]})
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo({placement: 3, playbackmethod: [2]})
+          .withProduct('siab')
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when mediaType has banner only', function() {
+      it('builds default siab request', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct('siab')
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('builds default inview request when product is set as such', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withProduct('inview')
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withProduct('inview')
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when mediaType has banner and video', function() {
+      it('builds siab request with banner and outstream video', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withVideo()
+          .withProduct('siab')
+          .build();
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+
+      it('builds siab request with banner and outstream video even when context is instream', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withBanner()
+            .withVideo({context: 'instream'})
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withBanner()
+          .withVideo()
+          .withProduct('siab')
+          .build();
+
+        ttxRequest.imp[0].video.placement = 2;
+
+        const serverRequest = new ServerRequestBuilder()
+          .withData(ttxRequest)
+          .build();
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        validateBuiltServerRequest(builtServerRequest, serverRequest);
+      });
+    });
+
+    context('when price floor module is enabled for video in bidRequest', function() {
+      it('does not set any bidfloors in video if there is no floor', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
+        bidRequests[0].getFloor = () => ({});
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct()
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+
+      it('sets bidfloors in video if there is a floor', function() {
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withVideo({context: 'outstream'})
+            .build()
+        );
+
+        bidRequests[0].getFloor = ({size, currency, mediaType}) => {
+          const floor = (mediaType === 'video') ? 1.0 : 0.10
+          return (
+            {
+              floor,
+              currency: 'USD'
+            }
+          );
+        };
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withVideo()
+          .withProduct()
+          .withFloors('video', [ 1.0 ])
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+    });
+
+    context('when user ID data exists as userIdAsEids Array in bidRequest', function() {
+      it('passes userIds in eids field in ORTB request', function() {
+        const eids = [
+          {
+            'source': 'x-device-vendor-x.com',
+            'uids': [
+              {
+                'id': 'yyy',
+                'atype': 1
+              },
+              {
+                'id': 'zzz',
+                'atype': 1
+              },
+              {
+                'id': 'DB700403-9A24-4A4B-A8D5-8A0B4BE777D2',
+                'atype': 2
+              }
+            ],
+            'ext': {
+              'foo': 'bar'
+            }
+          }
+        ];
+
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withUserIds(eids)
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withUserIds(eids)
+          .withProduct()
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
 
-        expect(builtServerRequests).to.deep.equal([serverRequest]);
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+
+      it('does not validate eids ORTB', function() {
+        const eids = [1, 2, 3];
+
+        const bidRequests = (
+          new BidRequestsBuilder()
+            .withUserIds(eids)
+            .build()
+        );
+
+        const ttxRequest = new TtxRequestBuilder()
+          .withUserIds(eids)
+          .withProduct()
+          .build();
+
+        const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+        expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+      });
+    });
+
+    context('when user IDs do not exist under the userIdAsEids field in bidRequest as a non-empty Array', function() {
+      it('does not pass user IDs in the bidRequest ORTB', function() {
+        const eidsScenarios = [
+          'foo',
+          [],
+          {foo: 1}
+        ];
+
+        eidsScenarios.forEach((eids) => {
+          const bidRequests = (
+            new BidRequestsBuilder()
+              .withUserIds(eids)
+              .build()
+          );
+          bidRequests.userId = {
+            'vendorx': {
+              'source': 'x-device-vendor-x.com',
+              'uids': [
+                {
+                  'id': 'yyy',
+                  'atype': 1
+                },
+                {
+                  'id': 'zzz',
+                  'atype': 1
+                },
+                {
+                  'id': 'DB700403-9A24-4A4B-A8D5-8A0B4BE777D2',
+                  'atype': 2
+                }
+              ],
+              'ext': {
+                'foo': 'bar'
+              }
+            }
+          };
+
+          const ttxRequest = new TtxRequestBuilder()
+            .withProduct()
+            .build();
+
+          const [ builtServerRequest ] = spec.buildRequests(bidRequests, {});
+
+          expect(JSON.parse(builtServerRequest.data)).to.deep.equal(ttxRequest);
+        });
       });
     });
   });
@@ -741,6 +1383,8 @@ describe('33acrossBidAdapter:', function () {
 
     beforeEach(function() {
       ttxRequest = new TtxRequestBuilder()
+        .withBanner()
+        .withProduct()
         .withSite({
           id: SITE_ID,
           page: 'https://test-url.com'
@@ -757,7 +1401,7 @@ describe('33acrossBidAdapter:', function () {
     });
 
     context('when exactly one bid is returned', function() {
-      it('interprets and returns the single bid response', function() {
+      it('interprets and returns the single banner bid response', function() {
         const serverResponse = {
           cur: 'USD',
           ext: {},
@@ -770,7 +1414,8 @@ describe('33acrossBidAdapter:', function () {
                 crid: 1,
                 h: 250,
                 w: 300,
-                price: 0.0938
+                price: 0.0938,
+                adomain: ['advertiserdomain.com']
               }]
             }
           ]
@@ -784,12 +1429,103 @@ describe('33acrossBidAdapter:', function () {
           ad: '
I am an ad
',
           ttl: 60,
           creativeId: 1,
+          mediaType: 'banner',
           currency: 'USD',
-          netRevenue: true
+          netRevenue: true,
+          meta: {
+            advertiserDomains: ['advertiserdomain.com']
+          }
         };
 
         expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
       });
+
+      it('interprets and returns the single video bid response', function() {
+        const videoBid = '';
+        const serverResponse = {
+          cur: 'USD',
+          ext: {},
+          id: 'b1',
+          seatbid: [
+            {
+              bid: [{
+                id: '1',
+                adm: videoBid,
+                ext: {
+                  ttx: {
+                    mediaType: 'video',
+                    vastType: 'xml'
+                  }
+                },
+                crid: 1,
+                h: 250,
+                w: 300,
+                price: 0.0938,
+                adomain: ['advertiserdomain.com']
+              }]
+            }
+          ]
+        };
+        const bidResponse = {
+          requestId: 'b1',
+          bidderCode: BIDDER_CODE,
+          cpm: 0.0938,
+          width: 300,
+          height: 250,
+          ad: videoBid,
+          ttl: 60,
+          creativeId: 1,
+          mediaType: 'video',
+          currency: 'USD',
+          netRevenue: true,
+          vastXml: videoBid,
+          meta: {
+            advertiserDomains: ['advertiserdomain.com']
+          }
+        };
+
+        expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
+      });
+
+      context('when the list of advertiser domains for block list checking is empty', function() {
+        it('doesn\'t include the empty list in the interpreted response', function() {
+          const serverResponse = {
+            cur: 'USD',
+            ext: {},
+            id: 'b1',
+            seatbid: [
+              {
+                bid: [{
+                  id: '1',
+                  adm: '
I am an ad
',
+                  crid: 1,
+                  h: 250,
+                  w: 300,
+                  price: 0.0938,
+                  adomain: [] // Empty list
+                }]
+              }
+            ]
+          };
+
+          // Bid response below doesn't contain meta.advertiserDomains
+          const bidResponse = {
+            requestId: 'b1',
+            bidderCode: BIDDER_CODE,
+            cpm: 0.0938,
+            width: 300,
+            height: 250,
+            ad: '
I am an ad
',
+            ttl: 60,
+            creativeId: 1,
+            mediaType: 'banner',
+            currency: 'USD',
+            netRevenue: true
+          };
+
+          expect(spec.interpretResponse({ body: serverResponse }, serverRequest)).to.deep.equal([bidResponse]);
+        });
+      });
     });
 
     context('when no bids are returned', function() {
@@ -852,6 +1588,7 @@ describe('33acrossBidAdapter:', function () {
           ad: '
I am an ad
',
           ttl: 60,
           creativeId: 1,
+          mediaType: 'banner',
           currency: 'USD',
           netRevenue: true
         };
@@ -886,9 +1623,13 @@ describe('33acrossBidAdapter:', function () {
           },
           adUnitCode: 'div-id',
           auctionId: 'r1',
-          sizes: [
-            [300, 250]
-          ],
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250]
+              ]
+            }
+          },
           transactionId: 't1'
         },
         {
@@ -901,9 +1642,13 @@ describe('33acrossBidAdapter:', function () {
           },
           adUnitCode: 'div-id',
           auctionId: 'r1',
-          sizes: [
-            [300, 250]
-          ],
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [300, 250]
+              ]
+            }
+          },
           transactionId: 't2'
         }
       ];
diff --git a/test/spec/modules/a4gBidAdapter_spec.js b/test/spec/modules/a4gBidAdapter_spec.js
new file mode 100644
index 00000000000..a9ead9fd021
--- /dev/null
+++ b/test/spec/modules/a4gBidAdapter_spec.js
@@ -0,0 +1,235 @@
+import { expect } from 'chai';
+import { spec } from 'modules/a4gBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+describe('a4gAdapterTests', function () {
+  describe('bidRequestValidity', function () {
+    it('bidRequest with zoneId and deliveryUrl params', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          zoneId: 59304,
+          deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest with only zoneId', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          zoneId: 59304
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest with only deliveryUrl', function () {
+      expect(spec.isBidRequestValid({
+        bidder: 'a4g',
+        params: {
+          deliveryUrl: 'http://dev01.ad4game.com/v1/bid'
+        }
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', function () {
+    const DEFAULT_OPTION = {
+      refererInfo: {
+        referer: 'https://www.prebid.org',
+        canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+      }
+    };
+
+    const bidRequests = [{
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59304,
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'sizes': [[320, 50], [300, 250], [300, 600]],
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }, {
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59354,
+        'deliveryUrl': '//dev01.ad4game.com/v1/bid'
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }];
+
+    it('bidRequest method', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('bidRequest url', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.url).to.match(new RegExp(`${bidRequests[1].params.deliveryUrl}`));
+    });
+
+    it('bidRequest data', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.data).to.exist;
+    });
+
+    it('bidRequest zoneIds', function () {
+      const request = spec.buildRequests(bidRequests, DEFAULT_OPTION);
+      expect(request.data.zoneId).to.equal('59304;59354');
+    });
+
+    it('bidRequest gdpr consent', function () {
+      const consentString = 'consentString';
+      const bidderRequest = {
+        bidderCode: 'a4g',
+        auctionId: '18fd8b8b0bd757',
+        bidderRequestId: '418b37f85e772c',
+        timeout: 3000,
+        gdprConsent: {
+          consentString: consentString,
+          gdprApplies: true
+        },
+        refererInfo: {
+          referer: 'https://www.prebid.org',
+          canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+        }
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(request.data.gdpr).to.exist;
+      expect(request.data.gdpr.applies).to.exist.and.to.be.true;
+      expect(request.data.gdpr.consent).to.exist.and.to.equal(consentString);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidRequest = [{
+      'bidder': 'a4g',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'zoneId': 59304,
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 50], [300, 250], [300, 600]]
+        }
+      },
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    }];
+
+    const bidResponse = {
+      body: [{
+        'id': '51ef8751f9aead',
+        'ad': 'test ad',
+        'width': 320,
+        'height': 250,
+        'cpm': 5.2,
+        'crid': '111'
+      }],
+      headers: {}
+    };
+
+    it('should get correct bid response for banner ad', function () {
+      const expectedParse = [
+        {
+          requestId: '51ef8751f9aead',
+          cpm: 5.2,
+          creativeId: '111',
+          width: 320,
+          height: 250,
+          ad: 'test ad',
+          currency: 'USD',
+          ttl: 120,
+          netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          }
+
+        }
+      ];
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
+    it('should set creativeId to default value if not provided', function () {
+      const bidResponseWithoutCrid = utils.deepClone(bidResponse);
+      delete bidResponseWithoutCrid.body[0].crid;
+      const expectedParse = [
+        {
+          requestId: '51ef8751f9aead',
+          cpm: 5.2,
+          creativeId: '51ef8751f9aead',
+          width: 320,
+          height: 250,
+          ad: 'test ad',
+          currency: 'USD',
+          ttl: 120,
+          netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          }
+        }
+      ];
+      const result = spec.interpretResponse(bidResponseWithoutCrid, bidRequest);
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    })
+
+    it('required keys', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let requiredKeys = [
+        'requestId',
+        'creativeId',
+        'adId',
+        'cpm',
+        'width',
+        'height',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'ad',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function(key) {
+        expect(requiredKeys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('adId should not be equal to requestId', function () {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].requestId).to.not.equal(result[0].adId);
+    })
+
+    it('advertiserDomains is included when sent by server', function () {
+      bidResponse.body[0].adomain = ['test_adomain'];
+      let response = spec.interpretResponse(bidResponse, bidRequest);
+      expect(Object.keys(response[0].meta)).to.include.members(['advertiserDomains']);
+      expect(response[0].meta.advertiserDomains).to.deep.equal(['test_adomain']);
+      delete bidResponse.body[0].adomain;
+    });
+  });
+});
diff --git a/test/spec/modules/ablidaBidAdapter_spec.js b/test/spec/modules/ablidaBidAdapter_spec.js
index 0238c14fe5c..73109d8cf16 100644
--- a/test/spec/modules/ablidaBidAdapter_spec.js
+++ b/test/spec/modules/ablidaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {assert, expect} from 'chai';
 import {spec} from 'modules/ablidaBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
 
 const ENDPOINT_URL = 'https://bidder.ablida.net/prebid';
 
@@ -8,17 +9,23 @@ describe('ablidaBidAdapter', function () {
   const adapter = newBidder(spec);
   describe('isBidRequestValid', function () {
     let bid = {
+      adUnitCode: 'adunit-code',
+      auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+      bidRequestsCount: 1,
       bidder: 'ablida',
+      bidderRequestId: '14d2939272a26a',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      bidId: '1234asdf1234',
+      mediaTypes: {banner: {sizes: [[300, 250]]}},
       params: {
         placementId: 123
       },
-      adUnitCode: 'adunit-code',
       sizes: [
         [300, 250]
       ],
-      bidId: '1234asdf1234',
-      bidderRequestId: '1234asdf1234asdf',
-      auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0'
+      src: 'client',
+      transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
     };
     it('should return true where required params found', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
@@ -27,22 +34,29 @@ describe('ablidaBidAdapter', function () {
   describe('buildRequests', function () {
     let bidRequests = [
       {
+        adUnitCode: 'adunit-code',
+        auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+        bidId: '23beaa6af6cdde',
+        bidRequestsCount: 1,
         bidder: 'ablida',
+        bidderRequestId: '14d2939272a26a',
+        bidderRequestsCount: 1,
+        bidderWinsCount: 0,
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
         params: {
           placementId: 123
         },
         sizes: [
           [300, 250]
         ],
-        adUnitCode: 'adunit-code',
-        bidId: '23beaa6af6cdde',
-        bidderRequestId: '14d2939272a26a',
-        auctionId: '69e8fef8-5105-4a99-b011-d5669f3bc7f0',
+        src: 'client',
+        transactionId: '4781e6ac-93c4-42ba-86fe-ab5f278863cf'
       }
     ];
 
     let bidderRequests = {
       refererInfo: {
+        canonicalUrl: '',
         numIframes: 0,
         reachedTop: true,
         referer: 'http://example.com',
@@ -61,42 +75,53 @@ describe('ablidaBidAdapter', function () {
       method: 'POST',
       url: ENDPOINT_URL,
       data: {
+        adapterVersion: 5,
+        bidId: '2b8c4de0116e54',
+        categories: undefined,
+        device: 'desktop',
+        gdprConsent: undefined,
+        jaySupported: true,
+        mediaTypes: {banner: {sizes: [[300, 250]]}},
         placementId: 'testPlacementId',
         width: 300,
         height: 200,
-        bidId: '2b8c4de0116e54',
-        jaySupported: true,
-        device: 'desktop',
-        referer: 'www.example.com',
-        adapterVersion: 2
+        referer: 'www.example.com'
       }
     };
     let serverResponse = {
       body: [{
-        requestId: '2b8c4de0116e54',
+        ad: '',
         cpm: 1.00,
-        width: 300,
-        height: 250,
         creativeId: '2b8c4de0116e54',
         currency: 'EUR',
+        height: 250,
+        mediaType: 'banner',
+        meta: {},
         netRevenue: true,
+        nurl: 'https://example.com/some-tracker',
+        originalCpm: '0.10',
+        originalCurrency: 'EUR',
+        requestId: '2b8c4de0116e54',
         ttl: 3000,
-        ad: '',
-        nurl: 'https://example.com/some-tracker'
+        width: 300
       }]
     };
     it('should get the correct bid response', function () {
       let expectedResponse = [{
-        requestId: '2b8c4de0116e54',
+        ad: '',
         cpm: 1.00,
-        width: 300,
-        height: 250,
         creativeId: '2b8c4de0116e54',
         currency: 'EUR',
+        height: 250,
+        mediaType: 'banner',
+        meta: {},
         netRevenue: true,
+        nurl: 'https://example.com/some-tracker',
+        originalCpm: '0.10',
+        originalCurrency: 'EUR',
+        requestId: '2b8c4de0116e54',
         ttl: 3000,
-        ad: '',
-        nurl: 'https://example.com/some-tracker'
+        width: 300
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
@@ -104,16 +129,23 @@ describe('ablidaBidAdapter', function () {
   });
 
   describe('onBidWon', function() {
-    it('Should not ajax call if bid does not contain nurl', function() {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if bid does not contain nurl', function() {
       const result = spec.onBidWon({});
-      expect(result).to.equal(false)
+      expect(utils.triggerPixel.callCount).to.equal(0)
     })
 
-    it('Should ajax call if bid nurl', function() {
+    it('Should trigger pixel if bid nurl', function() {
       const result = spec.onBidWon({
         nurl: 'https://example.com/some-tracker'
       });
-      expect(result).to.equal(true)
+      expect(utils.triggerPixel.callCount).to.equal(1)
     })
   })
 });
diff --git a/test/spec/modules/adWMGBidAdapter_spec.js b/test/spec/modules/adWMGBidAdapter_spec.js
new file mode 100644
index 00000000000..db536ca14e2
--- /dev/null
+++ b/test/spec/modules/adWMGBidAdapter_spec.js
@@ -0,0 +1,335 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adWMGBidAdapter.js';
+import { config } from 'src/config.js';
+
+describe('adWMGBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid;
+    beforeEach(function() {
+      bid = {
+        bidder: 'adWMG',
+        params: {
+          publisherId: '5cebea3c9eea646c7b623d5e'
+        },
+        mediaTypes: {
+          banner: {
+            size: [[300, 250]]
+          }
+        }
+      };
+    });
+
+    it('should return true when valid bid request is set', function() {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when bidder is not set to "adWMG"', function() {
+      bid.bidder = 'bidder';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when \'publisherId\' param are not set', function() {
+      delete bid.params.publisherId;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('parseUserAgent', function() {
+    let ua_desktop, ua_mobile, ua_tv, ua_tablet;
+    beforeEach(function() {
+      ua_desktop = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36';
+      ua_tv = 'Mozilla/5.0 (Linux; NetCast; U) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/38.0.2125.122 Safari/537.31 SmartTV/7.0';
+      ua_mobile = 'Mozilla/5.0 (Linux; Android 7.0; SAMSUNG SM-G610M Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/7.2 Chrome/59.0.3071.125 Mobile Safari/537.36';
+      ua_tablet = 'Mozilla/5.0 (iPad; CPU OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Version/7.0 Mobile/11D257 Safari/9537.53';
+    });
+
+    it('should return correct device type: desktop', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.devicetype).to.equal(2);
+    });
+
+    it('should return correct device type: TV', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tv);
+      expect(userDeviceInfo.devicetype).to.equal(3);
+    });
+
+    it('should return correct device type: mobile', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_mobile);
+      expect(userDeviceInfo.devicetype).to.equal(4);
+    });
+
+    it('should return correct device type: tablet', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_tablet);
+      expect(userDeviceInfo.devicetype).to.equal(5);
+    });
+
+    it('should return correct OS name', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.os).to.equal('Windows');
+    });
+
+    it('should return correct OS version', function() {
+      let userDeviceInfo = spec.parseUserAgent(ua_desktop);
+      expect(userDeviceInfo.osv).to.equal('10.0');
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests;
+    beforeEach(function() {
+      bidRequests = [
+        {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad',
+          auctionId: 'test-auction-id',
+          bidId: 'test-bid-id',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid123',
+          transactionId: 'transaction-id-123',
+          sizes: [[300, 250]],
+          requestId: 'requestid123',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[300, 250]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-123'
+          }
+        }, {
+          bidder: 'adWMG',
+          adUnitCode: 'adwmg-test-ad-2',
+          auctionId: 'test-auction-id-2',
+          bidId: 'test-bid-id-2',
+          bidRequestsCount: 1,
+          bidderRequestId: 'bidderrequestid456',
+          transactionId: 'transaction-id-456',
+          sizes: [[320, 50]],
+          requestId: 'requestid456',
+          params: {
+            floorPrice: 100,
+            currency: 'USD'
+          },
+          mediaTypes: {
+            banner: {
+              size: [[320, 50]]
+            }
+          },
+          userId: {
+            pubcid: 'pubc-id-456'
+          }
+        }
+      ];
+    });
+
+    let bidderRequest = {
+      refererInfo: {
+        referer: 'https://test.com'
+      },
+      gdprConsent: {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      }
+    };
+
+    it('should not contain a sizes when sizes is not set', function() {
+      delete bidRequests[0].sizes;
+      delete bidRequests[1].sizes;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).sizes).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).sizes).to.be.an('undefined');
+    });
+
+    it('should not contain a userId when userId is not set', function() {
+      delete bidRequests[0].userId;
+      delete bidRequests[1].userId;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).userId).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).userId).to.be.an('undefined');
+    });
+
+    it('should have a post method', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[1].method).to.equal('POST');
+    });
+
+    it('should contain a request id equals to the bid id', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).requestId).to.equal(bidRequests[0].bidId);
+      expect(JSON.parse(requests[1].data).requestId).to.equal(bidRequests[1].bidId);
+    });
+
+    it('should have an url that match the default endpoint', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal('https://hb.adwmg.com/hb');
+      expect(requests[1].url).to.equal('https://hb.adwmg.com/hb');
+    });
+
+    it('should contain GDPR consent data if GDPR set', function() {
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[0].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(JSON.parse(requests[1].data).gdpr.applies).to.be.true;
+      expect(JSON.parse(requests[1].data).gdpr.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+    })
+
+    it('should not contain GDPR consent data if GDPR not set', function() {
+      delete bidderRequest.gdprConsent;
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).gdpr).to.be.an('undefined');
+      expect(JSON.parse(requests[1].data).gdpr).to.be.an('undefined');
+    })
+
+    it('should set debug mode in requests if enabled', function() {
+      sinon.stub(config, 'getConfig').withArgs('debug').returns(true);
+      let requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(JSON.parse(requests[0].data).debug).to.be.true;
+      expect(JSON.parse(requests[1].data).debug).to.be.true;
+      config.getConfig.restore();
+    })
+  });
+
+  describe('interpretResponse', function () {
+    let serverResponse;
+    beforeEach(function() {
+      serverResponse = {
+        body: {
+          'requestId': 'request-id',
+          'cpm': 100,
+          'width': 300,
+          'height': 250,
+          'ad': '
ad
',
+          'ttl': 300,
+          'creativeId': 'creative-id',
+          'netRevenue': true,
+          'currency': 'USD',
+          'adomain': ['testdomain.com']
+        }
+      };
+    });
+
+    it('should return a valid response', () => {
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.be.an('array').that.is.not.empty;
+
+      let response = responses[0];
+      expect(response).to.have.all.keys('requestId', 'cpm', 'width', 'height', 'meta', 'ad', 'ttl', 'creativeId',
+        'netRevenue', 'currency');
+      expect(response.requestId).to.equal('request-id');
+      expect(response.cpm).to.equal(100);
+      expect(response.width).to.equal(300);
+      expect(response.height).to.equal(250);
+      expect(response.ad).to.equal('
ad
');
+      expect(response.ttl).to.equal(300);
+      expect(response.creativeId).to.equal('creative-id');
+      expect(response.netRevenue).to.be.true;
+      expect(response.currency).to.equal('USD');
+      expect(response.meta.advertiserDomains[0]).to.equal('testdomain.com');
+      expect(response.meta.mediaType).to.equal('banner');
+    });
+
+    it('should return an empty array when serverResponse is empty', () => {
+      serverResponse = {};
+      var responses = spec.interpretResponse(serverResponse);
+      expect(responses).to.deep.equal([]);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    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 iframe sync when only iframe is enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': false
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://hb.adwmg.com/cphb.html?');
+    });
+
+    it('should register iframe sync when iframe and image are enabled', function () {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+
+      let syncs = spec.getUserSyncs(syncOptions);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).includes('https://hb.adwmg.com/cphb.html?');
+    });
+
+    it('should send GDPR consent if enabled', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url).includes('gdpr=1');
+      expect(syncs[0].url).includes(`gdpr_consent=${gdprConsent.consentString}`);
+    });
+
+    it('should not add GDPR consent params twice', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const gdprConsent2 = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_7_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent2);
+      expect(syncs[0].url.match(/gdpr/g).length).to.equal(2); // gdpr + gdpr_consent
+      expect(syncs[0].url.match(/gdpr_consent/g).length).to.equal(1);
+    });
+
+    it('should delete \'&\' symbol at the end of usersync URL', function() {
+      const syncOptions = {
+        'iframeEnabled': true,
+        'pixelEnabled': true
+      };
+      const gdprConsent = {
+        consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+        vendorData: {},
+        gdprApplies: true,
+        apiVersion: 2
+      };
+      const serverResponse = {};
+      let syncs = spec.getUserSyncs(syncOptions, serverResponse, gdprConsent);
+      expect(syncs[0].url.slice(-1)).to.not.equal('&');
+    });
+  });
+});
diff --git a/test/spec/modules/adagioBidAdapter_spec.js b/test/spec/modules/adagioBidAdapter_spec.js
index 97265121ce0..4b66a96be16 100644
--- a/test/spec/modules/adagioBidAdapter_spec.js
+++ b/test/spec/modules/adagioBidAdapter_spec.js
@@ -1,678 +1,891 @@
-import { expect } from 'chai';
-import { adagioScriptFromLocalStorageCb, _features, spec } from 'modules/adagioBidAdapter.js';
-import { newBidder } from 'src/adapters/bidderFactory.js';
-import * as utils from 'src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
+import { expect, util } from 'chai';
+import {
+  _features,
+  internal as adagio,
+  adagioScriptFromLocalStorageCb,
+  getAdagioScript,
+  storage,
+  spec,
+  ENDPOINT,
+  VERSION,
+  RENDERER_URL
+} 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';
+
+const BidRequestBuilder = function BidRequestBuilder(options) {
+  const defaults = {
+    request: {
+      auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+      adUnitCode: 'adunit-code',
+      bidder: 'adagio'
+    },
+    params: {
+      organizationId: '1000',
+      placement: 'PAVE_ATF',
+      site: 'SITE-NAME',
+      adUnitElementId: 'gpt-adunit-code'
+    },
+    sizes: [[300, 250], [300, 600]],
+  };
+
+  const request = {
+    ...defaults.request,
+    ...options
+  };
+
+  this.withParams = (options) => {
+    request.params = {
+      ...defaults.params,
+      ...options
+    };
+    return this;
+  };
+
+  this.build = () => request;
+};
+
+const BidderRequestBuilder = function BidderRequestBuilder(options) {
+  const defaults = {
+    bidderCode: 'adagio',
+    auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+    bidderRequestId: '7g36s867Tr4xF90X',
+    timeout: 3000,
+    refererInfo: {
+      numIframes: 0,
+      reachedTop: true,
+      referer: 'http://test.io/index.html?pbjs_debug=true'
+    }
+  };
+
+  const request = {
+    ...defaults,
+    ...options
+  };
+
+  this.build = () => request;
+};
 
-describe('adagioAdapter', () => {
+describe('Adagio bid adapter', () => {
+  let adagioMock;
   let utilsMock;
-  const adapter = newBidder(spec);
-  const ENDPOINT = 'https://mp.4dex.io/prebid';
-  const VERSION = '2.2.2';
+  let sandbox;
+
+  const fixtures = {
+    getElementById(width, height, x, y) {
+      const obj = {
+        x: x || 800,
+        y: y || 300,
+        width: width || 300,
+        height: height || 250,
+      };
 
-  beforeEach(function() {
-    localStorage.removeItem('adagioScript');
+      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
+          };
+        }
+      };
+    }
+  };
+
+  // safeFrame implementation
+  const $sf = {
+    ext: {
+      geom: function() {}
+    }
+  };
+
+  beforeEach(() => {
+    window.ADAGIO = {};
+    window.ADAGIO.adUnits = {};
+    window.ADAGIO.pbjsAdUnits = [];
+    window.ADAGIO.queue = [];
+    window.ADAGIO.versions = {};
+    window.ADAGIO.versions.adagioBidderAdapter = VERSION;
+    window.ADAGIO.pageviewId = 'dda61753-4059-4f75-b0bf-3f60bd2c4d9a';
+
+    adagioMock = sinon.mock(adagio);
     utilsMock = sinon.mock(utils);
+
+    sandbox = sinon.createSandbox();
   });
 
-  afterEach(function() {
+  afterEach(() => {
+    window.ADAGIO = undefined;
+
+    adagioMock.restore();
     utilsMock.restore();
-  });
 
-  describe('inherited functions', () => {
-    it('exists and is a function', () => {
-      expect(adapter.callBids).to.exist.and.to.be.a('function');
-    });
+    sandbox.restore();
   });
 
-  describe('isBidRequestValid', () => {
-    let sandbox;
-    beforeEach(function () {
-      sandbox = sinon.sandbox.create();
-      let element = {
-        x: 0,
-        y: 0,
-        width: 200,
-        height: 300,
-        getBoundingClientRect: () => {
-          return {
-            width: element.width,
-            height: element.height,
-            left: element.x,
-            top: element.y,
-            right: element.x + element.width,
-            bottom: element.y + element.height
-          };
-        }
-      };
-      sandbox.stub(document, 'getElementById').withArgs('banner-atf').returns(element);
-    });
+  describe('isBidRequestValid()', function() {
+    it('should return true when required params have been found', function() {
+      const bid = new BidRequestBuilder().withParams().build();
 
-    afterEach(function () {
-      sandbox.restore();
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
-    const bid = {
-      'bidder': 'adagio',
-      'params': {
-        organizationId: '0',
-        placement: 'PAVE_ATF',
-        site: 'SITE-NAME',
-        pagetype: 'ARTICLE',
-        adUnitElementId: 'banner-atf'
-      },
-      'adUnitCode': 'adunit-code',
-      'sizes': [[300, 250], [300, 600]],
-      'bidId': 'c180kg4267tyqz',
-      'bidderRequestId': '8vfscuixrovn8i',
-      'auctionId': 'lel4fhp239i9km',
-    };
+    it('should return false if bid.params is missing', function() {
+      sandbox.spy(utils, 'logWarn');
+      const bid01 = new BidRequestBuilder().build();
 
-    const bidWithMediaTypes = {
-      'bidder': 'adagio',
-      'params': {
-        organizationId: '0',
-        placement: 'PAVE_ATF',
-        site: 'SITE-NAME',
-        pagetype: 'ARTICLE',
-        adUnitElementId: 'banner-atf'
-      },
-      'adUnitCode': 'adunit-code-2',
-      'mediaTypes': {
-        banner: {
-          sizes: [[300, 250]],
-        }
-      },
-      sizes: [[300, 600]],
-      'bidId': 'c180kg4267tyqz',
-      'bidderRequestId': '8vfscuixrovn8i',
-      'auctionId': 'lel4fhp239i9km',
-    }
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+      sinon.assert.callCount(utils.logWarn, 1);
+    });
 
-    it('should return true when required params found', () => {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(1);
+    it('should use adUnit code for adUnitElementId and placement params', function() {
+      const bid01 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        site: 'site-name',
+        useAdUnitCodeAsPlacement: true,
+        useAdUnitCodeAsAdUnitElementId: true
+      }}).build();
+
+      expect(spec.isBidRequestValid(bid01)).to.equal(true);
+      expect(bid01.params.adUnitElementId).to.equal('adunit-code');
+      expect(bid01.params.placement).to.equal('adunit-code');
     })
 
-    it('should compute a printNumber for the new bid request on same adUnitCode and same pageviewId', () => {
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits).ok;
-      expect(window.top.ADAGIO.adUnits['adunit-code']).ok;
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(2);
+    it('should return false when a required param is missing', function() {
+      const bid01 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        placement: 'PAVE_ATF'
+      }}).build();
 
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(3);
+      const bid02 = new BidRequestBuilder({ params: {
+        organizationId: '1000',
+        site: 'SITE-NAME'
+      }}).build();
 
-      window.top.ADAGIO.pageviewId = 123;
-      spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.adUnits['adunit-code'].printNumber).to.equal(1);
-    });
+      const bid03 = new BidRequestBuilder({ params: {
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME'
+      }}).build();
 
-    it('should return false when organization params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.organizationId;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
+      expect(spec.isBidRequestValid(bid01)).to.equal(false);
+      expect(spec.isBidRequestValid(bid02)).to.equal(false);
+      expect(spec.isBidRequestValid(bid03)).to.equal(false);
     });
 
-    it('should return false when site params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.site;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
-    });
+    it('should return false when refererInfo.reachedTop is false', function() {
+      sandbox.spy(utils, 'logWarn');
+      sandbox.stub(adagio, 'getRefererInfo').returns({ reachedTop: false });
+      const bid = new BidRequestBuilder().withParams().build();
 
-    it('should return false when placement params is not passed', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.placement;
-      expect(spec.isBidRequestValid(bidTest)).to.equal(false);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      sinon.assert.callCount(utils.logWarn, 1);
+      sinon.assert.calledWith(utils.logWarn, 'Adagio: the main page url is unreachabled.');
     });
 
-    it('should add autodetected adUnitElementId and environment params', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.adUnitElementId;
-      delete bidTest.params.environment;
-      sandbox.stub(utils, 'getGptSlotInfoForAdUnitCode').returns({divId: 'banner-atf'});
-      sandbox.stub(_features, 'getDevice').returns(4);
-      spec.isBidRequestValid(bidTest)
-      expect(bidTest.params.adUnitElementId).to.equal('banner-atf');
-      expect(bidTest.params.environment).to.equal('mobile');
-    })
+    it('should log warning and enqueue the bid object in ADAGIO.queue when isBidRequestValid is false', function() {
+      sandbox.stub(Date, 'now').returns(12345);
+      sandbox.spy(utils, 'logWarn');
+      sandbox.spy(adagio, 'enqueue');
 
-    it('should add autodetected tablet environment params', () => {
-      const bidTest = utils.deepClone(bid);
-      delete bidTest.params.environment;
-      sandbox.stub(_features, 'getDevice').returns(5);
-      spec.isBidRequestValid(bidTest)
-      expect(bidTest.params.environment).to.equal('tablet');
-    })
+      const bid = new BidRequestBuilder({'params': {
+        organizationId: '1000',
+        placement: 'PAVE_ATF'
+      }}).build();
 
-    it('should return false if not in the window.top', () => {
-      sandbox.stub(utils, 'getWindowTop').throws();
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
-    });
+      const expectedEnqueued = {
+        action: 'pb-dbg',
+        ts: 12345,
+        data: { bid }
+      };
 
-    it('should expose ADAGIO.pbjsAdUnits in window', () => {
-      spec.isBidRequestValid(bidWithMediaTypes);
       spec.isBidRequestValid(bid);
-      expect(window.top.ADAGIO.pbjsAdUnits).ok;
-      expect(window.top.ADAGIO.pbjsAdUnits).to.have.lengthOf(2);
-      const adUnitWithMediaTypeSizes = window.top.ADAGIO.pbjsAdUnits.filter((aU) => aU.code === 'adunit-code-2')[0];
-      const adUnitWithSizes = window.top.ADAGIO.pbjsAdUnits.filter((aU) => aU.code === 'adunit-code')[0];
-      expect(adUnitWithMediaTypeSizes.sizes).to.eql([[300, 250]]);
-      expect(adUnitWithSizes.sizes).to.eql([[300, 250], [300, 600]]);
+
+      sinon.assert.calledWith(adagio.enqueue, expectedEnqueued);
+      sinon.assert.callCount(utils.logWarn, 1);
     });
-  });
 
-  describe('buildRequests', () => {
-    const sandbox = sinon.createSandbox();
+    describe('Store ADAGIO global in window.top or window.self depending on context', function() {
+      const bid01 = new BidRequestBuilder({
+        adUnitCode: 'adunit-code-01',
+        sizes: [[300, 250], [300, 600]]
+      }).withParams().build();
 
-    const banner300x250 = {
-      x: 0,
-      y: 0,
-      width: 300,
-      height: 250,
-      getBoundingClientRect: () => {
-        return {
-          width: banner300x250.width,
-          height: banner300x250.height,
-          left: banner300x250.x,
-          top: banner300x250.y,
-          right: banner300x250.x + banner300x250.width,
-          bottom: banner300x250.y + banner300x250.height
-        };
-      },
-    };
+      const bid02 = new BidRequestBuilder({
+        adUnitCode: 'adunit-code-02',
+        mediaTypes: {
+          banner: { sizes: [[300, 250]] }
+        },
+      }).withParams().build();
 
-    const banner300x600 = {
-      x: 0,
-      y: 0,
-      width: 300,
-      height: 600,
-      getBoundingClientRect: () => {
-        return {
-          width: banner300x600.width,
-          height: banner300x600.height,
-          left: banner300x600.x,
-          top: banner300x600.y,
-          right: banner300x600.x + banner300x600.width,
-          bottom: banner300x600.y + banner300x600.height
+      const bid03 = new BidRequestBuilder({
+        adUnitCode: 'adunit-code-02',
+        mediaTypes: {
+          banner: { sizes: [[300, 600]] }
+        },
+      }).withParams().build();
+
+      const expected = [
+        {
+          code: 'adunit-code-01',
+          sizes: [[300, 250], [300, 600]],
+          mediaTypes: {},
+          bids: [{
+            bidder: 'adagio',
+            params: {
+              organizationId: '1000',
+              placement: 'PAVE_ATF',
+              site: 'SITE-NAME',
+              adUnitElementId: 'gpt-adunit-code',
+              environment: 'desktop',
+              supportIObs: true
+            }
+          }],
+          auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+          pageviewId: 'dda61753-4059-4f75-b0bf-3f60bd2c4d9a',
+          printNumber: 1,
+        },
+        {
+          code: 'adunit-code-02',
+          sizes: [[300, 600]],
+          mediaTypes: {
+            banner: { sizes: [[300, 600]] }
+          },
+          bids: [{
+            bidder: 'adagio',
+            params: {
+              organizationId: '1000',
+              placement: 'PAVE_ATF',
+              site: 'SITE-NAME',
+              adUnitElementId: 'gpt-adunit-code',
+              environment: 'desktop',
+              supportIObs: true
+            }
+          }],
+          auctionId: '4fd1ca2d-846c-4211-b9e5-321dfe1709c9',
+          pageviewId: 'dda61753-4059-4f75-b0bf-3f60bd2c4d9a',
+          printNumber: 2,
+        }
+      ];
+
+      it('should store bids config once by bid in window.top if it accessible', function() {
+        sandbox.stub(adagio, 'getCurrentWindow').returns(window.top);
+        sandbox.stub(adagio, 'supportIObs').returns(true);
+
+        // replace by the values defined in beforeEach
+        window.top.ADAGIO = {
+          ...window.ADAGIO
         };
-      },
-    };
 
-    const computedStyleBlock = {
-      display: 'block'
-    };
+        spec.isBidRequestValid(bid01);
+        spec.isBidRequestValid(bid02);
+        spec.isBidRequestValid(bid03);
 
-    const computedStyleNone = {
-      display: 'none'
-    };
+        expect(find(window.top.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-01')).to.deep.eql(expected[0]);
+        expect(find(window.top.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-02')).to.deep.eql(expected[1]);
+      });
 
-    const stubs = {
-      topGetElementById: undefined,
-      topGetComputedStyle: undefined
-    }
+      it('should detect IntersectionObserver support', function() {
+        sandbox.stub(adagio, 'getCurrentWindow').returns(window.top);
+        sandbox.stub(adagio, 'supportIObs').returns(false);
 
-    top.ADAGIO = top.ADAGIO || {};
-    top.ADAGIO.adUnits = top.ADAGIO.adUnits || {};
-    top.ADAGIO.pbjsAdUnits = top.ADAGIO.pbjsAdUnits || [];
+        window.top.ADAGIO = {
+          ...window.ADAGIO
+        };
 
-    beforeEach(function () {
-      stubs.topGetElementById = sandbox.stub(top.document, 'getElementById');
-      stubs.topGetComputedStyle = sandbox.stub(top, 'getComputedStyle');
+        spec.isBidRequestValid(bid01);
+        const validBidReq = find(window.top.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-01');
+        expect(validBidReq.bids[0].params.supportIObs).to.equal(false);
+      });
 
-      stubs.topGetElementById.withArgs('banner-atf-123').returns(banner300x250);
-      stubs.topGetElementById.withArgs('banner-atf-456').returns(banner300x600);
-      stubs.topGetElementById.withArgs('does-not-exist').returns(null);
-      stubs.topGetComputedStyle.returns(computedStyleBlock);
-    });
+      it('should store bids config once by bid in current window', function() {
+        sandbox.stub(adagio, 'getCurrentWindow').returns(window.self);
+        sandbox.stub(adagio, 'supportIObs').returns(true);
 
-    afterEach(function () {
-      sandbox.restore();
-    });
+        spec.isBidRequestValid(bid01);
+        spec.isBidRequestValid(bid02);
+        spec.isBidRequestValid(bid03);
 
-    after(function() {
-      sandbox.reset();
-    })
+        expect(find(window.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-01')).to.deep.eql(expected[0]);
+        expect(find(window.ADAGIO.pbjsAdUnits, aU => aU.code === 'adunit-code-02')).to.deep.eql(expected[1]);
+      });
+    });
+  });
 
-    let bidRequests = [
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '123',
-          site: 'ADAGIO-123',
-          placement: 'PAVE_ATF-123',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-123'
-        },
-        'adUnitCode': 'adunit-code1',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      },
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '123',
-          site: 'ADAGIO-123',
-          placement: 'PAVE_ATF-123',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-123'
-        },
-        'adUnitCode': 'adunit-code2',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      },
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '456',
-          site: 'ADAGIO-456',
-          placement: 'PAVE_ATF-456',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-456'
-        },
-        'adUnitCode': 'adunit-code3',
-        'mediaTypes': {
-          banner: {
-            sizes: [[300, 250]]
-          }
-        },
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      }
+  describe('buildRequests()', function() {
+    const expectedDataKeys = [
+      'id',
+      'organizationId',
+      'secure',
+      'device',
+      'site',
+      'pageviewId',
+      'adUnits',
+      'regs',
+      'user',
+      'schain',
+      'prebidVersion',
+      'adapterVersion',
+      'featuresVersion',
+      'data'
     ];
 
-    const bidRequestsWithPostBid = [
-      {
-        'bidder': 'adagio',
-        'params': {
-          organizationId: '456',
-          site: 'ADAGIO-456',
-          placement: 'PAVE_ATF-456',
-          pagetype: 'ARTICLE',
-          adUnitElementId: 'banner-atf-456',
-          postBid: true
-        },
-        'adUnitCode': 'adunit-code3',
-        'sizes': [[300, 250], [300, 600]],
-        'bidId': 'c180kg4267tyqz',
-        'bidderRequestId': '8vfscuixrovn8i',
-        'auctionId': 'lel4fhp239i9km',
-      }
-    ];
+    it('groups requests by organizationId', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bid02 = new BidRequestBuilder().withParams().build();
+      const bid03 = new BidRequestBuilder().withParams({
+        organizationId: '1002'
+      }).build();
 
-    let consentString = 'theConsentString';
-    let bidderRequest = {
-      'bidderCode': 'adagio',
-      'auctionId': '12jejebn',
-      'bidderRequestId': 'hehehehbeheh',
-      'timeout': 3000,
-      'gdprConsent': {
-        consentString: consentString,
-        gdprApplies: true,
-        allowAuctionWithoutConsent: true,
-        apiVersion: 1,
-      },
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'http://test.io/index.html?pbjs_debug=true'
-      }
-    };
+      const bidderRequest = new BidderRequestBuilder().build();
 
-    let bidderRequestTCF2 = {
-      'bidderCode': 'adagio',
-      'auctionId': '12jejebn',
-      'bidderRequestId': 'hehehehbeheh',
-      'timeout': 3000,
-      'gdprConsent': {
-        consentString: consentString,
-        vendorData: {
-          tcString: consentString,
-          gdprApplies: true
-        },
-        gdprApplies: true,
-        apiVersion: 2
-      },
-      'refererInfo': {
-        'numIframes': 0,
-        'reachedTop': true,
-        'referer': 'http://test.io/index.html?pbjs_debug=true'
-      }
-    };
+      const requests = spec.buildRequests([bid01, bid02, bid03], bidderRequest);
 
-    it('groups requests by siteId', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
       expect(requests).to.have.lengthOf(2);
 
-      expect(requests[0].data.organizationId).to.equal('123');
+      expect(requests[0].data.organizationId).to.equal('1000');
       expect(requests[0].data.adUnits).to.have.lengthOf(2);
 
-      expect(requests[1].data.organizationId).to.equal('456');
+      expect(requests[1].data.organizationId).to.equal('1002');
       expect(requests[1].data.adUnits).to.have.lengthOf(1);
     });
 
-    it('sends bid request to ENDPOINT_PB via POST', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.method).to.equal('POST');
-      expect(request.url).to.equal(ENDPOINT);
-      expect(request.data.prebidVersion).to.equal('$prebid.version$');
-    });
+    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(adagio, 'getFeatures').returns({});
 
-    it('features params "adunit_position" must be empty if adUnitElement is not found in the DOM', () => {
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0], {params: {adUnitElementId: 'does-not-exist'}})], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.adunit_position).to.deep.equal('');
-    });
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bidderRequest = new BidderRequestBuilder().build();
 
-    it('features params "adunit_position" should be computed even if DOM element is display:none', () => {
-      stubs.topGetComputedStyle.returns(computedStyleNone);
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0])], bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.adunit_position).to.equal('0x0');
-    });
+      const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('features params "viewport" should be computed even if window.innerWidth is not supported', () => {
-      sandbox.stub(top, 'innerWidth').value(undefined);
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0])], bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].features.viewport_dimensions).to.match(/^[\d]+x[\d]+$/);
+      expect(requests).to.have.lengthOf(1);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(ENDPOINT);
+      expect(requests[0].options.contentType).to.eq('text/plain');
+      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
     });
 
-    it('AdUnit requested should have the correct sizes array depending on the config', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests[1].data.adUnits[0]).to.have.property('mediaTypes');
+    it('should enqueue computed features for collect usage', function() {
+      sandbox.stub(Date, 'now').returns(12345);
+
+      for (const prop in _features) {
+        sandbox.stub(_features, prop).returns('');
+      }
+
+      adagioMock.expects('enqueue').withExactArgs({
+        action: 'features',
+        ts: 12345,
+        data: {
+          'gpt-adunit-code': {
+            features: {},
+            version: '1'
+          }
+        }
+      }).atLeast(1);
+
+      const bid01 = new BidRequestBuilder().withParams().build();
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const requests = spec.buildRequests([bid01], bidderRequest);
+
+      expect(requests[0].data).to.have.all.keys(expectedDataKeys);
+
+      adagioMock.verify();
     });
 
-    it('features params must be an object if featurejs is loaded', () => {
-      let requests = spec.buildRequests(bidRequests, bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
+    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);
+
+      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;
     });
 
-    it('outerAdUnitElementId must be added when PostBid param has been set', () => {
-      top.ADAGIO = top.ADAGIO || {};
-      top.ADAGIO.pbjsAdUnits = [];
+    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');
+          const bid01 = new BidRequestBuilder({
+            adUnitCode: 'adunit-code-01',
+            mediaTypes: {
+              banner: { sizes: [[300, 250]] },
+              video: {
+                context: 'outstream',
+                playerSize: [[300, 250]],
+                renderer: {
+                  url: 'https://url.tld',
+                  render: () => true
+                }
+              }
+            },
+          }).withParams().build();
+          const bidderRequest = new BidderRequestBuilder().build();
+          const request = spec.buildRequests([bid01], bidderRequest)[0];
 
-      top.ADAGIO.pbjsAdUnits.push({
-        code: bidRequestsWithPostBid[0].adUnitCode,
-        sizes: bidRequestsWithPostBid[0].sizes,
-        bids: [{
-          bidder: bidRequestsWithPostBid[0].bidder,
-          params: bidRequestsWithPostBid[0].params
-        }]
+          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('Update mediaTypes.video with OpenRTB options. Validate and sanitize whitelisted OpenRTB', function() {
+        sandbox.spy(utils, 'logWarn');
+        const bid01 = new BidRequestBuilder({
+          adUnitCode: 'adunit-code-01',
+          mediaTypes: {
+            banner: { sizes: [[300, 250]] },
+            video: {
+              context: 'outstream',
+              playerSize: [[300, 250]],
+              mimes: ['video/mp4'],
+              api: 5, // will be removed because invalid
+              playbackmethod: [7], // will be removed because invalid
+            }
+          },
+        }).withParams({
+          // options in video, will overide
+          video: {
+            skip: 1,
+            skipafter: 4,
+            minduration: 10,
+            maxduration: 30,
+            placement: [3],
+            protocols: [8]
+          }
+        }).build();
+
+        const bidderRequest = new BidderRequestBuilder().build();
+        const expected = {
+          context: 'outstream',
+          playerSize: [[300, 250]],
+          playerName: 'adagio',
+          mimes: ['video/mp4'],
+          skip: 1,
+          skipafter: 4,
+          minduration: 10,
+          maxduration: 30,
+          placement: [3],
+          protocols: [8],
+          w: 300,
+          h: 250
+        };
+
+        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);
       });
-      let requests = spec.buildRequests(bidRequestsWithPostBid, bidderRequest);
-      let request = requests[0];
-      expect(request.data.adUnits[0].features).to.exist;
-      expect(request.data.adUnits[0].params.outerAdUnitElementId).to.exist;
-      top.ADAGIO.pbjsAdUnits = undefined;
     });
 
-    it('generates a pageviewId if missing', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      delete window.top.ADAGIO.pageviewId;
+    describe('with sChain', function() {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'ssp.test',
+          sid: '00001',
+          hp: 1
+        }]
+      };
 
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
+      it('should add the schain if available at bidder level', function() {
+        const bid01 = new BidRequestBuilder({ schain }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
 
-      expect(requests[0].data.pageviewId).to.exist.and.to.not.equal('_').and.to.not.equal('');
-      expect(requests[0].data.pageviewId).to.equal(requests[1].data.pageviewId);
-    });
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('uses an existing pageviewId if present', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      window.top.ADAGIO.pageviewId = 'abc';
+        expect(requests[0].data).to.have.all.keys(expectedDataKeys);
+        expect(requests[0].data.schain).to.deep.equal(schain);
+      });
 
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
+      it('Schain should not be added to the request', function() {
+        const bid01 = new BidRequestBuilder().withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
 
-      expect(requests[0].data.pageviewId).to.equal('abc');
-      expect(requests[1].data.pageviewId).to.equal('abc');
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.schain).to.not.exist;
+      });
     });
 
-    it('should send the printNumber in features object', () => {
-      window.top.ADAGIO = window.top.ADAGIO || {};
-      window.top.ADAGIO.pageviewId = 'abc';
-      window.top.ADAGIO.adUnits['adunit-code1'] = {
-        pageviewId: 'abc',
-        printNumber: 2
+    describe('with GDPR', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      const consentString = 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==';
+
+      const gdprConsentBuilderTCF1 = function gdprConsentBuilderTCF1(applies, allows) {
+        return {
+          consentString,
+          gdprApplies: applies,
+          allowAuctionWithoutConsent: allows,
+          apiVersion: 1
+        };
       };
-      const requests = spec.buildRequests([bidRequests[0]], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].features.print_number).to.equal('2');
-    });
 
-    it('organizationId param key must be a string', () => {
-      const requests = spec.buildRequests([Object.assign({}, bidRequests[0], {params: {organizationId: 1010}})], bidderRequest);
-      const request = requests[0];
-      expect(request.data.adUnits[0].params).to.exist;
-      expect(request.data.adUnits[0].params.organizationId).to.deep.equal('1010');
-      expect(request.data.organizationId).to.exist;
-      expect(request.data.organizationId).to.deep.equal('1010');
-    });
+      const gdprConsentBuilderTCF2 = function gdprConsentBuilderTCF2(applies) {
+        return {
+          consentString,
+          gdprApplies: applies,
+          apiVersion: 2
+        };
+      };
 
-    it('GDPR consent is applied', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(1);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
-    });
+      context('When GDPR applies', function() {
+        it('send data.gdpr object to the server from TCF v.1.1 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF1(true, true)
+          }).build();
+
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 1,
+            consentRequired: 1,
+            apiVersion: 1
+          };
 
-    it('GDPR consent is applied w/ TCF2', () => {
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(1);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
-    });
+          const requests = spec.buildRequests([bid01], bidderRequest);
 
-    it('GDPR consent is not applied', () => {
-      bidderRequest.gdprConsent.gdprApplies = false;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(0);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+
+        it('send data.gdpr object to the server from TCF v.2 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF2(true)
+          }).build();
+
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 0,
+            consentRequired: 1,
+            apiVersion: 2
+          };
+
+          const requests = spec.buildRequests([bid01], bidderRequest);
+
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+      });
+
+      context('When GDPR does not applies', function() {
+        it('send data.gdpr object to the server from TCF v.1.1 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF1(false, true)
+          }).build();
+
+          const expected = {
+            consentString,
+            allowAuctionWithoutConsent: 1,
+            consentRequired: 0,
+            apiVersion: 1
+          };
+
+          const requests = spec.buildRequests([bid01], bidderRequest);
+
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+
+        it('send data.gdpr object to the server from TCF v.2 cmp', function() {
+          const bidderRequest = new BidderRequestBuilder({
+            gdprConsent: gdprConsentBuilderTCF2(false)
+          }).build();
+
+          const expected = {
+            consentString,
+            consentRequired: 0,
+            allowAuctionWithoutConsent: 0,
+            apiVersion: 2
+          };
+
+          const requests = spec.buildRequests([bid01], bidderRequest);
+
+          expect(requests[0].data.regs.gdpr).to.deep.equal(expected);
+        });
+      });
+
+      context('When GDPR is undefined in bidderRequest', function() {
+        it('send an empty data.gdpr to the server', function() {
+          const bidderRequest = new BidderRequestBuilder().build();
+          const requests = spec.buildRequests([bid01], bidderRequest);
+
+          expect(requests[0].data.regs.gdpr).to.be.empty;
+        });
+      });
     });
 
-    it('GDPR consent is not applied w/ TCF2', () => {
-      bidderRequestTCF2.gdprConsent.gdprApplies = false;
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr.consentString).to.exist.and.to.equal(consentString);
-      expect(request.data.gdpr.consentRequired).to.exist.and.to.equal(0);
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
-    });
-
-    it('GDPR consent is undefined', () => {
-      delete bidderRequest.gdprConsent.consentString;
-      delete bidderRequest.gdprConsent.gdprApplies;
-      delete bidderRequest.gdprConsent.allowAuctionWithoutConsent;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.not.have.property('consentString');
-      expect(request.data.gdpr).to.not.have.property('gdprApplies');
-      expect(request.data.gdpr).to.not.have.property('allowAuctionWithoutConsent');
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(1);
-    });
-
-    it('GDPR consent is undefined w/ TCF2', () => {
-      delete bidderRequestTCF2.gdprConsent.consentString;
-      delete bidderRequestTCF2.gdprConsent.gdprApplies;
-      delete bidderRequestTCF2.gdprConsent.vendorData;
-      const requests = spec.buildRequests(bidRequests, bidderRequestTCF2);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.not.have.property('consentString');
-      expect(request.data.gdpr).to.not.have.property('gdprApplies');
-      expect(request.data.gdpr.apiVersion).to.exist.and.to.equal(2);
+    describe('with COPPA', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      it('should send the Coppa "required" flag set to "1" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        sinon.stub(config, 'getConfig')
+          .withArgs('coppa')
+          .returns(true);
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.coppa.required).to.equal(1);
+
+        config.getConfig.restore();
+      });
     });
 
-    it('GDPR consent bidderRequest does not have gdprConsent', () => {
-      delete bidderRequest.gdprConsent;
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests).to.have.lengthOf(2);
-      const request = requests[0];
-      expect(request.data.gdpr).to.exist;
-      expect(request.data.gdpr).to.be.empty;
+    describe('without COPPA', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      it('should send the Coppa "required" flag set to "0" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.coppa.required).to.equal(0);
+      });
     });
 
-    it('should expose version in window', () => {
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.versions).ok;
-      expect(window.top.ADAGIO.versions.adagioBidderAdapter).to.eq(VERSION);
+    describe('with USPrivacy', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      const consent = 'Y11N';
+
+      it('should send the USPrivacy "ccpa.uspConsent" in the request', function () {
+        const bidderRequest = new BidderRequestBuilder({
+          uspConsent: consent
+        }).build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.ccpa.uspConsent).to.equal(consent);
+      });
     });
 
-    it('should returns an empty array if the bidder cannot access to window top (based on refererInfo.reachedTop)', () => {
-      const requests = spec.buildRequests(bidRequests, {
-        ...bidderRequest,
-        refererInfo: { reachedTop: false }
+    describe('without USPrivacy', function() {
+      const bid01 = new BidRequestBuilder().withParams().build();
+
+      it('should have an empty "ccpa" field in the request', function () {
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.regs.ccpa).to.be.empty;
       });
-      expect(requests).to.be.empty;
     });
 
-    it('Should add the schain if available at bidder level', () => {
-      const bidRequest = Object.assign({}, bidRequests[0], {
-        schain: {
-          ver: '1.0',
-          complete: 1,
-          nodes: [{
-            asi: 'ssp.test',
-            sid: '00001',
-            hp: 1
-          }]
-        }
+    describe('with userID modules', function() {
+      const userId = {
+        sharedid: {id: '01EAJWWNEPN3CYMM5N8M5VXY22', third: '01EAJWWNEPN3CYMM5N8M5VXY22'},
+        unsuported: '666'
+      };
+
+      it('should send "user.eids" in the request for Prebid.js supported modules only', function() {
+        const bid01 = new BidRequestBuilder({
+          userId
+        }).withParams().build();
+
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        const expected = [{
+          source: 'sharedid.org',
+          uids: [
+            {
+              atype: 1,
+              ext: {
+                third: '01EAJWWNEPN3CYMM5N8M5VXY22'
+              },
+              id: '01EAJWWNEPN3CYMM5N8M5VXY22'
+            }
+          ]
+        }];
+
+        expect(requests[0].data.user.eids).to.have.lengthOf(1);
+        expect(requests[0].data.user.eids).to.deep.equal(expected);
       });
 
-      const requests = spec.buildRequests([bidRequest], bidderRequest);
-      const request = requests[0];
+      it('should send an empty "user.eids" array in the request if userId module is unsupported', function() {
+        const bid01 = new BidRequestBuilder({
+          userId: {
+            unsuported: '666'
+          }
+        }).withParams().build();
 
-      expect(request.data.schain).to.exist;
-      expect(request.data.schain).to.deep.equal({
-        ver: '1.0',
-        complete: 1,
-        nodes: [{
-          asi: 'ssp.test',
-          sid: '00001',
-          hp: 1
-        }]
+        const bidderRequest = new BidderRequestBuilder().build();
+
+        const requests = spec.buildRequests([bid01], bidderRequest);
+
+        expect(requests[0].data.user.eids).to.be.empty;
       });
     });
 
-    it('Schain should not be added to the request', () => {
-      const requests = spec.buildRequests([bidRequests[0]], bidderRequest);
-      const request = requests[0];
-      expect(request.data.schain).to.not.exist;
-    });
-  });
+    describe('with priceFloors module', function() {
+      it('should get and set floor by mediatype and sizes', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            },
+            video: {
+              playerSize: [600, 480]
+            }
+          }
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
 
-  describe('interpretResponse', () => {
-    const sandbox = sinon.createSandbox();
+        // delete the computed `sizes` prop as we are based on mediaTypes only.
+        delete bid01.sizes
 
-    let serverResponse = {
-      body: {
-        data: {
-          pred: 1
-        },
-        bids: [
-          {
-            ad: '
',
-            cpm: 1,
-            creativeId: 'creativeId',
-            currency: 'EUR',
-            height: 250,
-            netRevenue: true,
-            requestId: 'c180kg4267tyqz',
-            ttl: 360,
-            width: 300
+        bid01.getFloor = () => {
+          return { floor: 1, currency: 'USD' }
+        }
+        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'});
+      });
+
+      it('should get and set floor by mediatype if no size provided (ex native, video)', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              mimes: ['video/mp4']
+            },
+            native: {
+              body: { required: true }
+            }
           }
-        ]
-      }
-    };
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        bid01.getFloor = () => {
+          return { floor: 1, currency: 'USD' }
+        }
+        const requests = spec.buildRequests([bid01], bidderRequest);
 
-    let emptyBodyServerResponse = {
-      body: null
-    };
+        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'});
+      });
 
-    let withoutBidsArrayServerResponse = {
-      body: {
-        bids: []
-      }
-    };
+      it('should get and set floor with default value if no floors found', function() {
+        const bid01 = new BidRequestBuilder({
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              mimes: ['video/mp4']
+            }
+          }
+        }).withParams().build();
+        const bidderRequest = new BidderRequestBuilder().build();
+        bid01.getFloor = () => {
+          return { floor: NaN, currency: 'USD' }
+        }
+        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({f: 0.1, mt: 'video'});
+      });
+    });
+  });
 
-    let serverResponseWhichThrowsException = {
+  describe('interpretResponse()', function() {
+    let serverResponse = {
       body: {
         data: {
           pred: 1
         },
-        bids: {
-          foo: 'bar'
-        }
+        bids: [{
+          ad: '
',
+          cpm: 1,
+          creativeId: 'creativeId',
+          currency: 'EUR',
+          height: 250,
+          netRevenue: true,
+          requestId: 'c180kg4267tyqz',
+          ttl: 360,
+          width: 300,
+          aDomain: ['advertiser.com'],
+          mediaType: 'banner',
+          meta: {
+            advertiserId: '80',
+            advertiserName: 'An Advertiser',
+            networkId: '110'
+          }
+        }]
       }
     };
 
     let bidRequest = {
-      'data': {
-        'adUnits': [
-          {
-            'bidder': 'adagio',
-            'params': {
-              organizationId: '456',
-              site: 'ADAGIO-456',
-              placement: 'PAVE_ATF-456',
-              adUnitElementId: 'banner-atf-456',
-              pagetype: 'ARTICLE',
-              category: 'NEWS',
-              subcategory: 'SPORT',
-              environment: 'SITE-MOBILE'
-            },
-            'adUnitCode': 'adunit-code',
-            'sizes': [[300, 250], [300, 600]],
-            'bidId': 'c180kg4267tyqz',
-            'bidderRequestId': '8vfscuixrovn8i',
-            'auctionId': 'lel4fhp239i9km',
-            'pageviewId': 'd8c4fl2k39i0wn',
-          }
-        ]
+      data: {
+        adUnits: [{
+          bidder: 'adagio',
+          params: {
+            organizationId: '1000',
+            placement: 'PAVE_ATF',
+            site: 'SITE-NAME',
+            adUnitElementId: 'gpt-adunit-code',
+            pagetype: 'ARTICLE',
+            category: 'NEWS',
+            subcategory: 'SPORT',
+            environment: 'desktop',
+            supportIObs: true
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            banner: { sizes: [[300, 250], [300, 600]] }
+          },
+          bidId: 'c180kg4267tyqz',
+          bidderRequestId: '8vfscuixrovn8i',
+          auctionId: 'lel4fhp239i9km',
+          pageviewId: 'd8c4fl2k39i0wn',
+        }]
       }
     };
 
-    afterEach(function() {
-      sandbox.restore();
-    });
+    it('should return an empty response array if body is empty', function() {
+      expect(spec.interpretResponse({
+        body: null
+      }, bidRequest)).to.be.an('array').length(0);
 
-    it('Should returns empty response if body is empty', () => {
-      expect(spec.interpretResponse(emptyBodyServerResponse, bidRequest)).to.be.an('array').length(0);
-      expect(spec.interpretResponse({body: {}}, bidRequest)).to.be.an('array').length(0);
+      expect(spec.interpretResponse({
+        body: {}
+      }, bidRequest)).to.be.an('array').length(0);
     });
 
-    it('Should returns empty response if bids array is empty', () => {
-      expect(spec.interpretResponse({withoutBidsArrayServerResponse}, bidRequest)).to.be.an('array').length(0);
+    it('should return an empty response array if bids array is empty', function() {
+      expect(spec.interpretResponse({
+        body: {
+          bids: []
+        }
+      }, bidRequest)).to.be.an('array').length(0);
     });
 
-    it('should get correct bid response', () => {
+    it('should handle properly a correct bid response', function() {
       let expectedResponse = [{
         ad: '
',
         cpm: 1,
@@ -683,87 +896,751 @@ describe('adagioAdapter', () => {
         requestId: 'c180kg4267tyqz',
         ttl: 360,
         width: 300,
-        placement: 'PAVE_ATF-456',
-        site: 'ADAGIO-456',
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME',
         pagetype: 'ARTICLE',
         category: 'NEWS',
         subcategory: 'SPORT',
-        environment: 'SITE-MOBILE'
+        environment: 'desktop',
+        aDomain: ['advertiser.com'],
+        mediaType: 'banner',
+        meta: {
+          advertiserId: '80',
+          advertiserName: 'An Advertiser',
+          advertiserDomains: ['advertiser.com'],
+          networkId: '110',
+          mediaType: 'banner'
+        }
       }];
+
       expect(spec.interpretResponse(serverResponse, bidRequest)).to.be.an('array');
       expect(spec.interpretResponse(serverResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
-    it('Should populate ADAGIO queue with ssp-data', () => {
-      spec.interpretResponse(serverResponse, bidRequest);
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.queue).to.be.an('array');
+    it('Meta props should be limited if no bid.meta is provided', function() {
+      const altServerResponse = utils.deepClone(serverResponse);
+      delete altServerResponse.body.bids[0].meta;
+
+      let expectedResponse = [{
+        ad: '
',
+        cpm: 1,
+        creativeId: 'creativeId',
+        currency: 'EUR',
+        height: 250,
+        netRevenue: true,
+        requestId: 'c180kg4267tyqz',
+        ttl: 360,
+        width: 300,
+        placement: 'PAVE_ATF',
+        site: 'SITE-NAME',
+        pagetype: 'ARTICLE',
+        category: 'NEWS',
+        subcategory: 'SPORT',
+        environment: 'desktop',
+        aDomain: ['advertiser.com'],
+        mediaType: 'banner',
+        meta: {
+          advertiserDomains: ['advertiser.com'],
+          mediaType: 'banner'
+        }
+      }];
+
+      expect(spec.interpretResponse(altServerResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
-    it('Should not populate ADAGIO queue with ssp-data if not in top window', () => {
-      utils.getWindowTop().ADAGIO.queue = [];
-      sandbox.stub(utils, 'getWindowTop').throws();
+    it('should populate ADAGIO queue with ssp-data', function() {
+      sandbox.stub(Date, 'now').returns(12345);
+
+      adagioMock.expects('enqueue').withExactArgs({
+        action: 'ssp-data',
+        ts: 12345,
+        data: serverResponse.body.data
+      }).once();
+
       spec.interpretResponse(serverResponse, bidRequest);
-      expect(window.top.ADAGIO).ok;
-      expect(window.top.ADAGIO.queue).to.be.an('array');
-      expect(window.top.ADAGIO.queue).empty;
+
+      adagioMock.verify();
+    });
+
+    it('should properly try-catch an exception and return an empty array', function() {
+      sandbox.stub(adagio, 'enqueue').throws();
+      utilsMock.expects('logError').once();
+
+      expect(spec.interpretResponse(serverResponse, bidRequest)).to.be.an('array').length(0);
+
+      utilsMock.verify();
     });
 
-    it('should return an empty response even if an exception is ', () => {
-      expect(spec.interpretResponse(serverResponseWhichThrowsException, bidRequest)).to.be.an('array').length(0);
+    describe('Response with video outstream', () => {
+      const bidRequestWithOutstream = utils.deepClone(bidRequest);
+      bidRequestWithOutstream.data.adUnits[0].mediaTypes.video = {
+        context: 'outstream',
+        playerSize: [[300, 250]],
+        mimes: ['video/mp4'],
+        skip: true
+      };
+
+      const serverResponseWithOutstream = utils.deepClone(serverResponse);
+      serverResponseWithOutstream.body.bids[0].vastXml = '';
+      serverResponseWithOutstream.body.bids[0].mediaType = 'video';
+      serverResponseWithOutstream.body.bids[0].outstream = {
+        bvwUrl: 'https://foo.baz',
+        impUrl: 'https://foo.bar'
+      };
+
+      it('should set a renderer in video outstream context', function() {
+        const bidResponse = spec.interpretResponse(serverResponseWithOutstream, bidRequestWithOutstream)[0];
+        expect(bidResponse).to.have.any.keys('outstream', 'renderer', 'mediaType');
+        expect(bidResponse.renderer).to.be.a('object');
+        expect(bidResponse.renderer.url).to.equal(RENDERER_URL);
+        expect(bidResponse.renderer.config.bvwUrl).to.be.ok;
+        expect(bidResponse.renderer.config.impUrl).to.be.ok;
+        expect(bidResponse.renderer.loaded).to.not.be.ok;
+        expect(bidResponse.width).to.equal(300);
+        expect(bidResponse.height).to.equal(250);
+        expect(bidResponse.vastUrl).to.match(/^data:text\/xml;/)
+      });
+    });
+
+    describe('Response with native add', () => {
+      const serverResponseWithNative = utils.deepClone(serverResponse)
+      serverResponseWithNative.body.bids[0].mediaType = 'native';
+      serverResponseWithNative.body.bids[0].admNative = {
+        ver: '1.2',
+        link: {
+          url: 'https://i.am.a.click.url',
+          clickTrackers: [
+            'https://i.am.a.clicktracker.url'
+          ]
+        },
+        privacy: 'http://www.myprivacyurl.url',
+        ext: {
+          bvw: 'test'
+        },
+        eventtrackers: [
+          {
+            event: 1,
+            method: 1,
+            url: 'https://eventrack.local/impression'
+          },
+          {
+            event: 1,
+            method: 2,
+            url: 'https://eventrack.local/impression'
+          },
+          {
+            event: 2,
+            method: 1,
+            url: 'https://eventrack.local/viewable-mrc50'
+          }
+        ],
+        assets: [
+          {
+            required: 1,
+            title: {
+              text: 'My title'
+            }
+          },
+          {
+            img: {
+              url: 'https://images.local/image.jpg',
+              w: 100,
+              h: 250
+            }
+          },
+          {
+            img: {
+              type: 1,
+              url: 'https://images.local/icon.png',
+              w: 40,
+              h: 40
+            }
+          },
+          {
+            data: {
+              type: 1, // sponsored
+              value: 'Adagio'
+            }
+          },
+          {
+            data: {
+              type: 2, // desc / body
+              value: 'The super ad text'
+            }
+          },
+          {
+            data: {
+              type: 3, // rating
+              value: '10 from 10'
+            }
+          },
+          {
+            data: {
+              type: 11, // displayUrl
+              value: 'https://i.am.a.display.url'
+            }
+          }
+        ]
+      };
+
+      const bidRequestNative = utils.deepClone(bidRequest)
+      bidRequestNative.mediaTypes = {
+        native: {
+          sendTargetingKeys: false,
+
+          clickUrl: {
+            required: true,
+          },
+          title: {
+            required: true,
+          },
+          body: {
+            required: true,
+          },
+          sponsoredBy: {
+            required: false
+          },
+          image: {
+            required: true
+          },
+          icon: {
+            required: true
+          },
+          privacyLink: {
+            required: false
+          },
+          ext: {
+            adagio_bvw: {}
+          }
+        }
+      };
+
+      it('Should ignore native parsing due to missing raw admNative property', () => {
+        const alternateServerResponse = utils.deepClone(serverResponseWithNative);
+        delete alternateServerResponse.body.bids[0].admNative
+        const r = spec.interpretResponse(alternateServerResponse, bidRequestNative);
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).not.ok;
+        utilsMock.expects('logError').once();
+      });
+
+      it('Should ignore native parsing due to invalid raw admNative.assets property', () => {
+        const alternateServerResponse = utils.deepClone(serverResponseWithNative);
+        alternateServerResponse.body.bids[0].admNative.assets = { title: { text: 'test' } };
+        const r = spec.interpretResponse(alternateServerResponse, bidRequestNative);
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).not.ok;
+        utilsMock.expects('logError').once();
+      });
+
+      it('Should handle and return a formated Native ad', () => {
+        const r = spec.interpretResponse(serverResponseWithNative, bidRequestNative);
+        const expected = {
+          displayUrl: 'https://i.am.a.display.url',
+          sponsoredBy: 'Adagio',
+          body: 'The super ad text',
+          rating: '10 from 10',
+          clickUrl: 'https://i.am.a.click.url',
+          title: 'My title',
+          impressionTrackers: [
+            'https://eventrack.local/impression'
+          ],
+          javascriptTrackers: '',
+          clickTrackers: [
+            'https://i.am.a.clicktracker.url'
+          ],
+          image: {
+            url: 'https://images.local/image.jpg',
+            width: 100,
+            height: 250
+          },
+          icon: {
+            url: 'https://images.local/icon.png',
+            width: 40,
+            height: 40
+          },
+          ext: {
+            adagio_bvw: 'test'
+          },
+          privacyLink: 'http://www.myprivacyurl.url'
+        }
+        expect(r[0].mediaType).to.equal(NATIVE);
+        expect(r[0].native).ok;
+        expect(r[0].native).to.deep.equal(expected);
+      });
     });
   });
 
-  describe('getUserSyncs', () => {
+  describe('getUserSyncs()', function() {
     const syncOptions = {
-      'iframeEnabled': 'true'
-    }
-    const serverResponses = [
-      {
+      syncEnabled: false
+    };
+
+    it('should handle user syncs if data is in the server response ', function() {
+      const serverResponses = [{
         body: {
           userSyncs: [
-            {
-              t: 'i',
-              u: 'https://test.url.com/setuid'
-            },
-            {
-              t: 'p',
-              u: 'https://test.url.com/setuid'
-            }
+            { t: 'i', u: 'https://test.url.com/setuid' },
+            { t: 'p', u: 'https://test.url.com/setuid' }
           ]
         }
-      }
-    ];
-
-    const emptyServerResponses = [
-      {
-        body: ''
-      }
-    ];
+      }];
 
-    it('should handle correctly user syncs', () => {
       let result = spec.getUserSyncs(syncOptions, serverResponses);
-      let emptyResult = spec.getUserSyncs(syncOptions, emptyServerResponses);
+
       expect(result[0].type).to.equal('iframe');
       expect(result[0].url).contain('setuid');
+
       expect(result[1].type).to.equal('image');
-      expect(emptyResult).to.equal(false);
+      expect(result[1].url).contain('setuid');
+    });
+
+    it('should return false if data is not in server response', function() {
+      const serverResponse = [{ body: '' }];
+      const result = spec.getUserSyncs(syncOptions, serverResponse);
+      expect(result).to.equal(false);
+    });
+  });
+
+  describe('Adagio features', 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' });
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const result = adagio.getFeatures(bidRequest, bidderRequest);
+
+      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.be.a('String');
+      expect(result.device).to.be.a('String');
+      expect(result.os).to.be.a('String');
+      expect(result.browser).to.be.a('String');
+    });
+
+    it('should return all expected features when `adUnitElementId` param is not available', function() {
+      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 result = adagio.getFeatures(bidRequest, bidderRequest);
+
+      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');
+      expect(result.url).to.be.a('String');
+      expect(result.device).to.be.a('String');
+      expect(result.os).to.be.a('String');
+      expect(result.browser).to.be.a('String');
+    });
+
+    it('should not return feature with an empty value', function() {
+      sandbox.stub(_features, 'getDomLoadingDuration').returns('');
+      sandbox.stub(_features, 'getUrl').returns('');
+      sandbox.stub(_features, 'getBrowser').returns('');
+
+      const bidRequest = new BidRequestBuilder({
+        'mediaTypes': {
+          banner: { sizes: [[300, 250]] }
+        }
+      }).withParams().build();
+
+      const bidderRequest = new BidderRequestBuilder().build();
+
+      const result = adagio.getFeatures(bidRequest, bidderRequest);
+
+      expect(result.adunit_position).to.not.exist;
+      expect(result.page_dimensions).to.exist;
+      expect(result.viewport_dimensions).to.exist;
+      expect(result.print_number).to.exist;
+      expect(result.dom_loading).to.not.exist;
+      expect(result.user_timestamp).to.exist;
+      expect(result.url).to.not.exist;
+      expect(result.device).to.exist;
+      expect(result.os).to.exist;
+      expect(result.browser).to.not.exist;
+    });
+
+    describe('getPageDimensions feature', function() {
+      afterEach(() => {
+        delete window.$sf;
+      });
+
+      it('should not compute the page dimensions in cross-origin iframe', function() {
+        sandbox.stub(utils, 'getWindowTop').throws();
+        const result = _features.getPageDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should not compute the page dimensions even with safeFrame api', function() {
+        window.$sf = $sf;
+        const result = _features.getPageDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should not compute the page dimensions if  is not in the DOM', function() {
+        sandbox.stub(window.top.document, 'querySelector').withArgs('body').returns(null);
+        const result = _features.getPageDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should compute the page dimensions based on body and viewport dimensions', function() {
+        sandbox.stub(window.top.document, 'querySelector').withArgs('body').returns({ scrollWidth: 1360, offsetWidth: 1280, scrollHeight: 2000, offsetHeight: 1000 });
+        const result = _features.getPageDimensions();
+        expect(result).to.eq('1360x2000');
+      });
+    });
+
+    describe('getViewPortDimensions feature', function() {
+      afterEach(() => {
+        delete window.$sf;
+      });
+
+      it('should not compute the viewport dimensions in cross-origin iframe', function() {
+        sandbox.stub(utils, 'getWindowTop').throws();
+        const result = _features.getViewPortDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should compute the viewport dimensions in cross-origin iframe w/ safeFrame api', function() {
+        window.$sf = $sf;
+        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 result = _features.getViewPortDimensions();
+        expect(result).to.eq('1920x1177');
+      });
+
+      it('should not compute the viewport dimensions if safeFrame api is misimplemented', function() {
+        window.$sf = {
+          ext: { geom: 'nothing' }
+        };
+        const result = _features.getViewPortDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should not compute the viewport dimensions if  is not in the DOM', function() {
+        const querySelectorSpy = sandbox.spy(() => null);
+        sandbox.stub(utils, 'getWindowTop').returns({
+          location: { href: 'https://mytest.io' },
+          document: { querySelector: querySelectorSpy }
+        });
+        const result = _features.getViewPortDimensions();
+        expect(result).to.eq('');
+      });
+
+      it('should compute the viewport dimensions based on window', function() {
+        sandbox.stub(utils, 'getWindowTop').returns({
+          location: { href: 'https://mytest.io' },
+          innerWidth: 960,
+          innerHeight: 3000
+        });
+        const result = _features.getViewPortDimensions();
+        expect(result).to.eq('960x3000');
+      });
+
+      it('should compute the viewport dimensions based on body', function() {
+        const querySelectorSpy = sandbox.spy(() => ({ clientWidth: 1024, clientHeight: 2000 }));
+        sandbox.stub(utils, 'getWindowTop').returns({
+          location: { href: 'https://mytest.io' },
+          document: { querySelector: querySelectorSpy }
+        });
+        const result = _features.getViewPortDimensions();
+        expect(result).to.eq('1024x2000');
+      });
+    });
+
+    describe('getSlotPosition feature', function() {
+      let getElementByIdStub;
+      let getComputedStyleStub;
+
+      beforeEach(() => {
+        getElementByIdStub = sandbox.stub(window.top.document, 'getElementById');
+        getElementByIdStub.returns(fixtures.getElementById());
+        getComputedStyleStub = sandbox.stub(window.top, 'getComputedStyle');
+        getComputedStyleStub.returns({ display: 'block' });
+      });
+
+      afterEach(() => {
+        delete window.$sf;
+        getElementByIdStub.restore();
+        getComputedStyleStub.restore();
+      });
+
+      it('should not compute the slot position in cross-origin iframe', function() {
+        sandbox.stub(utils, 'getWindowTop').throws();
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('');
+      });
+
+      it('should compute the slot position in cross-origin iframe w/ safeFrame api', function() {
+        window.$sf = $sf;
+        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 result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('210x859');
+      });
+
+      it('should not compute the slot position if safeFrame api is misimplemented', function() {
+        window.$sf = {
+          ext: { geom: 'nothing' }
+        };
+        utilsMock.expects('logWarn').once();
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('');
+        utilsMock.verify();
+      });
+
+      it('should not compute the slot position due to unreachable adUnitElementId', function() {
+        getElementByIdStub.returns(null);
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('');
+      });
+
+      it('should use a quick switch to display slot and compute position', function() {
+        getComputedStyleStub.returns({ display: 'none' });
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('800x300');
+      });
+
+      it('should compute the slot position based on window.top w/o postBid param', function() {
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: false });
+        expect(result).to.eq('800x300');
+      });
+
+      it.skip('should compute the slot position inside the parent window (window.top) when safeFrame is not available and postBid params is `true`', function() {
+        const result = _features.getSlotPosition({ adUnitElementId: 'gpt-adunit-code', postBid: true });
+        // expect(result).to.eq('800x300');
+      });
     });
   });
 
-  describe('adagioScriptFromLocalStorageCb', () => {
+  describe('optional params auto detection', function() {
+    it('should auto detect environment', function() {
+      const getDeviceStub = sandbox.stub(_features, 'getDevice');
+
+      getDeviceStub.returns(5);
+      expect(adagio.autoDetectEnvironment()).to.eq('tablet');
+
+      getDeviceStub.returns(4);
+      expect(adagio.autoDetectEnvironment()).to.eq('mobile');
+
+      getDeviceStub.returns(2);
+      expect(adagio.autoDetectEnvironment()).to.eq('desktop');
+    });
+
+    it('should auto detect adUnitElementId when GPT is used', function() {
+      sandbox.stub(utils, 'getGptSlotInfoForAdUnitCode').withArgs('banner').returns({divId: 'gpt-banner'});
+      expect(adagio.autoDetectAdUnitElementId('banner')).to.eq('gpt-banner');
+    });
+  });
+
+  describe('print number handling', function() {
+    it('should return 1 if no adunit-code found. This means it is the first auction', function() {
+      sandbox.stub(adagio, 'getPageviewId').returns('abc-def');
+      expect(adagio.computePrintNumber('adunit-code')).to.eql(1);
+    });
+
+    it('should increment the adunit print number when the adunit-code has already been used for an other auction', function() {
+      sandbox.stub(adagio, 'getPageviewId').returns('abc-def');
+
+      window.top.ADAGIO.adUnits['adunit-code'] = {
+        pageviewId: 'abc-def',
+        printNumber: 1,
+      };
+
+      expect(adagio.computePrintNumber('adunit-code')).to.eql(2);
+    });
+  });
+
+  describe('site information using refererDetection or window.top', function() {
+    it('should returns domain, page and window.referrer in a window.top context', function() {
+      sandbox.stub(utils, 'getWindowTop').returns({
+        location: {
+          hostname: 'test.io',
+          href: 'https://test.io/article/a.html'
+        },
+        document: {
+          referrer: 'https://google.com'
+        }
+      });
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: {
+          numIframes: 0,
+          reachedTop: true,
+          referer: 'http://test.io/index.html?pbjs_debug=true'
+        }
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: 'test.io',
+        page: 'https://test.io/article/a.html',
+        referrer: 'https://google.com'
+      });
+    });
+
+    it('should returns domain and page in a cross-domain w/ top domain reached context', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+
+      const info = {
+        numIframes: 0,
+        reachedTop: true,
+        referer: 'http://level.io/',
+        stack: [
+          'http://level.io/',
+          'http://example.com/iframe1.html',
+          'http://example.com/iframe2.html'
+        ],
+        canonicalUrl: ''
+      };
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: info
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: 'level.io',
+        page: 'http://level.io/',
+        referrer: ''
+      });
+    });
+
+    it('should not return anything in a cross-domain w/o top domain reached and w/o ancestor context', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+
+      const info = {
+        numIframes: 2,
+        reachedTop: false,
+        referer: 'http://example.com/iframe1.html',
+        stack: [
+          null,
+          'http://example.com/iframe1.html',
+          'http://example.com/iframe2.html'
+        ],
+        canonicalUrl: ''
+      };
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: info
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: '',
+        page: '',
+        referrer: ''
+      });
+    });
+
+    it('should return domain only in a cross-domain w/o top domain reached and w/ ancestors context', function() {
+      sandbox.stub(utils, 'getWindowTop').throws();
+
+      const info = {
+        numIframes: 2,
+        reachedTop: false,
+        referer: 'http://example.com/iframe1.html',
+        stack: [
+          'http://mytest.com/',
+          'http://example.com/iframe1.html',
+          'http://example.com/iframe2.html'
+        ],
+        canonicalUrl: ''
+      };
+
+      const bidderRequest = new BidderRequestBuilder({
+        refererInfo: info
+      }).build();
+
+      expect(adagio.getSite(bidderRequest)).to.deep.equal({
+        domain: 'mytest.com',
+        page: '',
+        referrer: ''
+      });
+    });
+  });
+
+  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('Start Adagio script').once();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').never();
+      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));
 
@@ -774,9 +1651,9 @@ describe('adagioAdapter', () => {
     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('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').once();
+      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));
 
@@ -787,9 +1664,9 @@ describe('adagioAdapter', () => {
     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('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').once();
+      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));
 
@@ -800,14 +1677,21 @@ describe('adagioAdapter', () => {
     it('should verify missing hash', function () {
       localStorage.setItem(ADAGIO_LOCALSTORAGE_KEY, VALID_SCRIPT_CONTENT);
 
-      utilsMock.expects('logInfo').withExactArgs('Start Adagio script').never();
-      utilsMock.expects('logWarn').withExactArgs('No hash found in Adagio script').once();
-      utilsMock.expects('logWarn').withExactArgs('Invalid Adagio script found').never();
+      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/adbookpspBidAdapter_spec.js b/test/spec/modules/adbookpspBidAdapter_spec.js
new file mode 100755
index 00000000000..a6b8a794eeb
--- /dev/null
+++ b/test/spec/modules/adbookpspBidAdapter_spec.js
@@ -0,0 +1,1323 @@
+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_adid_c_adbookpsp: '5',
+            hb_deal_adbookpsp: 'werwetwerw',
+            hb_liid_adbookpsp: '2342345',
+          },
+          referrer: 'http://prebid-test-page.io:8080/banner.html',
+          lineItemId: '2342345',
+        },
+        {
+          ad: '',
+          adId: '10',
+          adUnitCode: 'div-gpt-ad-837465923534-0',
+          adserverTargeting: {
+            hb_adid_c_adbookpsp: '10',
+            hb_deal_adbookpsp: 'dsfxcxcvxc',
+            hb_liid_adbookpsp: '2121221',
+          },
+          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_deal_adbookpsp: 'werwetwerw',
+        hb_liid_adbookpsp: '2342345',
+        hb_adid_c_adbookpsp: '5',
+      });
+      expect(bids[1].adserverTargeting).to.deep.equal({
+        hb_deal_adbookpsp: 'dsfxcxcvxc',
+        hb_liid_adbookpsp: '2121221',
+        hb_adid_c_adbookpsp: '10',
+      });
+    });
+
+    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_deal_adbookpsp: 'werwetwerw,dsfxcxcvxc',
+          hb_liid_adbookpsp: '2342345,2121221',
+          hb_adid_c_adbookpsp: '5,10',
+        });
+      }
+    });
+
+    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_adid_c_adbookpsp: '10',
+        hb_deal_adbookpsp: 'dsfxcxcvxc',
+        hb_liid_adbookpsp: '2121221',
+      });
+    });
+
+    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: {
+    referer: 'http://example-domain.com/foo',
+  },
+  gdprConsent: {
+    gdprApplies: 1,
+    consentString: 'gdprConsentString',
+  },
+  uspConsent: 'uspConsentString',
+};
+
+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: location.hostname,
+    page: location.href,
+    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: location.hostname,
+    page: location.href,
+    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: location.hostname,
+    page: location.href,
+    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',
+          },
+          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',
+          },
+          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
index a9b56ade79e..6dedce321d8 100644
--- a/test/spec/modules/adbutlerBidAdapter_spec.js
+++ b/test/spec/modules/adbutlerBidAdapter_spec.js
@@ -13,7 +13,10 @@ describe('AdButler adapter', function () {
           zoneID: '210093',
           keyword: 'red',
           minCPM: '1.00',
-          maxCPM: '5.00'
+          maxCPM: '5.00',
+          extra: {
+            foo: 'bar',
+          }
         },
         placementCode: '/19968336/header-bid-tag-1',
         mediaTypes: {
@@ -93,6 +96,13 @@ describe('AdButler adapter', function () {
         expect(requestURL).to.have.string(';kw=red;');
       });
 
+      it('should set the extra parameter', () => {
+        let requests = spec.buildRequests(bidRequests);
+        let requestURL = requests[0].url;
+
+        expect(requestURL).to.have.string(';foo=bar;');
+      });
+
       it('should increment the count for the same zone', function () {
         let bidRequests = [
             {
diff --git a/test/spec/modules/addefendBidAdapter_spec.js b/test/spec/modules/addefendBidAdapter_spec.js
new file mode 100644
index 00000000000..ac01750e98f
--- /dev/null
+++ b/test/spec/modules/addefendBidAdapter_spec.js
@@ -0,0 +1,184 @@
+import {expect} from 'chai';
+import {spec} from 'modules/addefendBidAdapter.js';
+
+describe('addefendBidAdapter', () => {
+  const defaultBidRequest = {
+    bidId: 'd66fa86787e0b0ca900a96eacfd5f0bb',
+    auctionId: 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+    transactionId: 'd58851660c0c4461e4aa06344fc9c0c6',
+    sizes: [[300, 250], [300, 600]],
+    params: {
+      pageId: 'stringid1',
+      placementId: 'stringid2'
+    }
+  };
+
+  const deepClone = function (val) {
+    return JSON.parse(JSON.stringify(val));
+  };
+
+  const buildRequest = (buildRequest, bidderRequest) => {
+    if (!Array.isArray(buildRequest)) {
+      buildRequest = [buildRequest];
+    }
+
+    return spec.buildRequests(buildRequest, {
+      ...bidderRequest || {},
+      refererInfo: {
+        referer: 'https://referer.example.com'
+      }
+    })[0];
+  };
+
+  describe('isBidRequestValid', () => {
+    it('should return true when required params found', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('pageId performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      bidRequest.params.pageId = 1; // supposed to be a string
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('placementId performs type checking', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      bidRequest.params.placementId = 1; // supposed to be a string
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when required params are not passed', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      delete bidRequest.params;
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', () => {
+    const bidRequest = deepClone(defaultBidRequest);
+    const request = buildRequest(bidRequest);
+
+    it('sends bid request to endpoint via https using post', () => {
+      expect(request.method).to.equal('POST');
+      expect(request.url.indexOf('https://')).to.equal(0);
+      expect(request.url).to.equal(`${spec.hostname}/bid`);
+    });
+
+    it('contains prebid version parameter', () => {
+      expect(request.data.v).to.equal($$PREBID_GLOBAL$$.version);
+    });
+
+    it('contains correct referer', () => {
+      expect(request.data.referer).to.equal('https://referer.example.com');
+    });
+
+    it('contains auctionId', () => {
+      expect(request.data.auctionId).to.equal('ccc4c7cdfe11cfbd74065e6dd28413d8');
+    });
+
+    it('contains pageId', () => {
+      expect(request.data.pageId).to.equal('stringid1');
+    });
+
+    it('sends correct bid parameters', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      expect(request.data.bids).to.deep.equal([ {
+        bidId: bidRequest.bidId,
+        placementId: bidRequest.params.placementId,
+        sizes: [ '300x250', '300x600' ],
+        transactionId: 'd58851660c0c4461e4aa06344fc9c0c6'
+      } ]);
+    });
+
+    it('handles empty gdpr object', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const request = buildRequest(bidRequest, {
+        gdprConsent: {}
+      });
+      expect(request.data.gdpr_consent).to.be.equal('');
+    });
+
+    it('handles non-existent gdpr object', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const request = buildRequest(bidRequest, {
+        gdprConsent: null
+      });
+      expect(request.data.gdpr_consent).to.be.equal('');
+    });
+
+    it('handles properly filled gdpr string', () => {
+      const bidRequest = deepClone(defaultBidRequest);
+      const consentString = 'GDPR_CONSENT_STRING';
+      const request = buildRequest(bidRequest, {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: consentString
+        }
+      });
+
+      expect(request.data.gdpr_consent).to.be.equal(consentString);
+    });
+  });
+
+  describe('interpretResponse', () => {
+    it('should get correct bid response', () => {
+      const serverResponse = [
+        {
+          'width': 300,
+          'height': 250,
+          'creativeId': '29681110',
+          'ad': '',
+          'cpm': 0.5,
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'ttl': 120,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'advertiserDomains': ['advertiser.example.com']
+        }
+      ];
+
+      const expectedResponse = [
+        {
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'cpm': 0.5,
+          'creativeId': '29681110',
+          'width': 300,
+          'height': 250,
+          'ttl': 120,
+          'currency': 'EUR',
+          'ad': '',
+          'netRevenue': true,
+          'advertiserDomains': ['advertiser.example.com']
+        }
+      ];
+
+      const result = spec.interpretResponse({body: serverResponse});
+      expect(result.length).to.equal(expectedResponse.length);
+      Object.keys(expectedResponse[0]).forEach((key) => {
+        expect(result[0][key]).to.deep.equal(expectedResponse[0][key]);
+      });
+    });
+
+    it('handles incomplete server response', () => {
+      const serverResponse = [
+        {
+          'ad': '',
+          'cpm': 0.5,
+          'requestId': 'ccc4c7cdfe11cfbd74065e6dd28413d8',
+          'ttl': 60
+        }
+      ];
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles nobid responses', () => {
+      const serverResponse = [];
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/adformOpenRTBBidAdapter_spec.js b/test/spec/modules/adfBidAdapter_spec.js
similarity index 73%
rename from test/spec/modules/adformOpenRTBBidAdapter_spec.js
rename to test/spec/modules/adfBidAdapter_spec.js
index 05788183e29..ae92af32a1e 100644
--- a/test/spec/modules/adformOpenRTBBidAdapter_spec.js
+++ b/test/spec/modules/adfBidAdapter_spec.js
@@ -1,14 +1,21 @@
 // jshint esversion: 6, es3: false, node: true
 import {assert, expect} from 'chai';
-import {spec} from 'modules/adformOpenRTBBidAdapter.js';
+import {spec} from 'modules/adfBidAdapter.js';
 import { NATIVE } from 'src/mediaTypes.js';
 import { config } from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
 
-describe('AdformOpenRTB adapter', function () {
+describe('Adf adapter', function () {
   let serverResponse, bidRequest, bidResponses;
   let bids = [];
 
+  describe('backwards-compatibility', function () {
+    it('should have adformOpenRTB alias defined', function () {
+      assert.equal(spec.aliases[0].code, 'adformOpenRTB');
+      assert.equal(spec.aliases[0].gvlid, 50);
+    });
+  });
+
   describe('isBidRequestValid', function () {
     let bid = {
       'bidder': 'adformOpenRTB',
@@ -28,11 +35,13 @@ describe('AdformOpenRTB adapter', function () {
   });
 
   describe('buildRequests', function () {
+    beforeEach(function () {
+      config.resetConfig();
+    });
     it('should send request with correct structure', function () {
       let validBidRequests = [{
         bidId: 'bidId',
         params: {
-          siteId: 'siteId',
           adxDomain: '10.8.57.207'
         }
       }];
@@ -46,7 +55,7 @@ describe('AdformOpenRTB adapter', function () {
 
     describe('user privacy', function () {
       it('should send GDPR Consent data to adform if gdprApplies', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
+        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);
 
@@ -56,7 +65,7 @@ describe('AdformOpenRTB adapter', function () {
       });
 
       it('should send gdpr as number', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
+        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);
 
@@ -65,7 +74,7 @@ describe('AdformOpenRTB adapter', function () {
       });
 
       it('should send CCPA Consent data to adform', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', test: 1 } }];
+        let validBidRequests = [{ bidId: 'bidId', params: { test: 1 } }];
         let bidderRequest = { uspConsent: '1YA-', refererInfo: { referer: 'page' } };
         let request = JSON.parse(spec.buildRequests(validBidRequests, bidderRequest).data);
 
@@ -111,7 +120,7 @@ describe('AdformOpenRTB adapter', function () {
     it('should add test and is_debug to request, if test is set in parameters', function () {
       let validBidRequests = [{
         bidId: 'bidId',
-        params: { siteId: 'siteId', test: 1 }
+        params: { test: 1 }
       }];
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
 
@@ -144,26 +153,66 @@ describe('AdformOpenRTB adapter', function () {
     });
 
     it('should send info about device', function () {
+      config.setConfig({
+        device: { w: 100, h: 100 }
+      });
       let validBidRequests = [{
         bidId: 'bidId',
-        params: { siteId: 'siteId' }
+        params: { mid: '1000' }
       }];
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).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' },
+        ortb2: { app: { name: 'appname' } }
+      });
+      let validBidRequests = [{
+        bidId: 'bidId',
+        params: { mid: '1000' }
+      }];
+      let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).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'
+          }
+        },
+        ortb2: {
+          site: {
+            publisher: {
+              name: 'publisher\'s name'
+            }
+          }
+        }
+      });
       let validBidRequests = [{
         bidId: 'bidId',
-        params: { siteId: 'siteId', publisher: {id: '123123', domain: 'publisher.domain.com', name: 'publisher\'s name'} }
+        params: { mid: '1000' }
       }];
       let refererInfo = { referer: 'page' };
       let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo }).data);
 
       assert.deepEqual(request.site, {
         page: refererInfo.referer,
-        publisher: validBidRequests[0].params.publisher,
-        id: validBidRequests[0].params.siteId
+        publisher: {
+          domain: 'publisher.domain.com',
+          name: 'publisher\'s name'
+        },
+        id: '123123'
       });
     });
 
@@ -206,7 +255,7 @@ describe('AdformOpenRTB adapter', function () {
       it('should send correct priceType value', function () {
         let validBidRequests = [{
           bidId: 'bidId',
-          params: { siteId: 'siteId', priceType: 'net' }
+          params: { priceType: 'net' }
         }];
         let request = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data);
 
@@ -230,13 +279,16 @@ describe('AdformOpenRTB adapter', function () {
       it('should add incrementing values of id', function () {
         let validBidRequests = [{
           bidId: 'bidId',
-          params: { siteId: 'siteId' }
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
         }, {
           bidId: 'bidId2',
-          params: { siteId: 'siteId' }
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
         }, {
           bidId: 'bidId3',
-          params: { siteId: 'siteId' }
+          params: { mid: '1000' },
+          mediaTypes: {video: {}}
         }];
         let imps = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp;
 
@@ -246,21 +298,106 @@ describe('AdformOpenRTB adapter', function () {
       });
 
       it('should add mid', function () {
-        let validBidRequests = [{ bidId: 'bidId', params: { siteId: 'siteId', mid: 1000 } },
-          { bidId: 'bidId2', params: { siteId: 'siteId', mid: 1001 } },
-          { bidId: 'bidId3', params: { siteId: 'siteId', mid: 1002 } }];
+        let validBidRequests = [{ bidId: 'bidId', params: {mid: 1000}, mediaTypes: {video: {}} },
+          { bidId: 'bidId2', params: {mid: 1001}, mediaTypes: {video: {}} },
+          { bidId: 'bidId3', params: {mid: 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.mid);
         }
       });
 
+      describe('multiple media types', function () {
+        it('should use single media type for bidding', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 1000 },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              video: {}
+            }
+          }, {
+            bidId: 'bidId1',
+            params: { mid: 1000 },
+            mediaTypes: {
+              video: {},
+              native: {}
+            }
+          }, {
+            bidId: 'bidId2',
+            params: { mid: 1000 },
+            nativeParams: {
+              title: { required: true, len: 140 }
+            },
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100], [200, 300]]
+              },
+              native: {}
+            }
+          }];
+          let [ banner, video, native ] = JSON.parse(spec.buildRequests(validBidRequests, { refererInfo: { referer: 'page' } }).data).imp;
+
+          assert.ok(banner.banner);
+          assert.equal(banner.video, undefined);
+          assert.equal(banner.native, undefined);
+          assert.ok(video.video);
+          assert.equal(video.banner, undefined);
+          assert.equal(video.native, undefined);
+          assert.ok(native.native);
+          assert.equal(native.video, undefined);
+          assert.equal(native.banner, undefined);
+        });
+      });
+
+      describe('banner', function () {
+        it('should convert sizes to openrtb format', function () {
+          let validBidRequests = [{
+            bidId: 'bidId',
+            params: { mid: 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: { mid: 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: { siteId: 'siteId', mid: 1000 },
+              params: { mid: 1000 },
               nativeParams: {
                 title: { required: true, len: 140 },
                 image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -276,7 +413,7 @@ describe('AdformOpenRTB adapter', function () {
           it('should add required key if it is necessary', function () {
             let validBidRequests = [{
               bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
+              params: { mid: 1000 },
               nativeParams: {
                 title: { required: true, len: 140 },
                 image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -296,7 +433,7 @@ describe('AdformOpenRTB adapter', function () {
           it('should map img and data assets', function () {
             let validBidRequests = [{
               bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
+              params: { mid: 1000 },
               nativeParams: {
                 title: { required: true, len: 140 },
                 image: { required: true, sizes: [150, 50] },
@@ -323,7 +460,7 @@ describe('AdformOpenRTB adapter', function () {
             it('should flatten sizes and utilise first pair', function () {
               const validBidRequests = [{
                 bidId: 'bidId',
-                params: { siteId: 'siteId', mid: 1000 },
+                params: { mid: 1000 },
                 nativeParams: {
                   image: {
                     sizes: [[200, 300], [100, 200]]
@@ -341,7 +478,7 @@ describe('AdformOpenRTB adapter', function () {
           it('should utilise aspect_ratios', function () {
             const validBidRequests = [{
               bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
+              params: { mid: 1000 },
               nativeParams: {
                 image: {
                   aspect_ratios: [{
@@ -373,7 +510,7 @@ describe('AdformOpenRTB adapter', function () {
           it('should not throw error if aspect_ratios config is not defined', function () {
             const validBidRequests = [{
               bidId: 'bidId',
-              params: { siteId: 'siteId', mid: 1000 },
+              params: { mid: 1000 },
               nativeParams: {
                 image: {
                   aspect_ratios: []
@@ -391,7 +528,7 @@ describe('AdformOpenRTB adapter', function () {
         it('should expect any dimensions if min_width not passed', function () {
           const validBidRequests = [{
             bidId: 'bidId',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               image: {
                 aspect_ratios: [{
@@ -434,7 +571,7 @@ describe('AdformOpenRTB adapter', function () {
         bids: [
           {
             bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -443,7 +580,7 @@ describe('AdformOpenRTB adapter', function () {
           },
           {
             bidId: 'bidId2',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -475,7 +612,7 @@ describe('AdformOpenRTB adapter', function () {
         bids: [
           {
             bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -484,7 +621,7 @@ describe('AdformOpenRTB adapter', function () {
           },
           {
             bidId: 'bidId2',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -493,7 +630,7 @@ describe('AdformOpenRTB adapter', function () {
           },
           {
             bidId: 'bidId3',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -502,7 +639,7 @@ describe('AdformOpenRTB adapter', function () {
           },
           {
             bidId: 'bidId4',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -536,7 +673,9 @@ describe('AdformOpenRTB adapter', function () {
                   assets: [],
                   link: { url: 'link' },
                   imptrackers: ['imptrackers url1', 'imptrackers url2']
-                }
+                },
+                dealid: 'deal-id',
+                adomain: [ 'demo.com' ]
               }
             ]
           }],
@@ -548,7 +687,8 @@ describe('AdformOpenRTB adapter', function () {
         bids: [
           {
             bidId: 'bidId1',
-            params: { siteId: 'siteId', mid: 1000 },
+            params: { mid: 1000 },
+            mediaType: 'native',
             nativeParams: {
               title: { required: true, len: 140 },
               image: { required: false, wmin: 836, hmin: 627, w: 325, h: 300, mimes: ['image/jpg', 'image/gif'] },
@@ -567,7 +707,9 @@ describe('AdformOpenRTB adapter', function () {
       assert.deepEqual(bids[0].netRevenue, false);
       assert.deepEqual(bids[0].currency, serverResponse.body.cur);
       assert.deepEqual(bids[0].mediaType, 'native');
-      assert.deepEqual(bids[0].bidderCode, 'adformOpenRTB');
+      assert.deepEqual(bids[0].meta.mediaType, 'native');
+      assert.deepEqual(bids[0].meta.advertiserDomains, [ 'demo.com' ]);
+      assert.deepEqual(bids[0].dealId, 'deal-id');
     });
     it('should set correct native params', function () {
       const bid = [
@@ -672,5 +814,96 @@ describe('AdformOpenRTB adapter', function () {
       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: '' }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 },
+              mediaType: 'banner'
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].ad, '');
+      });
+    });
+
+    describe('video', function () {
+      it('should set vastXml on response', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '' }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 },
+              mediaType: 'video'
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.equal(bids.length, 1);
+        assert.equal(bids[0].vastXml, '');
+      });
+
+      it('should add renderer for outstream bids', function () {
+        let serverResponse = {
+          body: {
+            seatbid: [{
+              bid: [{ impid: '1', adm: '' }, { impid: '2', adm: '' }]
+            }]
+          }
+        };
+        let bidRequest = {
+          data: {},
+          bids: [
+            {
+              bidId: 'bidId1',
+              params: { mid: 1000 },
+              mediaType: 'video',
+              mediaTypes: {
+                video: {
+                  context: 'outstream'
+                }
+              }
+            },
+            {
+              bidId: 'bidId2',
+              params: { mid: 1000 },
+              mediaType: 'video',
+              mediaTypes: {
+                video: {
+                  constext: 'instream'
+                }
+              }
+            }
+          ]
+        };
+
+        bids = spec.interpretResponse(serverResponse, bidRequest);
+        assert.ok(bids[0].renderer);
+        assert.equal(bids[1].renderer, undefined);
+      });
+    });
   });
 });
diff --git a/test/spec/modules/adformBidAdapter_spec.js b/test/spec/modules/adformBidAdapter_spec.js
index 360979659de..79ea76da8dd 100644
--- a/test/spec/modules/adformBidAdapter_spec.js
+++ b/test/spec/modules/adformBidAdapter_spec.js
@@ -149,6 +149,45 @@ describe('Adform adapter', function () {
       });
     });
 
+    it('should allow to pass custom extended ids', function () {
+      bids[0].params.eids = 'some_id_value';
+      let request = spec.buildRequests(bids);
+      let eids = parseUrl(request.url).query.eids;
+
+      assert.equal(eids, 'some_id_value');
+    });
+
+    it('should add parameter to global parameters if it exists in all bids', function () {
+      const _bids = [];
+      _bids.push(bids[0]);
+      _bids.push(bids[1]);
+      _bids.push(bids[2]);
+      _bids[0].params.mkv = 'key:value,key1:value1';
+      _bids[1].params.mkv = 'key:value,key1:value1,keyR:removed';
+      _bids[2].params.mkv = 'key:value,key1:value1,keyR:removed,key8:value1';
+      _bids[0].params.mkw = 'targeting';
+      _bids[1].params.mkw = 'targeting';
+      _bids[2].params.mkw = 'targeting,targeting2';
+      _bids[0].params.msw = 'search:word,search:word2';
+      _bids[1].params.msw = 'search:word';
+      _bids[2].params.msw = 'search:word,search:word5';
+      let bidList = _bids;
+      let request = spec.buildRequests(bidList);
+      let parsedUrl = parseUrl(request.url);
+      assert.equal(parsedUrl.query.mkv, encodeURIComponent('key:value,key1:value1'));
+      assert.equal(parsedUrl.query.mkw, 'targeting');
+      assert.equal(parsedUrl.query.msw, encodeURIComponent('search:word'));
+      assert.ok(!parsedUrl.items[0].mkv);
+      assert.ok(!parsedUrl.items[0].mkw);
+      assert.equal(parsedUrl.items[0].msw, 'search:word2');
+      assert.equal(parsedUrl.items[1].mkv, 'keyR:removed');
+      assert.ok(!parsedUrl.items[1].mkw);
+      assert.ok(!parsedUrl.items[1].msw);
+      assert.equal(parsedUrl.items[2].mkv, 'keyR:removed,key8:value1');
+      assert.equal(parsedUrl.items[2].mkw, 'targeting2');
+      assert.equal(parsedUrl.items[2].msw, 'search:word5');
+    });
+
     describe('user privacy', function () {
       it('should send GDPR Consent data to adform if gdprApplies', function () {
         let request = spec.buildRequests([bids[0]], {gdprConsent: {gdprApplies: true, consentString: 'concentDataString'}});
@@ -219,6 +258,7 @@ describe('Adform adapter', function () {
       assert.equal(result.currency, 'EUR');
       assert.equal(result.netRevenue, true);
       assert.equal(result.ttl, 360);
+      assert.deepEqual(result.meta.advertiserDomains, [])
       assert.equal(result.ad, '');
       assert.equal(result.bidderCode, 'adform');
       assert.equal(result.transactionId, '5f33781f-9552-4ca1');
diff --git a/test/spec/modules/adhashBidAdapter_spec.js b/test/spec/modules/adhashBidAdapter_spec.js
new file mode 100644
index 00000000000..ab4df84c093
--- /dev/null
+++ b/test/spec/modules/adhashBidAdapter_spec.js
@@ -0,0 +1,155 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adhashBidAdapter.js';
+
+describe('adhashBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    const validBid = {
+      bidder: 'adhash',
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb',
+        platformURL: 'https://adhash.org/p/struma/'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [[300, 250]],
+      bidId: '12345678901234',
+      bidderRequestId: '98765432109876',
+      auctionId: '01234567891234',
+    };
+
+    it('should return true when all mandatory parameters are there', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when there are no params', function () {
+      const bid = { ...validBid };
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when unsupported media type is requested', function () {
+      const bid = { ...validBid };
+      bid.mediaTypes = { native: { sizes: [[300, 250]] } };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.publisherId = 'short string';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not a string', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when publisherId is not valid', function () {
+      const bid = { ...validBid };
+      bid.params.platformURL = 'https://';
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequest = {
+      params: {
+        publisherId: '0xc3b09b27e9c6ef73957901aa729b9e69e5bbfbfb'
+      },
+      sizes: [[300, 250]],
+      adUnitCode: 'adUnitCode'
+    };
+    it('should build the request correctly', function () {
+      const result = spec.buildRequests(
+        [ bidRequest ],
+        { gdprConsent: true, refererInfo: { referer: 'http://example.com/' } }
+      );
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.org/rtb?version=1.0&prebid=true');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+    it('should build the request correctly without referer', function () {
+      const result = spec.buildRequests([ bidRequest ], { gdprConsent: true });
+      expect(result.length).to.equal(1);
+      expect(result[0].method).to.equal('POST');
+      expect(result[0].url).to.equal('https://bidder.adhash.org/rtb?version=1.0&prebid=true');
+      expect(result[0].bidRequest).to.equal(bidRequest);
+      expect(result[0].data).to.have.property('timezone');
+      expect(result[0].data).to.have.property('location');
+      expect(result[0].data).to.have.property('publisherId');
+      expect(result[0].data).to.have.property('size');
+      expect(result[0].data).to.have.property('navigator');
+      expect(result[0].data).to.have.property('creatives');
+      expect(result[0].data).to.have.property('blockedCreatives');
+      expect(result[0].data).to.have.property('currentTimestamp');
+      expect(result[0].data).to.have.property('recentAds');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const request = {
+      data: { some: 'data' },
+      bidRequest: {
+        bidId: '12345678901234',
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250]],
+        params: {
+          platformURL: 'https://adhash.org/p/struma/'
+        }
+      }
+    };
+
+    it('should interpret the response correctly', function () {
+      const serverResponse = {
+        body: {
+          creatives: [{
+            costEUR: 1.234
+          }]
+        }
+      };
+      const result = spec.interpretResponse(serverResponse, request);
+      expect(result.length).to.equal(1);
+      expect(result[0].requestId).to.equal('12345678901234');
+      expect(result[0].cpm).to.equal(1.234);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('adunit-code');
+      expect(result[0].netRevenue).to.equal(true);
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].ttl).to.equal(60);
+    });
+
+    it('should return empty array when there are no creatives returned', function () {
+      expect(spec.interpretResponse({body: {creatives: []}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when there is no creatives key in the response', function () {
+      expect(spec.interpretResponse({body: {}}, request).length).to.equal(0);
+    });
+
+    it('should return empty array when something is not right', function () {
+      expect(spec.interpretResponse(null, request).length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/adheseBidAdapter_spec.js b/test/spec/modules/adheseBidAdapter_spec.js
index def504b0424..526102c51fe 100644
--- a/test/spec/modules/adheseBidAdapter_spec.js
+++ b/test/spec/modules/adheseBidAdapter_spec.js
@@ -17,10 +17,9 @@ let minimalBid = function() {
   }
 };
 
-let bidWithParams = function(data, userId) {
+let bidWithParams = function(data) {
   let bid = minimalBid();
   bid.params.data = data;
-  bid.userId = userId;
   return bid;
 };
 
@@ -71,40 +70,71 @@ describe('AdheseAdapter', function () {
       }
     };
 
+    it('should include requested slots', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).slots[0].slotname).to.equal('_main_page_-leaderboard');
+    });
+
     it('should include all extra bid params', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/ag25');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] });
     });
 
-    it('should include duplicate bid params once', function () {
+    it('should assign bid params per slot', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ag': '25' }), bidWithParams({ 'ag': '25', 'ci': 'gent' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/ag25/cigent');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ag': [ '25' ] }).and.not.to.deep.include({ 'ci': [ 'gent' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ag': [ '25' ] }).and.to.deep.include({ 'ci': [ 'gent' ] });
     });
 
     it('should split multiple target values', function () {
       let req = spec.buildRequests([ bidWithParams({ 'ci': 'london' }), bidWithParams({ 'ci': 'gent' }) ], bidderRequest);
 
-      expect(req.url).to.contain('/sl_main_page_-leaderboard/cilondon;gent');
+      expect(JSON.parse(req.data).slots[0].parameters).to.deep.include({ 'ci': [ 'london' ] });
+      expect(JSON.parse(req.data).slots[1].parameters).to.deep.include({ 'ci': [ 'gent' ] });
+    });
+
+    it('should filter out empty params', function () {
+      let req = spec.buildRequests([ bidWithParams({ 'aa': [], 'bb': null, 'cc': '', 'dd': [ '', '' ], 'ee': [ 0, 1, null ], 'ff': 0, 'gg': [ 'x', 'y', '' ] }) ], bidderRequest);
+
+      let params = JSON.parse(req.data).slots[0].parameters;
+      expect(params).to.not.have.any.keys('aa', 'bb', 'cc', 'dd');
+      expect(params).to.deep.include({ 'ee': [ 0, 1 ], 'ff': [ 0 ], 'gg': [ 'x', 'y' ] });
     });
 
     it('should include gdpr consent param', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/xtCONSENT_STRING');
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xt': [ 'CONSENT_STRING' ] });
     });
 
     it('should include referer param in base64url format', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/xfaHR0cDovL3ByZWJpZC5vcmcvZGV2LWRvY3Mvc3ViamVjdHM_X2Q9MQ');
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xf': [ 'aHR0cDovL3ByZWJpZC5vcmcvZGV2LWRvY3Mvc3ViamVjdHM_X2Q9MQ' ] });
+    });
+
+    it('should include eids', function () {
+      let bid = minimalBid();
+      bid.userIdAsEids = [{ source: 'id5-sync.com', uids: [{ id: 'ID5@59sigaS-...' }] }];
+
+      let req = spec.buildRequests([ bid ], bidderRequest);
+
+      expect(JSON.parse(req.data).user.ext.eids).to.deep.equal(bid.userIdAsEids);
     });
 
-    it('should include id5 id as /x5 param', function () {
-      let req = spec.buildRequests([ bidWithParams({}, {'id5id': 'ID5-1234567890'}) ], bidderRequest);
+    it('should not include eids field when userid module disabled', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
-      expect(req.url).to.contain('/x5ID5-1234567890');
+      expect(JSON.parse(req.data)).to.not.have.key('eids');
+    });
+
+    it('should request vast content as url', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).vastContentAsUrl).to.equal(true);
     });
 
     it('should include bids', function () {
@@ -113,6 +143,18 @@ describe('AdheseAdapter', function () {
 
       expect(req.bids).to.deep.equal([ bid ]);
     });
+
+    it('should make a POST request', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(req.method).to.equal('POST');
+    });
+
+    it('should request the json endpoint', function () {
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(req.url).to.equal('https://ads-demo.adhese.com/json');
+    });
   });
 
   describe('interpretResponse', () => {
@@ -144,7 +186,7 @@ describe('AdheseAdapter', function () {
             body: '
',
             tracker: 'https://hosts-demo.adhese.com/rtb_gateway/handlers/client/track/?id=a2f39296-6dd0-4b3c-be85-7baa22e7ff4a',
             impressionCounter: 'https://hosts-demo.adhese.com/rtb_gateway/handlers/client/track/?id=a2f39296-6dd0-4b3c-be85-7baa22e7ff4a',
-            extension: {'prebid': {'cpm': {'amount': '1.000000', 'currency': 'USD'}}}
+            extension: {'prebid': {'cpm': {'amount': '1.000000', 'currency': 'USD'}}, mediaType: 'banner'}
           }
         ]
       };
@@ -191,7 +233,7 @@ describe('AdheseAdapter', function () {
             width: '640',
             height: '350',
             body: '',
-            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}}
+            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}, mediaType: 'video'}
           }
         ]
       };
@@ -211,11 +253,49 @@ describe('AdheseAdapter', function () {
         adhese: {
           origin: 'RUBICON',
           originInstance: '',
-          originData: {} }
+          originData: {}
+        }
       }];
       expect(spec.interpretResponse(sspVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
+    it('should get correct ssp cache video response', () => {
+      let sspCachedVideoResponse = {
+        body: [
+          {
+            origin: 'RUBICON',
+            ext: 'js',
+            slotName: '_main_page_-leaderboard',
+            adType: 'leaderboard',
+            width: '640',
+            height: '350',
+            cachedBodyUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+            extension: {'prebid': {'cpm': {'amount': '2.1', 'currency': 'USD'}}, mediaType: 'video'}
+          }
+        ]
+      };
+
+      let expectedResponse = [{
+        requestId: BID_ID,
+        vastUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+        cpm: 2.1,
+        currency: 'USD',
+        creativeId: 'RUBICON',
+        dealId: '',
+        width: 640,
+        height: 350,
+        mediaType: 'video',
+        netRevenue: NET_REVENUE,
+        ttl: TTL,
+        adhese: {
+          origin: 'RUBICON',
+          originInstance: '',
+          originData: {}
+        }
+      }];
+      expect(spec.interpretResponse(sspCachedVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
+    });
+
     it('should get correct Adhese banner response', () => {
       const adheseBannerResponse = {
         body: [
@@ -253,7 +333,8 @@ describe('AdheseAdapter', function () {
                   amount: '5.96',
                   currency: 'USD'
                 }
-              }
+              },
+              mediaType: 'banner'
             }
           }
         ]
@@ -315,7 +396,10 @@ describe('AdheseAdapter', function () {
             impressionCounter: 'https://hosts-demo.adhese.com/track/742898',
             origin: 'JERLICIA',
             originData: {},
-            auctionable: true
+            auctionable: true,
+            extension: {
+              mediaType: 'video'
+            }
           }
         ]
       };
@@ -353,6 +437,70 @@ describe('AdheseAdapter', function () {
       expect(spec.interpretResponse(adheseVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
     });
 
+    it('should get correct Adhese cached video response', () => {
+      const adheseVideoResponse = {
+        body: [
+          {
+            adType: 'preroll',
+            adFormat: '',
+            orderId: '22248',
+            adspaceId: '164196',
+            body: '',
+            height: '360',
+            width: '640',
+            extension: {
+              mediaType: 'video'
+            },
+            cachedBodyUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+            libId: '89860',
+            id: '742470',
+            advertiserId: '2263',
+            ext: 'advar',
+            orderName: 'Smartphoto EOY-20181112',
+            creativeName: 'PREROLL',
+            slotName: '_main_page_-leaderboard',
+            slotID: '41711',
+            impressionCounter: 'https://hosts-demo.adhese.com/track/742898',
+            origin: 'JERLICIA',
+            originData: {},
+            auctionable: true
+          }
+        ]
+      };
+
+      let expectedResponse = [{
+        requestId: BID_ID,
+        vastUrl: 'https://ads-demo.adhese.com/content/38983ccc-4083-4c24-932c-96f798d969b3',
+        adhese: {
+          origin: '',
+          originInstance: '',
+          originData: {
+            adFormat: '',
+            adId: '742470',
+            adType: 'preroll',
+            adspaceId: '164196',
+            libId: '89860',
+            orderProperty: undefined,
+            priority: undefined,
+            viewableImpressionCounter: undefined,
+            slotId: '41711',
+            slotName: '_main_page_-leaderboard',
+            advertiserId: '2263',
+          }
+        },
+        cpm: 0,
+        currency: 'USD',
+        creativeId: '742470',
+        dealId: '22248',
+        width: 640,
+        height: 360,
+        mediaType: 'video',
+        netRevenue: NET_REVENUE,
+        ttl: TTL,
+      }];
+      expect(spec.interpretResponse(adheseVideoResponse, bidRequest)).to.deep.equal(expectedResponse);
+    });
+
     it('should return no bids for empty adserver response', () => {
       let adserverResponse = { body: [] };
       expect(spec.interpretResponse(adserverResponse, bidRequest)).to.be.empty;
diff --git a/test/spec/modules/adkernelAdnAnalytics_spec.js b/test/spec/modules/adkernelAdnAnalytics_spec.js
index e7ef831080c..7af96c9321c 100644
--- a/test/spec/modules/adkernelAdnAnalytics_spec.js
+++ b/test/spec/modules/adkernelAdnAnalytics_spec.js
@@ -1,6 +1,6 @@
-import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter.js';
+import analyticsAdapter, {ExpiringQueue, getUmtSource, storage} from 'modules/adkernelAdnAnalyticsAdapter';
 import {expect} from 'chai';
-import adapterManager from 'src/adapterManager.js';
+import adapterManager from 'src/adapterManager';
 import CONSTANTS from 'src/constants.json';
 
 const events = require('../../../src/events');
@@ -158,11 +158,16 @@ describe('', function () {
       sizes: [[300, 250]],
       bidId: '208750227436c1',
       bidderRequestId: '1a6fc81528d0f6',
-      auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f'
+      auctionId: '5018eb39-f900-4370-b71e-3bb5b48d324f',
+      gdprConsent: {
+        consentString: 'CONSENT',
+        gdprApplies: true,
+        apiVersion: 2
+      },
+      uspConsent: '1---'
     }],
     auctionStart: 1509369418387,
-    timeout: 3000,
-    start: 1509369418389
+    timeout: 3000
   };
 
   const RESPONSE = {
@@ -202,6 +207,10 @@ describe('', function () {
       events.getEvents.restore();
     });
 
+    after(function() {
+      sandbox.restore();
+    });
+
     it('should be configurable', function () {
       adapterManager.registerAnalyticsAdapter({
         code: 'adkernelAdn',
@@ -221,7 +230,7 @@ describe('', function () {
     });
 
     it('should handle auction init event', function () {
-      events.emit(CONSTANTS.EVENTS.AUCTION_INIT, {config: {}, timeout: 3000});
+      events.emit(CONSTANTS.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'});
diff --git a/test/spec/modules/adkernelAdnBidAdapter_spec.js b/test/spec/modules/adkernelAdnBidAdapter_spec.js
index 3d3e64aeec9..c4ad134711a 100644
--- a/test/spec/modules/adkernelAdnBidAdapter_spec.js
+++ b/test/spec/modules/adkernelAdnBidAdapter_spec.js
@@ -1,5 +1,6 @@
 import {expect} from 'chai';
-import {spec} from 'modules/adkernelAdnBidAdapter.js';
+import {spec} from 'modules/adkernelAdnBidAdapter';
+import {config} from 'src/config';
 
 describe('AdkernelAdn adapter', function () {
   const bid1_pub1 = {
@@ -106,7 +107,12 @@ describe('AdkernelAdn adapter', function () {
         bid: 5.0,
         tag: '',
         w: 300,
-        h: 250
+        h: 250,
+        advertiserId: 777,
+        advertiserName: 'advertiser',
+        agencyName: 'agency',
+        advertiserDomains: ['example.com'],
+        primaryCatId: 'IAB1-1',
       }, {
         id: 'ad-unit-2',
         impid: '31d798477126c4',
@@ -114,7 +120,12 @@ describe('AdkernelAdn adapter', function () {
         bid: 2.5,
         tag: '',
         w: 300,
-        h: 250
+        h: 250,
+        advertiserId: 777,
+        advertiserName: 'advertiser',
+        agencyName: 'agency',
+        advertiserDomains: ['example.com'],
+        secondaryCatIds: ['IAB1-4', 'IAB8-16', 'IAB25-5']
       }, {
         id: 'video_wrapper',
         impid: '57d602ad1c9545',
@@ -205,7 +216,6 @@ describe('AdkernelAdn adapter', function () {
     fullBidderRequest.bids = bidRequests;
     let pbRequests = spec.buildRequests(bidRequests, fullBidderRequest);
     let tagRequests = pbRequests.map(r => JSON.parse(r.data));
-
     return [pbRequests, tagRequests];
   }
 
@@ -263,6 +273,26 @@ describe('AdkernelAdn adapter', function () {
       expect(bidRequests[0].user).to.have.property('gdpr', 0);
       expect(bidRequests[0].user).to.not.have.property('consent');
     });
+
+    it('should\'t contain consent string if gdpr isn\'t applied', function () {
+      config.setConfig({coppa: true});
+      let [_, bidRequests] = buildRequest([bid1_pub1]);
+      config.resetConfig();
+      expect(bidRequests[0]).to.have.property('user');
+      expect(bidRequests[0].user).to.have.property('coppa', 1);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, bid1_pub1);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.145
+        }
+      };
+      let [, tagRequests] = buildRequest([bid]);
+      expect(tagRequests[0].imp[0]).to.have.property('bidfloor', 0.145);
+    });
   });
 
   describe('video request building', () => {
@@ -355,6 +385,11 @@ describe('AdkernelAdn adapter', function () {
       expect(resp).to.have.property('mediaType', 'banner');
       expect(resp).to.have.property('ad');
       expect(resp.ad).to.have.string('');
+      expect(resp.meta.advertiserId).to.be.eql(777);
+      expect(resp.meta.advertiserName).to.be.eql('advertiser');
+      expect(resp.meta.agencyName).to.be.eql('agency');
+      expect(resp.meta.advertiserDomains).to.be.eql(['example.com']);
+      expect(resp.meta.primaryCatId).to.be.eql('IAB1-1');
     });
 
     it('should return fully-initialized video bid-response', function () {
diff --git a/test/spec/modules/adkernelBidAdapter_spec.js b/test/spec/modules/adkernelBidAdapter_spec.js
index 71637781f24..ab1c5501bd9 100644
--- a/test/spec/modules/adkernelBidAdapter_spec.js
+++ b/test/spec/modules/adkernelBidAdapter_spec.js
@@ -1,8 +1,8 @@
 import {expect} from 'chai';
-import {spec} from 'modules/adkernelBidAdapter.js';
-import * as utils from 'src/utils.js';
+import {spec} from 'modules/adkernelBidAdapter';
+import * as utils from 'src/utils';
 import {NATIVE, BANNER, VIDEO} from 'src/mediaTypes';
-import {config} from 'src/config.js';
+import {config} from 'src/config';
 
 describe('Adkernel adapter', function () {
   const bid1_zone1 = {
@@ -28,7 +28,15 @@ describe('Adkernel adapter', function () {
         banner: {
           sizes: [[728, 90]]
         }
-      }
+      },
+      userIdAsEids: [
+        {
+          source: 'crwdcntrl.net',
+          uids: [
+            {atype: 1, id: '97d09fbba28542b7acbb6317c9534945a702b74c5993c352f332cfe83f40cdd9'}
+          ]
+        }
+      ]
     }, bid3_host2 = {
       bidder: 'adkernel',
       params: {zoneId: 1, host: 'rtb-private.adkernel.com'},
@@ -171,10 +179,10 @@ describe('Adkernel adapter', function () {
           nurl: 'https://rtb.com/win?i=ZjKoPYSFI3Y_0',
           adm: '',
           w: 300,
-          h: 250
+          h: 250,
+          dealid: 'deal'
         }]
       }],
-      cur: 'USD',
       ext: {
         adk_usersync: [{type: 1, url: 'https://adk.sync.com/sync'}]
       }
@@ -191,7 +199,6 @@ describe('Adkernel adapter', function () {
           cid: '16855'
         }]
       }],
-      cur: 'USD'
     }, usersyncOnlyResponse = {
       id: 'nobid1',
       ext: {
@@ -221,21 +228,38 @@ describe('Adkernel adapter', function () {
             }
           }),
           adomain: ['displayurl.com'],
+          cat: ['IAB1-4', 'IAB8-16', 'IAB25-5'],
           cid: '1',
-          crid: '4'
+          crid: '4',
+          ext: {
+            'advertiser_id': 777,
+            'advertiser_name': 'advertiser',
+            'agency_name': 'agency'
+          }
         }]
       }],
       bidid: 'pTuOlf5KHUo',
-      cur: 'USD'
+      cur: 'EUR'
     };
 
+  var sandbox;
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    config.resetConfig();
+  });
+
   function buildBidderRequest(url = 'https://example.com/index.html', params = {}) {
     return Object.assign({}, params, {refererInfo: {referer: url, reachedTop: true}, timeout: 3000, bidderCode: 'adkernel'});
   }
   const DEFAULT_BIDDER_REQUEST = buildBidderRequest();
 
   function buildRequest(bidRequests, bidderRequest = DEFAULT_BIDDER_REQUEST, dnt = true) {
-    let dntmock = sinon.stub(utils, 'getDNT').callsFake(() => dnt);
+    let dntmock = sandbox.stub(utils, 'getDNT').callsFake(() => dnt);
+    bidderRequest.bids = bidRequests;
     let pbRequests = spec.buildRequests(bidRequests, bidderRequest);
     dntmock.restore();
     let rtbRequests = pbRequests.map(r => JSON.parse(r.data));
@@ -307,6 +331,7 @@ describe('Adkernel adapter', function () {
     it('should fill device with caller macro', function () {
       expect(bidRequest).to.have.property('device');
       expect(bidRequest.device).to.have.property('ip', 'caller');
+      expect(bidRequest.device).to.have.property('ipv6', 'caller');
       expect(bidRequest.device).to.have.property('ua', 'caller');
       expect(bidRequest.device).to.have.property('dnt', 1);
     });
@@ -328,6 +353,14 @@ describe('Adkernel adapter', function () {
       expect(bidRequest.user.ext).to.be.eql({'consent': 'test-consent-string'});
     });
 
+    it('should contain coppa if configured', function () {
+      config.setConfig({coppa: true});
+      let [_, bidRequests] = buildRequest([bid1_zone1]);
+      let bidRequest = bidRequests[0];
+      expect(bidRequest).to.have.property('regs');
+      expect(bidRequest.regs).to.have.property('coppa', 1);
+    });
+
     it('should\'t contain consent string if gdpr isn\'t applied', function () {
       let [_, bidRequests] = buildRequest([bid1_zone1], buildBidderRequest('https://example.com/index.html', {gdprConsent: {gdprApplies: false}}));
       let bidRequest = bidRequests[0];
@@ -342,9 +375,32 @@ describe('Adkernel adapter', function () {
     });
 
     it('should forward default bidder timeout', function() {
-      let [_, bidRequests] = buildRequest([bid1_zone1], DEFAULT_BIDDER_REQUEST);
+      let [_, bidRequests] = buildRequest([bid1_zone1]);
       expect(bidRequests[0]).to.have.property('tmax', 3000);
     });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, bid1_zone1);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 0.145
+        }
+      };
+      let [_, bidRequests] = buildRequest([bid]);
+      expect(bidRequests[0].imp[0]).to.have.property('bidfloor', 0.145);
+    });
+
+    it('should forward user ids if available', function() {
+      let bid = Object.assign({}, bid2_zone2);
+      let [_, bidRequests] = buildRequest([bid]);
+      expect(bidRequests[0]).to.have.property('user');
+      expect(bidRequests[0].user).to.have.property('ext');
+      expect(bidRequests[0].user.ext).to.have.property('eids');
+      expect(bidRequests[0].user.ext.eids).to.be.an('array').that.is.not.empty;
+      expect(bidRequests[0].user.ext.eids[0]).to.have.property('source');
+      expect(bidRequests[0].user.ext.eids[0]).to.have.property('uids');
+    });
   });
 
   describe('video request building', function () {
@@ -495,6 +551,7 @@ describe('Adkernel adapter', function () {
       expect(resp).to.have.property('ttl');
       expect(resp).to.have.property('mediaType', BANNER);
       expect(resp).to.have.property('ad');
+      expect(resp).to.have.property('dealId', 'deal');
       expect(resp.ad).to.have.string('');
     });
 
@@ -540,8 +597,7 @@ describe('Adkernel adapter', function () {
 
   describe('adapter configuration', () => {
     it('should have aliases', () => {
-      expect(spec.aliases).to.have.lengthOf(6);
-      expect(spec.aliases).to.include.members(['headbidding', 'adsolut', 'oftmediahb', 'audiencemedia', 'waardex_ak', 'roqoon']);
+      expect(spec.aliases).to.be.an('array').that.is.not.empty;
     });
   });
 
@@ -575,7 +631,13 @@ describe('Adkernel adapter', function () {
       let resp = spec.interpretResponse({body: nativeResponse}, pbRequests[0])[0];
       expect(resp).to.have.property('requestId', 'Bid_01');
       expect(resp).to.have.property('cpm', 2.25);
-      expect(resp).to.have.property('currency', 'USD');
+      expect(resp).to.have.property('currency', 'EUR');
+      expect(resp).to.have.property('meta');
+      expect(resp.meta.advertiserId).to.be.eql(777);
+      expect(resp.meta.advertiserName).to.be.eql('advertiser');
+      expect(resp.meta.agencyName).to.be.eql('agency');
+      expect(resp.meta.advertiserDomains).to.be.eql(['displayurl.com']);
+      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');
diff --git a/test/spec/modules/adlooxAnalyticsAdapter_spec.js b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..9cc9c4ded4d
--- /dev/null
+++ b/test/spec/modules/adlooxAnalyticsAdapter_spec.js
@@ -0,0 +1,229 @@
+import adapterManager from 'src/adapterManager.js';
+import analyticsAdapter, { command as analyticsCommand, COMMAND } from 'modules/adlooxAnalyticsAdapter.js';
+import { AUCTION_COMPLETED } from 'src/auction.js';
+import { expect } from 'chai';
+import events from 'src/events.js';
+import { EVENTS } from 'src/constants.json';
+import * as utils from 'src/utils.js';
+import { loadExternalScriptStub } from 'test/mocks/adloaderStub.js';
+
+const analyticsAdapterName = 'adloox';
+
+describe('Adloox Analytics Adapter', function () {
+  let sandbox;
+
+  const esplode = 'esplode';
+
+  const bid = {
+    bidder: 'dummy',
+    adUnitCode: 'ad-slot-1',
+    mediaType: 'display'
+  };
+
+  const auctionDetails = {
+    auctionStatus: AUCTION_COMPLETED,
+    bidsReceived: [
+      bid
+    ]
+  };
+
+  const analyticsOptions = {
+    js: 'https://j.adlooxtracking.com/ads/js/tfav_adl_%%clientid%%.js',
+    client: 'adlooxtest',
+    clientid: 127,
+    platformid: 0,
+    tagid: 0,
+    params: {
+      dummy1: '%%client%%',
+      dummy2: '%%pbAdSlot%%',
+      dummy3: function(bid) { throw new Error(esplode) }
+    }
+  };
+
+  adapterManager.registerAnalyticsAdapter({
+    code: analyticsAdapterName,
+    adapter: analyticsAdapter
+  });
+  describe('enableAnalytics', function () {
+    describe('invalid options', function () {
+      it('should require options', function (done) {
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      it('should reject non-string options.js', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.js = function () { };
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      it('should reject non-function options.toselector', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.toselector = esplode;
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+
+      [ 'client', 'clientid', 'platformid', 'tagid' ].forEach(function (o) {
+        it('should require options.' + o, function (done) {
+          const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+          delete analyticsOptionsLocal[o];
+
+          adapterManager.enableAnalytics({
+            provider: analyticsAdapterName,
+            options: analyticsOptionsLocal
+          });
+          expect(analyticsAdapter.context).is.null;
+
+          done();
+        });
+      });
+
+      it('should reject non-object options.params', function (done) {
+        const analyticsOptionsLocal = utils.deepClone(analyticsOptions);
+        analyticsOptionsLocal.params = esplode;
+
+        adapterManager.enableAnalytics({
+          provider: analyticsAdapterName,
+          options: analyticsOptionsLocal
+        });
+        expect(analyticsAdapter.context).is.null;
+
+        done();
+      });
+    });
+  });
+
+  describe('process', function () {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+
+      sandbox.stub(events, 'getEvents').returns([]);
+
+      adapterManager.enableAnalytics({
+        provider: analyticsAdapterName,
+        options: utils.deepClone(analyticsOptions)
+      });
+
+      expect(analyticsAdapter.context).is.not.null;
+    });
+
+    afterEach(function () {
+      analyticsAdapter.disableAnalytics();
+      expect(analyticsAdapter.context).is.null;
+
+      sandbox.restore();
+      sandbox = undefined;
+    });
+
+    describe('event', function () {
+      it('should preload the script on AUCTION_END only once', function (done) {
+        const insertElementStub = sandbox.stub(utils, 'insertElement');
+
+        const uri = utils.parseUrl(analyticsAdapter.url(analyticsOptions.js));
+        const isLinkPreloadAsScript = function(arg) {
+          const href_uri = utils.parseUrl(arg.href);	// IE11 requires normalisation (hostname always includes port)
+          return arg.tagName === 'LINK' && arg.getAttribute('rel') === 'preload' && arg.getAttribute('as') === 'script' && href_uri.href === uri.href;
+        };
+
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
+        expect(insertElementStub.calledWith(sinon.match(isLinkPreloadAsScript))).to.true;
+
+        events.emit(EVENTS.AUCTION_END, auctionDetails);
+        expect(insertElementStub.callCount).to.equal(1);
+
+        done();
+      });
+
+      it('should inject verification JS on BID_WON', function (done) {
+        const url = analyticsAdapter.url(`${analyticsOptions.js}#`);
+
+        const parent = document.createElement('div');
+
+        const slot = document.createElement('div');
+        slot.id = bid.adUnitCode;
+        parent.appendChild(slot);
+
+        const dummy = document.createElement('div');
+        parent.appendChild(dummy);
+
+        const querySelectorStub = sandbox.stub(document, 'querySelector');
+        querySelectorStub.withArgs(`#${bid.adUnitCode}`).returns(slot);
+
+        events.emit(EVENTS.BID_WON, bid);
+
+        const [urlInserted, moduleCode] = loadExternalScriptStub.getCall(0).args;
+
+        expect(urlInserted.substr(0, url.length)).to.equal(url);
+        expect(moduleCode).to.equal(analyticsAdapterName);
+        expect(/[#&]creatype=2(&|$)/.test(urlInserted)).is.true; // prebid 'display' -> adloox '2'
+        expect(new RegExp('[#&]dummy3=' + encodeURIComponent('ERROR: ' + esplode) + '(&|$)').test(urlInserted)).is.true;
+
+        done();
+      });
+    });
+
+    describe('command', function () {
+      it('should return config', function (done) {
+        const expected = utils.deepClone(analyticsOptions);
+        delete expected.js;
+        delete expected.toselector;
+        delete expected.params;
+
+        analyticsCommand(COMMAND.CONFIG, null, function (response) {
+          expect(utils.deepEqual(response, expected)).is.true;
+
+          done();
+        });
+      });
+
+      it('should return expanded URL', function (done) {
+        const data = {
+          url: 'https://example.com?',
+          args: [
+            [ 'client', '%%client%%' ]
+          ],
+          bid: bid,
+          ids: true
+        };
+        const expected = `${data.url}${data.args[0][0]}=${analyticsOptions.client}`;
+
+        analyticsCommand(COMMAND.URL, data, function (response) {
+          expect(response.substr(0, expected.length)).is.equal(expected);
+
+          done();
+        });
+      });
+
+      it('should inject tracking event', function (done) {
+        const data = {
+          eventType: EVENTS.BID_WON,
+          args: bid
+        };
+
+        analyticsCommand(COMMAND.TRACK, data, function (response) {
+          expect(response).is.undefined;
+
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/admixerBidAdapter_spec.js b/test/spec/modules/admixerBidAdapter_spec.js
index 6d2e3059dc8..030e98d23f9 100644
--- a/test/spec/modules/admixerBidAdapter_spec.js
+++ b/test/spec/modules/admixerBidAdapter_spec.js
@@ -1,9 +1,11 @@
 import {expect} from 'chai';
 import {spec} from 'modules/admixerBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {config} from '../../../src/config.js';
 
 const BIDDER_CODE = 'admixer';
-const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.0.aspx';
+const ENDPOINT_URL = 'https://inv-nets.admixer.net/prebid.1.1.aspx';
+const ENDPOINT_URL_CUSTOM = 'https://custom.admixer.net/prebid.aspx';
 const ZONE_ID = '2eb6bd58-865c-47ce-af7f-a918108c3fd2';
 
 describe('AdmixerAdapter', function () {
@@ -57,6 +59,7 @@ describe('AdmixerAdapter', function () {
       }
     ];
     let bidderRequest = {
+      bidderCode: BIDDER_CODE,
       refererInfo: {
         referer: 'https://example.com'
       }
@@ -74,37 +77,53 @@ describe('AdmixerAdapter', function () {
       expect(request.url).to.equal(ENDPOINT_URL);
       expect(request.method).to.equal('GET');
     });
+
+    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}}
+      });
+      const request = config.runWithBidder(BIDDER_CODE, () => spec.buildRequests(validRequest, bidderRequest));
+      expect(request.url).to.equal(ENDPOINT_URL_CUSTOM);
+      expect(request.method).to.equal('GET');
+    });
   });
 
   describe('interpretResponse', function () {
     let response = {
-      body: [{
-        'currency': 'USD',
-        'cpm': 6.210000,
-        'ad': '
ad
',
-        'width': 300,
-        'height': 600,
-        'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
-        'ttl': 360,
-        'netRevenue': false,
-        'bidId': '5e4e763b6bc60b'
-      }]
+      body: {
+        ads: [{
+          'currency': 'USD',
+          'cpm': 6.210000,
+          'ad': '
ad
',
+          'width': 300,
+          'height': 600,
+          'creativeId': 'ccca3e5e-0c54-4761-9667-771322fbdffc',
+          'ttl': 360,
+          'netRevenue': false,
+          'bidId': '5e4e763b6bc60b',
+          'dealId': 'asd123',
+          'meta': {'advertiserId': 123, 'networkId': 123, 'advertiserDomains': ['test.com']}
+        }]
+      }
     };
 
     it('should get correct bid response', function () {
-      const body = response.body;
+      const ads = response.body.ads;
       let expectedResponse = [
         {
-          'requestId': body[0].bidId,
-          'cpm': body[0].cpm,
-          'creativeId': body[0].creativeId,
-          'width': body[0].width,
-          'height': body[0].height,
-          'ad': body[0].ad,
+          'requestId': ads[0].bidId,
+          'cpm': ads[0].cpm,
+          'creativeId': ads[0].creativeId,
+          'width': ads[0].width,
+          'height': ads[0].height,
+          'ad': ads[0].ad,
           'vastUrl': undefined,
-          'currency': body[0].currency,
-          'netRevenue': body[0].netRevenue,
-          'ttl': body[0].ttl,
+          'currency': ads[0].currency,
+          'netRevenue': ads[0].netRevenue,
+          'ttl': ads[0].ttl,
+          'dealId': ads[0].dealId,
+          'meta': {'advertiserId': 123, 'networkId': 123, 'advertiserDomains': ['test.com']}
         }
       ];
 
@@ -119,4 +138,34 @@ describe('AdmixerAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe('getUserSyncs', function () {
+    let imgUrl = 'https://example.com/img1';
+    let frmUrl = 'https://example.com/frm2';
+    let responses = [{
+      body: {
+        cm: {
+          pixels: [
+            imgUrl
+          ],
+          iframes: [
+            frmUrl
+          ],
+        }
+      }
+    }];
+
+    it('Returns valid values', function () {
+      let userSyncAll = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: true}, responses);
+      let userSyncImg = spec.getUserSyncs({pixelEnabled: true, iframeEnabled: false}, responses);
+      let userSyncFrm = spec.getUserSyncs({pixelEnabled: false, iframeEnabled: true}, responses);
+      expect(userSyncAll).to.be.an('array').with.lengthOf(2);
+      expect(userSyncImg).to.be.an('array').with.lengthOf(1);
+      expect(userSyncImg[0].url).to.be.equal(imgUrl);
+      expect(userSyncImg[0].type).to.be.equal('image');
+      expect(userSyncFrm).to.be.an('array').with.lengthOf(1);
+      expect(userSyncFrm[0].url).to.be.equal(frmUrl);
+      expect(userSyncFrm[0].type).to.be.equal('iframe');
+    });
+  });
 });
diff --git a/test/spec/modules/admixerIdSystem_spec.js b/test/spec/modules/admixerIdSystem_spec.js
new file mode 100644
index 00000000000..18107b780db
--- /dev/null
+++ b/test/spec/modules/admixerIdSystem_spec.js
@@ -0,0 +1,81 @@
+import {admixerIdSubmodule} from 'modules/admixerIdSystem.js';
+import * as utils from 'src/utils.js';
+import {server} from 'test/mocks/xhr.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+export const storage = getStorageManager();
+
+const pid = '4D393FAC-B6BB-4E19-8396-0A4813607316';
+const getIdParams = {params: {pid: pid}};
+describe('admixerId tests', function () {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if pid configParam was not passed when getId', function () {
+    admixerIdSubmodule.getId();
+    expect(logErrorStub.callCount).to.be.equal(1);
+
+    admixerIdSubmodule.getId({});
+    expect(logErrorStub.callCount).to.be.equal(2);
+
+    admixerIdSubmodule.getId({params: {}});
+    expect(logErrorStub.callCount).to.be.equal(3);
+
+    admixerIdSubmodule.getId({params: {pid: 123}});
+    expect(logErrorStub.callCount).to.be.equal(4);
+  });
+
+  it('should NOT call the admixer id endpoint if gdpr applies but consent string is missing', function () {
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams, { gdprApplies: true });
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should call the admixer id endpoint', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      200,
+      {},
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call callback with user id', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      200,
+      {},
+      JSON.stringify({setData: {visitorid: '571058d70bce453b80e6d98b4f8a81e3'}})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq('571058d70bce453b80e6d98b4f8a81e3');
+  });
+
+  it('should continue to callback if ajax response 204', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = admixerIdSubmodule.getId(getIdParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://inv-nets.admixer.net/cntcm.aspx?ssp=${pid}`);
+    request.respond(
+      204
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.undefined;
+  });
+});
diff --git a/test/spec/modules/adnowBidAdapter_spec.js b/test/spec/modules/adnowBidAdapter_spec.js
new file mode 100644
index 00000000000..a8013e3fa04
--- /dev/null
+++ b/test/spec/modules/adnowBidAdapter_spec.js
@@ -0,0 +1,163 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adnowBidAdapter.js';
+
+describe('adnowBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    it('Should return true', function() {
+      expect(spec.isBidRequestValid({
+        bidder: 'adnow',
+        params: {
+          codeId: 12345
+        }
+      })).to.equal(true);
+    });
+
+    it('Should return false when required params is not passed', function() {
+      expect(spec.isBidRequestValid({
+        bidder: 'adnow',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function() {
+    it('Common settings', function() {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData)
+        .to.match(/Id=12345/)
+        .to.match(/mediaType=native/)
+        .to.match(/out=prebid/)
+        .to.match(/requestid=bid12345/)
+        .to.match(/d_user_agent=.+/);
+    });
+
+    it('Banner sizes', function () {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        },
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData).to.match(/sizes=300x250/);
+    });
+
+    it('Native sizes', function () {
+      const bidRequestData = [{
+        bidId: 'bid12345',
+        params: {
+          codeId: 12345
+        },
+        mediaTypes: {
+          native: {
+            image: {
+              sizes: [100, 100]
+            }
+          }
+        }
+      }];
+
+      const req = spec.buildRequests(bidRequestData);
+      const reqData = req[0].data;
+
+      expect(reqData)
+        .to.match(/width=100/)
+        .to.match(/height=100/);
+    });
+  });
+
+  describe('interpretResponse', function() {
+    const request = {
+      bidRequest: {
+        bidId: 'bid12345'
+      }
+    };
+
+    it('Response with native bid', function() {
+      const response = {
+        currency: 'USD',
+        cpm: 0.5,
+        native: {
+          title: 'Title',
+          body: 'Body',
+          sponsoredBy: 'AdNow',
+          clickUrl: '//click.url',
+          image: {
+            url: '//img.url',
+            height: 200,
+            width: 200
+          }
+        },
+        meta: {
+          mediaType: 'native'
+        }
+      };
+
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.be.an('array').that.is.not.empty;
+
+      const bid = bids[0];
+      expect(bid).to.have.keys('requestId', 'cpm', 'currency', 'native', 'creativeId', 'netRevenue', 'meta', 'ttl');
+
+      const nativePart = bid.native;
+
+      expect(nativePart.title).to.be.equal('Title');
+      expect(nativePart.body).to.be.equal('Body');
+      expect(nativePart.clickUrl).to.be.equal('//click.url');
+      expect(nativePart.image.url).to.be.equal('//img.url');
+      expect(nativePart.image.height).to.be.equal(200);
+      expect(nativePart.image.width).to.be.equal(200);
+    });
+
+    it('Response with banner bid', function() {
+      const response = {
+        currency: 'USD',
+        cpm: 0.5,
+        ad: '
Banner
',
+        meta: {
+          mediaType: 'banner'
+        }
+      };
+
+      const bids = spec.interpretResponse({ body: response }, request);
+      expect(bids).to.be.an('array').that.is.not.empty;
+
+      const bid = bids[0];
+      expect(bid).to.have.keys(
+        'requestId', 'cpm', 'currency', 'ad', 'creativeId', 'netRevenue', 'meta', 'ttl', 'width', 'height'
+      );
+
+      expect(bid.ad).to.be.equal('
Banner
');
+    });
+
+    it('Response with no bid should return an empty array', function() {
+      const noBidResponses = [
+        false,
+        {},
+        {body: false},
+        {body: {}}
+      ];
+
+      noBidResponses.forEach(response => {
+        return expect(spec.interpretResponse(response, request)).to.be.an('array').that.is.empty;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/adnuntiusBidAdapter_spec.js b/test/spec/modules/adnuntiusBidAdapter_spec.js
index 54ff038c083..9c9bf0e9914 100644
--- a/test/spec/modules/adnuntiusBidAdapter_spec.js
+++ b/test/spec/modules/adnuntiusBidAdapter_spec.js
@@ -2,27 +2,45 @@
 import { expect } from 'chai'; // may prefer 'assert' in place of 'expect'
 import { spec } from 'modules/adnuntiusBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 
 describe('adnuntiusBidAdapter', function () {
-  const ENDPOINT_URL = 'https://delivery.adnuntius.com/i?tzo=-60&format=json';
+  afterEach(function () {
+    config.resetConfig();
+  });
+  const tzo = new Date().getTimezoneOffset();
+  const ENDPOINT_URL = `https://delivery.adnuntius.com/i?tzo=${tzo}&format=json`;
+  // const ENDPOINT_URL_SEGMENTS_ = `https://delivery.adnuntius.com/i?tzo=${tzo}&format=json`;
+  const ENDPOINT_URL_SEGMENTS = `https://delivery.adnuntius.com/i?tzo=${tzo}&format=json&segments=segment1,segment2,segment3`;
+  const ENDPOINT_URL_CONSENT = `https://delivery.adnuntius.com/i?tzo=${tzo}&format=json&consentString=consentString`;
   const adapter = newBidder(spec);
+
   const bidRequests = [
     {
+      bidId: '123',
       bidder: 'adnuntius',
       params: {
         auId: '8b6bc',
         network: 'adnuntius',
       },
-      bidId: '123'
+
     }
-  ];
+  ]
+
+  const singleBidRequest = {
+    bid: [
+      {
+        bidId: '123',
+      }
+    ]
+  }
 
   const serverResponse = {
     body: {
       'adUnits': [
         {
           'auId': '000000000008b6bc',
-          'targetId': '',
+          'targetId': '123',
           'html': '
hi!
',
           'matchedAdCount': 1,
           'responseId': 'adn-rsp-1460129238',
@@ -67,8 +85,15 @@ describe('adnuntiusBidAdapter', function () {
               'lineItemId': 'scyjdyv3mzgdsnpf',
               'layoutId': 'sw6gtws2rdj1kwby',
               'layoutName': 'Responsive image'
-            }
+            },
+
           ]
+        },
+        {
+          'auId': '000000000008b6bc',
+          'targetId': '456',
+          'matchedAdCount': 0,
+          'responseId': 'adn-rsp-1460129238',
         }
       ]
     }
@@ -96,22 +121,92 @@ describe('adnuntiusBidAdapter', function () {
       expect(request[0]).to.have.property('url');
       expect(request[0].url).to.equal(ENDPOINT_URL);
       expect(request[0]).to.have.property('data');
-      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\"}]}');
+      expect(request[0].data).to.equal('{\"adUnits\":[{\"auId\":\"8b6bc\",\"targetId\":\"123\"}]}');
+    });
+
+    it('should pass segments if available in config', function () {
+      config.setBidderConfig({
+        bidders: ['adnuntius', 'other'],
+        config: {
+          ortb2: {
+            user: {
+              data: [{
+                name: 'adnuntius',
+                segment: [{ id: 'segment1' }, { id: 'segment2' }]
+              },
+              {
+                name: 'other',
+                segment: ['segment3']
+              }],
+            }
+          }
+        }
+      });
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests));
+      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 () {
+      config.setBidderConfig({
+        bidders: ['adnuntius', 'other'],
+        config: {
+          ortb2: {
+            user: {
+              data: [{
+                name: 'adnuntius',
+                segment: [{ id: 'segment1' }, { id: 'segment2' }, { id: 'segment3' }]
+              },
+              {
+                name: 'other',
+                segment: [{
+                  notright: 'segment4'
+                }]
+              }],
+            }
+          }
+        }
+      });
+
+      const request = config.runWithBidder('adnuntius', () => spec.buildRequests(bidRequests));
+      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(bidRequests, { 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(bidRequests, { 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('interpretResponse', function () {
     it('should return valid response when passed valid server response', function () {
-      const request = spec.buildRequests(bidRequests);
-      const interpretedResponse = spec.interpretResponse(serverResponse, request[0]);
+      const interpretedResponse = spec.interpretResponse(serverResponse, singleBidRequest);
       const ad = serverResponse.body.adUnits[0].ads[0]
       expect(interpretedResponse).to.have.lengthOf(1);
       expect(interpretedResponse[0].cpm).to.equal(ad.cpm.amount);
       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.cpm.currency);
+      expect(interpretedResponse[0].currency).to.equal(ad.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('google.com');
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.adUnits[0].html);
       expect(interpretedResponse[0].ttl).to.equal(360);
     });
diff --git a/test/spec/modules/adoceanBidAdapter_spec.js b/test/spec/modules/adoceanBidAdapter_spec.js
index 2b4b7d711e1..43316cd7483 100644
--- a/test/spec/modules/adoceanBidAdapter_spec.js
+++ b/test/spec/modules/adoceanBidAdapter_spec.js
@@ -150,7 +150,8 @@ describe('AdoceanAdapter', function () {
           'width': '300',
           'height': '250',
           'crid': '0af345b42983cc4bc0',
-          'ttl': '300'
+          'ttl': '300',
+          'adomain': ['adocean.pl']
         }
       ],
       'headers': {
@@ -186,7 +187,10 @@ describe('AdoceanAdapter', function () {
           'ad': '',
           'creativeId': '0af345b42983cc4bc0',
           'ttl': 300,
-          'netRevenue': false
+          'netRevenue': false,
+          'meta': {
+            'advertiserDomains': ['adocean.pl']
+          }
         }
       ];
 
@@ -197,6 +201,8 @@ describe('AdoceanAdapter', function () {
       resultKeys.forEach(function(k) {
         if (k === 'ad') {
           expect(result[0][k]).to.match(/$/);
+        } else if (k === 'meta') {
+          expect(result[0][k]).to.deep.equal(expectedResponse[0][k]);
         } else {
           expect(result[0][k]).to.equal(expectedResponse[0][k]);
         }
diff --git a/test/spec/modules/adotBidAdapter_spec.js b/test/spec/modules/adotBidAdapter_spec.js
index 594fc4ac7b7..40605b17b20 100644
--- a/test/spec/modules/adotBidAdapter_spec.js
+++ b/test/spec/modules/adotBidAdapter_spec.js
@@ -25,19 +25,16 @@ describe('Adot Adapter', function () {
       bidder: 'adot',
       bidderRequestId: 'bid_request_id',
       bidId: 'bid_id',
-      params: {
+      params: {},
+      mediaTypes: {
         video: {
+          context: 'outstream',
+          playerSize: [[300, 250]],
           mimes: ['video/mp4'],
           minDuration: 5,
           maxDuration: 30,
           protocols: [2, 3]
         }
-      },
-      mediaTypes: {
-        video: {
-          context: 'outstream',
-          playerSize: [[300, 250]]
-        }
       }
     },
 
@@ -48,17 +45,17 @@ describe('Adot Adapter', function () {
       bidId: 'bid_id',
       params: {
         video: {
-          instreamContext: 'pre-roll',
-          mimes: ['video/mp4'],
-          minDuration: 5,
-          maxDuration: 30,
-          protocols: [2, 3]
+          instreamContext: 'pre-roll'
         }
       },
       mediaTypes: {
         video: {
           context: 'instream',
-          playerSize: [[300, 250]]
+          playerSize: [[300, 250]],
+          mimes: ['video/mp4'],
+          minDuration: 5,
+          maxDuration: 30,
+          protocols: [2, 3]
         }
       }
     },
@@ -557,6 +554,7 @@ describe('Adot Adapter', function () {
                 price: 1.5,
                 h: 350,
                 w: 300,
+                adomain: ['adot'],
                 ext: {
                   adot: {
                     media_type: 'banner'
@@ -568,6 +566,7 @@ describe('Adot Adapter', function () {
                 crid: 'creative_id_2',
                 adm: 'creative_data_2_${AUCTION_PRICE}',
                 nurl: 'win_notice_url_2_${AUCTION_PRICE}',
+                adomain: ['adot'],
                 price: 2.5,
                 h: 400,
                 w: 350,
@@ -913,14 +912,14 @@ describe('Adot Adapter', function () {
 
       it('should return true when given an ad unit without minimum duration parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.minDuration = undefined;
+        adUnit.mediaTypes.video.minDuration = undefined;
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(true);
       });
 
       it('should return true when given an ad unit without maximum duration parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.maxDuration = undefined;
+        adUnit.mediaTypes.video.maxDuration = undefined;
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(true);
       });
@@ -941,84 +940,84 @@ describe('Adot Adapter', function () {
 
       it('should return false when given an ad unit without video parameters', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video = undefined;
+        adUnit.mediaTypes.video = undefined;
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with invalid video parameters', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video = 'bad_bidder_parameters';
+        adUnit.mediaTypes.video = 'bad_bidder_parameters';
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit without mime types parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = undefined;
+        adUnit.mediaTypes.video.mimes = undefined;
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid mime types parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = 'bad_mime_types';
+        adUnit.mediaTypes.video.mimes = 'bad_mime_types';
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an empty mime types parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = [];
+        adUnit.mediaTypes.video.mimes = [];
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid mime types parameter value', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.mimes = [200];
+        adUnit.mediaTypes.video.mimes = [200];
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid minimum duration parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.minDuration = 'bad_min_duration';
+        adUnit.mediaTypes.video.minDuration = 'bad_min_duration';
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid maximum duration parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.maxDuration = 'bad_max_duration';
+        adUnit.mediaTypes.video.maxDuration = 'bad_max_duration';
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit without protocols parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = undefined;
+        adUnit.mediaTypes.video.protocols = undefined;
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid protocols parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = 'bad_protocols';
+        adUnit.mediaTypes.video.protocols = 'bad_protocols';
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an empty protocols parameter', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = [];
+        adUnit.mediaTypes.video.protocols = [];
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
 
       it('should return false when given an ad unit with an invalid protocols parameter value', function () {
         const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-        adUnit.params.video.protocols = ['bad_protocols_value'];
+        adUnit.mediaTypes.video.protocols = ['bad_protocols_value'];
 
         expect(spec.isBidRequestValid(adUnit)).to.equal(false);
       });
@@ -1452,13 +1451,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid pre-roll instream ad unit', function () {
@@ -1476,13 +1475,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(0);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid mid-roll instream ad unit', function () {
@@ -1500,13 +1499,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(-1);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid post-roll instream ad unit', function () {
@@ -1524,13 +1523,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.exist.and.to.be.a('number').and.to.equal(-2);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid ad unit without player size', function () {
@@ -1548,13 +1547,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.h).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid ad unit with an empty player size', function () {
@@ -1572,13 +1571,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.h).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid ad unit with multiple player sizes', function () {
@@ -1596,18 +1595,18 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid ad unit without minimum duration', function () {
           const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.params.video.minDuration = undefined;
+          adUnit.mediaTypes.video.minDuration = undefined;
 
           const adUnits = [adUnit];
 
@@ -1620,18 +1619,18 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
           expect(serverRequests[0].data.imp[0].video.minduration).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one impression when given a valid ad unit without maximum duration', function () {
           const adUnit = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit.params.video.maxDuration = undefined;
+          adUnit.mediaTypes.video.maxDuration = undefined;
 
           const adUnits = [adUnit];
 
@@ -1644,13 +1643,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
           expect(serverRequests[0].data.imp[0].video.maxduration).to.equal(null);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
         });
 
         it('should return a server request with two impressions when given two valid ad units with different impression identifiers', function () {
@@ -1671,31 +1670,31 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
           expect(serverRequests[0].data.imp[1]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[1].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
           expect(serverRequests[0].data.imp[1].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[1].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[1].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[1].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[1].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[1].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[1].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[0].data.imp[1].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[1].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
+          expect(serverRequests[0].data.imp[1].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[1].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[1].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].mediaTypes.video.protocols);
         });
 
         it('should return a server request with one overridden impression when given two valid ad units with identical identifiers', function () {
           const adUnit_1 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_1.params.video.minDuration = 10;
+          adUnit_1.mediaTypes.video.minDuration = 10;
 
           const adUnit_2 = utils.deepClone(examples.adUnit_video_outstream);
-          adUnit_2.params.video.minDuration = 15;
+          adUnit_2.mediaTypes.video.minDuration = 15;
 
           const adUnits = [adUnit_1, adUnit_2];
 
@@ -1708,13 +1707,13 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].mediaTypes.video.protocols);
         });
 
         it('should return two server requests with one impression when given two valid ad units with different bid request identifiers', function () {
@@ -1735,25 +1734,25 @@ describe('Adot Adapter', function () {
           expect(serverRequests[0].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[0].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[0].bidId}_0`);
           expect(serverRequests[0].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[0].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[0].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[0].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[0].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.minDuration);
-          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].params.video.maxDuration);
-          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.protocols);
+          expect(serverRequests[0].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.minDuration);
+          expect(serverRequests[0].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[0].mediaTypes.video.maxDuration);
+          expect(serverRequests[0].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.protocols);
           expect(serverRequests[1].data).to.exist.and.to.be.an('object');
           expect(serverRequests[1].data.imp).to.exist.and.to.be.an('array').and.to.have.lengthOf(1);
           expect(serverRequests[1].data.imp[0]).to.exist.and.to.be.an('object');
           expect(serverRequests[1].data.imp[0].id).to.exist.and.to.be.a('string').and.to.equal(`${adUnits[1].bidId}_0`);
           expect(serverRequests[1].data.imp[0].video).to.exist.and.to.be.an('object');
-          expect(serverRequests[1].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].params.video.mimes);
+          expect(serverRequests[1].data.imp[0].video.mimes).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[0].mediaTypes.video.mimes);
           expect(serverRequests[1].data.imp[0].video.startdelay).to.equal(null);
           expect(serverRequests[1].data.imp[0].video.w).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][0]);
           expect(serverRequests[1].data.imp[0].video.h).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.playerSize[0][1]);
-          expect(serverRequests[1].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.minDuration);
-          expect(serverRequests[1].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].params.video.maxDuration);
-          expect(serverRequests[1].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].params.video.protocols);
+          expect(serverRequests[1].data.imp[0].video.minduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.minDuration);
+          expect(serverRequests[1].data.imp[0].video.maxduration).to.exist.and.to.be.a('number').and.to.equal(adUnits[1].mediaTypes.video.maxDuration);
+          expect(serverRequests[1].data.imp[0].video.protocols).to.exist.and.to.be.an('array').and.to.deep.equal(adUnits[1].mediaTypes.video.protocols);
         });
       });
 
@@ -2062,10 +2061,11 @@ describe('Adot Adapter', function () {
         serverResponse.body.cur = 'USD';
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
         expect(ads[0].vastXml).to.equal(null);
         expect(ads[0].vastUrl).to.equal(null);
@@ -2087,13 +2087,57 @@ describe('Adot Adapter', function () {
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
 
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
+        const adm2WithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[1].adm, serverResponse.body.seatbid[0].bid[1].price);
+
+        expect(ads).to.be.an('array').and.to.have.length(2);
+
+        expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
+        expect(ads[0].adUrl).to.equal(null);
+        expect(ads[0].vastXml).to.equal(null);
+        expect(ads[0].vastUrl).to.equal(null);
+        expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
+        expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+        expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
+        expect(ads[0].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
+        expect(ads[0].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
+        expect(ads[0].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+        expect(ads[0].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+        expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
+        expect(ads[0].renderer).to.equal(null);
+        expect(ads[1].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[1].bidId);
+        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(adm2WithAuctionPriceReplaced);
+        expect(ads[1].adUrl).to.equal(null);
+        expect(ads[1].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].crid);
+        expect(ads[1].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].price);
+        expect(ads[1].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
+        expect(ads[1].netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(true);
+        expect(ads[1].ttl).to.exist.and.to.be.a('number').and.to.equal(10);
+        expect(ads[1].height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].h);
+        expect(ads[1].width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].w);
+        expect(ads[1].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
+        expect(ads[1].renderer).to.equal(null);
+      });
+
+      it('should return two ads when given a valid server response with two bids that contains adomain', function () {
+        const serverRequest = examples.serverRequest_banner_twoImps;
+
+        const serverResponse = examples.serverResponse_banner_twoBids;
+
+        const ads = spec.interpretResponse(serverResponse, serverRequest);
+
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
+        const adm2WithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[1].adm, serverResponse.body.seatbid[0].bid[1].price);
+
         expect(ads).to.be.an('array').and.to.have.length(2);
 
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
         expect(ads[0].vastXml).to.equal(null);
         expect(ads[0].vastUrl).to.equal(null);
+        expect(ads[0].meta.advertiserDomains[0]).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].adomain[0])
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
         expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
@@ -2104,7 +2148,8 @@ describe('Adot Adapter', function () {
         expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('banner');
         expect(ads[0].renderer).to.equal(null);
         expect(ads[1].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[1].bidId);
-        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[1].adm);
+        expect(ads[1].meta.advertiserDomains[0]).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].adomain[0])
+        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(adm2WithAuctionPriceReplaced);
         expect(ads[1].adUrl).to.equal(null);
         expect(ads[1].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].crid);
         expect(ads[1].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].price);
@@ -2592,10 +2637,11 @@ describe('Adot Adapter', function () {
         const serverResponse = examples.serverResponse_banner;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
         expect(ads[0].vastXml).to.equal(null);
         expect(ads[0].vastUrl).to.equal(null);
@@ -2617,10 +2663,11 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].nurl = undefined;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
         expect(ads[0].vastXml).to.equal(null);
         expect(ads[0].vastUrl).to.equal(null);
@@ -2642,11 +2689,12 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].adm = undefined;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const nurlWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].nurl, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
         expect(ads[0].ad).to.equal(null);
-        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].nurl);
+        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.equal(nurlWithAuctionPriceReplaced);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
         expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
@@ -2721,12 +2769,13 @@ describe('Adot Adapter', function () {
         const serverResponse = examples.serverResponse_video_instream;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2745,12 +2794,13 @@ describe('Adot Adapter', function () {
         const serverResponse = examples.serverResponse_video_outstream;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2769,12 +2819,14 @@ describe('Adot Adapter', function () {
         const serverResponse = examples.serverResponse_video_instream_outstream;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
+        const adm2WithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[1].adm, serverResponse.body.seatbid[0].bid[1].price);
 
         expect(ads).to.be.an('array').and.to.have.length(2);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2786,9 +2838,9 @@ describe('Adot Adapter', function () {
         expect(ads[0].mediaType).to.exist.and.to.be.a('string').and.to.equal('video');
         expect(ads[0].renderer).to.equal(null);
         expect(ads[1].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[1].bidId);
-        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[1].adm);
+        expect(ads[1].ad).to.exist.and.to.be.a('string').and.to.have.string(adm2WithAuctionPriceReplaced);
         expect(ads[1].adUrl).to.equal(null);
-        expect(ads[1].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[1].vastXml).to.equal(adm2WithAuctionPriceReplaced);
         expect(ads[1].vastUrl).to.equal(null);
         expect(ads[1].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[1].crid);
         expect(ads[1].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[1].price);
@@ -2808,12 +2860,13 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].nurl = undefined;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2833,13 +2886,14 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].adm = undefined;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const nurlWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].nurl, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
         expect(ads[0].ad).to.equal(null);
-        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].nurl);
+        expect(ads[0].adUrl).to.exist.and.to.be.a('string').and.to.have.string(nurlWithAuctionPriceReplaced);
         expect(ads[0].vastXml).to.equal(null);
-        expect(ads[0].vastUrl).to.equal(serverResponse.body.seatbid[0].bid[0].nurl);
+        expect(ads[0].vastUrl).to.equal(nurlWithAuctionPriceReplaced);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
         expect(ads[0].currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.cur);
@@ -2858,12 +2912,13 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].h = 500;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2883,12 +2938,13 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].w = 500;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2909,12 +2965,13 @@ describe('Adot Adapter', function () {
         serverResponse.body.seatbid[0].bid[0].h = 400;
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2934,12 +2991,13 @@ describe('Adot Adapter', function () {
         const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -2959,12 +3017,13 @@ describe('Adot Adapter', function () {
         const serverResponse = utils.deepClone(examples.serverResponse_video_instream);
 
         const ads = spec.interpretResponse(serverResponse, serverRequest);
+        const admWithAuctionPriceReplaced = utils.replaceAuctionPrice(serverResponse.body.seatbid[0].bid[0].adm, serverResponse.body.seatbid[0].bid[0].price);
 
         expect(ads).to.be.an('array').and.to.have.length(1);
         expect(ads[0].requestId).to.exist.and.to.be.a('string').and.to.equal(serverRequest._adot_internal.impressions[0].bidId);
-        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].ad).to.exist.and.to.be.a('string').and.to.have.string(admWithAuctionPriceReplaced);
         expect(ads[0].adUrl).to.equal(null);
-        expect(ads[0].vastXml).to.equal(serverResponse.body.seatbid[0].bid[0].adm);
+        expect(ads[0].vastXml).to.equal(admWithAuctionPriceReplaced);
         expect(ads[0].vastUrl).to.equal(null);
         expect(ads[0].creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].crid);
         expect(ads[0].cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
@@ -3066,20 +3125,6 @@ describe('Adot Adapter', function () {
           expect(ads).to.be.an('array').and.to.have.length(1);
           expect(ads[0].renderer).to.be.an('object');
         });
-
-        it('should append a command to the ad rendering queue when executing the renderer', function (done) {
-          const serverRequest = examples.serverRequest_video_outstream;
-          const serverResponse = examples.serverResponse_video_outstream;
-
-          const [ad] = spec.interpretResponse(serverResponse, serverRequest);
-
-          this.spyAdRenderingQueue(ad);
-
-          executeAdRenderer(ad, () => {
-            expect(ad.renderer.push.calledOnce).to.equal(true);
-            expect(ad.renderer.push.firstCall.args[0]).to.exist.and.to.be.a('function');
-          }, done);
-        });
       });
     });
 
diff --git a/test/spec/modules/adponeBidAdapter_spec.js b/test/spec/modules/adponeBidAdapter_spec.js
index 737f1c284e1..92fd672df47 100644
--- a/test/spec/modules/adponeBidAdapter_spec.js
+++ b/test/spec/modules/adponeBidAdapter_spec.js
@@ -110,122 +110,109 @@ describe('adponeBidAdapter', function () {
       expect(spec.isBidRequestValid(invalidBid)).to.be.false;
     });
   });
-});
-
-describe('interpretResponse', function () {
-  let serverResponse;
-  let bidRequest = { data: {id: '1234'} };
-
-  beforeEach(function () {
-    serverResponse = {
-      body: {
-        id: '2579e20c0bb89',
-        seatbid: [
-          {
-            bid: [
-              {
-                id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
-                impid: '2579e20c0bb89_0',
-                price: 1,
-                adm: '',
-                adomain: [
-                  'www.addomain.com'
-                ],
-                iurl: 'https://localhost11',
-                crid: 'creative111',
-                h: 250,
-                w: 300,
-                ext: {
-                  dspid: 6
+  describe('interpretResponse', function () {
+    let serverResponse;
+    let bidRequest = { data: {id: '1234'} };
+
+    beforeEach(function () {
+      serverResponse = {
+        body: {
+          id: '2579e20c0bb89',
+          seatbid: [
+            {
+              bid: [
+                {
+                  id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
+                  impid: '2579e20c0bb89_0',
+                  price: 1,
+                  adm: '',
+                  meta: {
+                    adomain: [
+                      'adpone.com'
+                    ]
+                  },
+                  iurl: 'https://localhost11',
+                  crid: 'creative111',
+                  h: 250,
+                  w: 300,
+                  ext: {
+                    dspid: 6
+                  }
                 }
-              }
-            ],
-            seat: 'adpone'
-          }
-        ],
-        cur: 'USD'
-      },
-    };
-  });
-
-  it('validate_response_params', function() {
-    const newResponse = spec.interpretResponse(serverResponse, bidRequest);
-    expect(newResponse[0].id).to.be.equal('613673EF-A07C-4486-8EE9-3FC71A7DC73D');
-    expect(newResponse[0].requestId).to.be.equal('1234');
-    expect(newResponse[0].cpm).to.be.equal(1);
-    expect(newResponse[0].width).to.be.equal(300);
-    expect(newResponse[0].height).to.be.equal(250);
-    expect(newResponse[0].currency).to.be.equal('USD');
-    expect(newResponse[0].netRevenue).to.be.equal(true);
-    expect(newResponse[0].ttl).to.be.equal(300);
-    expect(newResponse[0].ad).to.be.equal('');
-  });
+              ],
+              seat: 'adpone'
+            }
+          ],
+          cur: 'USD'
+        },
+      };
+    });
 
-  it('should correctly reorder the server response', function () {
-    const newResponse = spec.interpretResponse(serverResponse, bidRequest);
-    expect(newResponse.length).to.be.equal(1);
-    expect(newResponse[0]).to.deep.equal({
-      id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
-      requestId: '1234',
-      cpm: 1,
-      width: 300,
-      height: 250,
-      creativeId: 'creative111',
-      currency: 'USD',
-      netRevenue: true,
-      ttl: 300,
-      ad: ''
+    it('validate_response_params', function() {
+      const newResponse = spec.interpretResponse(serverResponse, bidRequest);
+      expect(newResponse[0].id).to.be.equal('613673EF-A07C-4486-8EE9-3FC71A7DC73D');
+      expect(newResponse[0].requestId).to.be.equal('1234');
+      expect(newResponse[0].cpm).to.be.equal(1);
+      expect(newResponse[0].width).to.be.equal(300);
+      expect(newResponse[0].height).to.be.equal(250);
+      expect(newResponse[0].currency).to.be.equal('USD');
+      expect(newResponse[0].netRevenue).to.be.equal(true);
+      expect(newResponse[0].ttl).to.be.equal(300);
+      expect(newResponse[0].ad).to.be.equal('');
     });
-  });
 
-  it('should not add responses if the cpm is 0 or null', function () {
-    serverResponse.body.seatbid[0].bid[0].price = 0;
-    let response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.deep.equal([]);
+    it('should correctly reorder the server response', function () {
+      const newResponse = spec.interpretResponse(serverResponse, bidRequest);
+      expect(newResponse.length).to.be.equal(1);
+      expect(newResponse[0]).to.deep.equal({
+        id: '613673EF-A07C-4486-8EE9-3FC71A7DC73D',
+        meta: {
+          advertiserDomains: [
+            'adpone.com'
+          ]
+        },
+        requestId: '1234',
+        cpm: 1,
+        width: 300,
+        height: 250,
+        creativeId: 'creative111',
+        currency: 'USD',
+        netRevenue: true,
+        ttl: 300,
+        ad: ''
+      });
+    });
 
-    serverResponse.body.seatbid[0].bid[0].price = null;
-    response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.deep.equal([])
-  });
-  it('should add responses if the cpm is valid', function () {
-    serverResponse.body.seatbid[0].bid[0].price = 0.5;
-    let response = spec.interpretResponse(serverResponse, bidRequest);
-    expect(response).to.not.deep.equal([]);
-  });
-});
+    it('should not add responses if the cpm is 0 or null', function () {
+      serverResponse.body.seatbid[0].bid[0].price = 0;
+      let response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.deep.equal([]);
 
-describe('getUserSyncs', function () {
-  it('Verifies that getUserSyncs is a function', function () {
-    expect((typeof (spec.getUserSyncs)).should.equals('function'));
-  });
-  it('Verifies getUserSyncs returns expected result', function () {
-    expect((typeof (spec.getUserSyncs)).should.equals('function'));
-    expect(spec.getUserSyncs({iframeEnabled: true})).to.deep.equal({
-      type: 'iframe',
-      url: 'https://eu-ads.adpone.com'
+      serverResponse.body.seatbid[0].bid[0].price = null;
+      response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.deep.equal([])
+    });
+    it('should add responses if the cpm is valid', function () {
+      serverResponse.body.seatbid[0].bid[0].price = 0.5;
+      let response = spec.interpretResponse(serverResponse, bidRequest);
+      expect(response).to.not.deep.equal([]);
     });
   });
-  it('Verifies that iframeEnabled: false returns an empty array', function () {
-    expect(spec.getUserSyncs({iframeEnabled: false})).to.deep.equal(EMPTY_ARRAY);
-  });
-  it('Verifies that iframeEnabled: null returns an empty array', function () {
-    expect(spec.getUserSyncs(null)).to.deep.equal(EMPTY_ARRAY);
-  });
-});
 
-describe('test onBidWon function', 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('test onBidWon function', 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);
+    });
   });
 });
diff --git a/test/spec/modules/adprimeBidAdapter_spec.js b/test/spec/modules/adprimeBidAdapter_spec.js
index 3508a1175a6..8627941dc80 100644
--- a/test/spec/modules/adprimeBidAdapter_spec.js
+++ b/test/spec/modules/adprimeBidAdapter_spec.js
@@ -55,7 +55,7 @@ describe('AdprimebBidAdapter', function () {
       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', 'hPlayer', 'wPlayer', 'schain', 'keywords');
+      expect(placement).to.have.keys('placementId', 'bidId', 'identeties', 'traffic', 'sizes', 'hPlayer', 'wPlayer', 'schain', 'keywords');
       expect(placement.placementId).to.equal(0);
       expect(placement.bidId).to.equal('23fhj33i987f');
       expect(placement.traffic).to.equal(BANNER);
@@ -106,6 +106,23 @@ describe('AdprimebBidAdapter', function () {
       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 () {
+      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')
+      }
+    });
+  });
   describe('interpretResponse', function () {
     it('Should interpret banner response', function () {
       const banner = {
@@ -267,4 +284,14 @@ describe('AdprimebBidAdapter', function () {
       expect(serverResponses).to.be.an('array').that.is.empty;
     });
   });
+  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://delta.adprime.com/?c=rtb&m=sync');
+    });
+  });
 });
diff --git a/test/spec/modules/adrelevantisBidAdapter_spec.js b/test/spec/modules/adrelevantisBidAdapter_spec.js
new file mode 100644
index 00000000000..596f3bade5d
--- /dev/null
+++ b/test/spec/modules/adrelevantisBidAdapter_spec.js
@@ -0,0 +1,771 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adrelevantisBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { deepClone } from 'src/utils.js';
+import { config } from 'src/config.js';
+
+const ENDPOINT = 'https://ssp.adrelevantis.com/prebid';
+
+describe('AdrelevantisAdapter', 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': 'adrelevantis',
+      'params': {
+        'placementId': '10433394'
+      },
+      '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 false when required params are not passed', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'placementId': 0
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        'bidder': 'adrelevantis',
+        'params': {
+          'placementId': '10433394'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      }
+    ];
+
+    it('should parse out private sizes', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            privateSizes: [300, 250]
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].private_sizes).to.exist;
+      expect(payload.tags[0].private_sizes).to.deep.equal([{width: 300, height: 250}]);
+    });
+
+    it('should add source and verison to the tag', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.sdk).to.exist;
+      expect(payload.sdk).to.deep.equal({
+        source: 'pbjs',
+        version: '$prebid.version$'
+      });
+    });
+
+    it('should populate the ad_types array on all requests', function () {
+      ['banner', 'video', 'native'].forEach(type => {
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        bidRequest.mediaTypes = {};
+        bidRequest.mediaTypes[type] = {};
+
+        const request = spec.buildRequests([bidRequest]);
+        const payload = JSON.parse(request.data);
+
+        expect(payload.tags[0].ad_types).to.deep.equal([type]);
+      });
+    });
+
+    it('should populate the ad_types array on outstream requests', function () {
+      const bidRequest = Object.assign({}, bidRequests[0]);
+      bidRequest.mediaTypes = {};
+      bidRequest.mediaTypes.video = {context: 'outstream'};
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].ad_types).to.deep.equal(['video']);
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should attach valid video params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            video: {
+              id: 123,
+              minduration: 100,
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        id: 123,
+        minduration: 100
+      });
+    });
+
+    it('should add video property when adUnit includes a renderer', function () {
+      const videoData = {
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4']
+          }
+        },
+        params: {
+          placementId: '10433394',
+          video: {
+            skippable: true,
+            playback_method: ['auto_play_sound_off']
+          }
+        }
+      };
+
+      let bidRequest1 = deepClone(bidRequests[0]);
+      bidRequest1 = Object.assign({}, bidRequest1, videoData, {
+        renderer: {
+          url: 'http://test.renderer.url',
+          render: function () {}
+        }
+      });
+
+      let bidRequest2 = deepClone(bidRequests[0]);
+      bidRequest2.adUnitCode = 'adUnit_code_2';
+      bidRequest2 = Object.assign({}, bidRequest2, videoData);
+
+      const request = spec.buildRequests([bidRequest1, bidRequest2]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].video).to.deep.equal({
+        skippable: true,
+        playback_method: ['auto_play_sound_off'],
+        custom_renderer_present: true
+      });
+      expect(payload.tags[1].video).to.deep.equal({
+        skippable: true,
+        playback_method: ['auto_play_sound_off']
+      });
+    });
+
+    it('should attach valid user params to the tag', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            user: {
+              externalUid: '123',
+              foobar: 'invalid'
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user).to.exist;
+      expect(payload.user).to.deep.equal({
+        externalUid: '123',
+      });
+    });
+
+    it('should contain hb_source value for other media', function() {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'banner',
+          params: {
+            sizes: [[300, 250], [300, 600]],
+            placementId: 10433394
+          }
+        }
+      );
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.tags[0].hb_source).to.deep.equal(1);
+    });
+
+    it('adds context data (category and keywords) to request when set', function() {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon
+        .stub(config, 'getConfig')
+        .withArgs('ortb2')
+        .returns({
+          site: {
+            keywords: 'US Open',
+            ext: {
+              data: {
+                category: 'sports/tennis'
+              }
+            }
+          }
+        });
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.fpd.keywords).to.equal('US Open');
+      expect(payload.fpd.category).to.equal('sports/tennis');
+
+      config.getConfig.restore();
+    });
+
+    it('should attach native params to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            title: {required: true},
+            body: {required: true},
+            body2: {required: true},
+            image: {required: true, sizes: [100, 100]},
+            icon: {required: true},
+            cta: {required: false},
+            rating: {required: true},
+            sponsoredBy: {required: true},
+            privacyLink: {required: true},
+            displayUrl: {required: true},
+            address: {required: true},
+            downloads: {required: true},
+            likes: {required: true},
+            phone: {required: true},
+            price: {required: true},
+            salePrice: {required: true}
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].native.layouts[0]).to.deep.equal({
+        title: {required: true},
+        description: {required: true},
+        desc2: {required: true},
+        main_image: {required: true, sizes: [{ width: 100, height: 100 }]},
+        icon: {required: true},
+        ctatext: {required: false},
+        rating: {required: true},
+        sponsored_by: {required: true},
+        privacy_link: {required: true},
+        displayurl: {required: true},
+        address: {required: true},
+        downloads: {required: true},
+        likes: {required: true},
+        phone: {required: true},
+        price: {required: true},
+        saleprice: {required: true},
+        privacy_supported: true
+      });
+      expect(payload.tags[0].hb_source).to.equal(1);
+    });
+
+    it('should always populated tags[].sizes with 1,1 for native if otherwise not defined', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          mediaType: 'native',
+          nativeParams: {
+            image: { required: true }
+          }
+        }
+      );
+      bidRequest.sizes = [[150, 100], [300, 250]];
+
+      let request = spec.buildRequests([bidRequest]);
+      let payload = JSON.parse(request.data);
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 150, height: 100}, {width: 300, height: 250}]);
+
+      delete bidRequest.sizes;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].sizes).to.deep.equal([{width: 1, height: 1}]);
+    });
+
+    it('should convert keyword params to proper form and attaches to request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            keywords: {
+              single: 'val',
+              singleArr: ['val'],
+              singleArrNum: [5],
+              multiValMixed: ['value1', 2, 'value3'],
+              singleValNum: 123,
+              emptyStr: '',
+              emptyArr: [''],
+              badValue: {'foo': 'bar'} // should be dropped
+            }
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].keywords).to.deep.equal([{
+        'key': 'single',
+        'value': ['val']
+      }, {
+        'key': 'singleArr',
+        'value': ['val']
+      }, {
+        'key': 'singleArrNum',
+        'value': ['5']
+      }, {
+        'key': 'multiValMixed',
+        'value': ['value1', '2', 'value3']
+      }, {
+        'key': 'singleValNum',
+        'value': ['123']
+      }, {
+        'key': 'emptyStr'
+      }, {
+        'key': 'emptyArr'
+      }]);
+    });
+
+    it('should add payment rules to the request', function () {
+      let bidRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            usePaymentRule: true
+          }
+        }
+      );
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].use_pmt_rule).to.equal(true);
+    });
+
+    it('should add gdpr consent information to the request', function () {
+      let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+      let bidderRequest = {
+        'bidderCode': 'adrelevantis',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          consentString: consentString,
+          gdprApplies: true
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr_consent).to.exist;
+      expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
+      expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+    });
+
+    it('supports sending hybrid mobile app parameters', function () {
+      let appRequest = Object.assign({},
+        bidRequests[0],
+        {
+          params: {
+            placementId: '10433394',
+            app: {
+              id: 'B1O2W3M4AN.com.prebid.webview',
+              geo: {
+                lat: 40.0964439,
+                lng: -75.3009142
+              },
+              device_id: {
+                idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE', // Apple advertising identifier
+                aaid: '38400000-8cf0-11bd-b23e-10b96e40000d', // Android advertising identifier
+                md5udid: '5756ae9022b2ea1e47d84fead75220c8', // MD5 hash of the ANDROID_ID
+                sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF', // SHA1 hash of the ANDROID_ID
+                windowsadid: '750c6be243f1c4b5c9912b95a5742fc5' // Windows advertising identifier
+              }
+            }
+          }
+        }
+      );
+      const request = spec.buildRequests([appRequest]);
+      const payload = JSON.parse(request.data);
+      expect(payload.app).to.exist;
+      expect(payload.app).to.deep.equal({
+        appid: 'B1O2W3M4AN.com.prebid.webview'
+      });
+      expect(payload.device.device_id).to.exist;
+      expect(payload.device.device_id).to.deep.equal({
+        aaid: '38400000-8cf0-11bd-b23e-10b96e40000d',
+        idfa: '4D12078D-3246-4DA4-AD5E-7610481E7AE',
+        md5udid: '5756ae9022b2ea1e47d84fead75220c8',
+        sha1udid: '4DFAA92388699AC6539885AEF1719293879985BF',
+        windowsadid: '750c6be243f1c4b5c9912b95a5742fc5'
+      });
+      expect(payload.device.geo).to.exist;
+      expect(payload.device.geo).to.deep.equal({
+        lat: 40.0964439,
+        lng: -75.3009142
+      });
+    });
+
+    it('should add referer info to payload', function () {
+      const bidRequest = Object.assign({}, bidRequests[0])
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'http://example.com/page.html',
+          reachedTop: true,
+          numIframes: 2,
+          stack: [
+            'http://example.com/page.html',
+            'http://example.com/iframe1.html',
+            'http://example.com/iframe2.html'
+          ]
+        }
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.referrer_detection).to.exist;
+      expect(payload.referrer_detection).to.deep.equal({
+        rd_ref: 'http%3A%2F%2Fexample.com%2Fpage.html',
+        rd_top: true,
+        rd_ifs: 2,
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
+      });
+    });
+
+    it('should populate coppa if set in config', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.user.coppa).to.equal(true);
+
+      config.getConfig.restore();
+    });
+  })
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'version': '3.0.0',
+      'tags': [
+        {
+          'uuid': '3db3773286ee59',
+          'tag_id': 10433394,
+          'auction_id': '4534722592064951574',
+          'nobid': false,
+          'no_ad_url': 'http://lax1-ib.adnxs.com/no-ad',
+          'timeout_ms': 10000,
+          'ad_profile_id': 27079,
+          'ads': [
+            {
+              'content_source': 'rtb',
+              'ad_type': 'banner',
+              'buyer_member_id': 958,
+              'creative_id': 29681110,
+              'media_type_id': 1,
+              'media_subtype_id': 1,
+              'cpm': 0.5,
+              'cpm_publisher_currency': 0.5,
+              'publisher_currency_code': '$',
+              'client_initiated_ad_counting': true,
+              'viewability': {
+                'config': ''
+              },
+              'rtb': {
+                'banner': {
+                  'content': '',
+                  'width': 300,
+                  'height': 250
+                },
+                'trackers': [
+                  {
+                    'impression_urls': [
+                      'http://lax1-ib.adnxs.com/impression'
+                    ],
+                    'video_events': {}
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      ]
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '3db3773286ee59',
+          'cpm': 0.5,
+          'creativeId': 29681110,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '',
+          'mediaType': 'banner',
+          'currency': 'USD',
+          'ttl': 300,
+          'netRevenue': true,
+          'adUnitCode': 'code',
+          'adrelevantis': {
+            'buyerMemberId': 958
+          }
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+
+    it('handles outstream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'content': ''
+              }
+            },
+            'javascriptTrackers': ''
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    it('handles instream video responses', function () {
+      let response = {
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'ads': [{
+            'ad_type': 'video',
+            'cpm': 0.500000,
+            'notify_url': 'imptracker.com',
+            'rtb': {
+              'video': {
+                'asset_url': 'https://sample.vastURL.com/here/vid'
+              }
+            },
+            'javascriptTrackers': ''
+          }]
+        }]
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '84ab500420319d',
+          adUnitCode: 'code',
+          mediaTypes: {
+            video: {
+              context: 'instream'
+            }
+          }
+        }]
+      }
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result[0]).to.have.property('vastUrl');
+      expect(result[0]).to.have.property('vastImpUrl');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
+
+    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': ''
+      };
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+
+      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.cta).to.equal('Do it');
+      expect(result[0].native.image.url).to.equal('https://cdn.adnxs.com/img.png');
+    });
+
+    it('supports configuring outstream renderers', function () {
+      const outstreamResponse = deepClone(response);
+      outstreamResponse.tags[0].ads[0].rtb.video = {};
+      outstreamResponse.tags[0].ads[0].renderer_url = 'renderer.js';
+
+      const bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          renderer: {
+            options: {
+              adText: 'configured'
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream'
+            }
+          }
+        }]
+      };
+
+      const result = spec.interpretResponse({ body: outstreamResponse }, {bidderRequest});
+      expect(result[0].renderer.config).to.deep.equal(
+        bidderRequest.bids[0].renderer.options
+      );
+    });
+
+    it('should add deal_priority and deal_code', function() {
+      let responseWithDeal = deepClone(response);
+      responseWithDeal.tags[0].ads[0].deal_priority = 'high';
+      responseWithDeal.tags[0].ads[0].deal_code = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseWithDeal }, {bidderRequest});
+      expect(Object.keys(result[0].adrelevantis)).to.include.members(['buyerMemberId', 'dealPriority', 'dealCode']);
+    });
+
+    it('should add advertiser id', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].advertiser_id = '123';
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
+    })
+  });
+});
diff --git a/test/spec/modules/adriverBidAdapter_spec.js b/test/spec/modules/adriverBidAdapter_spec.js
new file mode 100644
index 00000000000..c16bc5df5cb
--- /dev/null
+++ b/test/spec/modules/adriverBidAdapter_spec.js
@@ -0,0 +1,323 @@
+import { expect } from 'chai';
+import { spec } from 'modules/adriverBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as bidderFactory from 'src/adapters/bidderFactory.js';
+import { auctionManager } from 'src/auctionManager.js';
+const ENDPOINT = 'https://pb.adriver.ru/cgi-bin/bid.cgi';
+
+describe('adriverAdapter', 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': 'adriver',
+      'params': {
+        'placementId': '55:test_placement',
+        'siteid': 'testSiteID'
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600], [300, 250]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let getAdUnitsStub;
+    const floor = 3;
+
+    let bidRequests = [
+      {
+        'bidder': 'adriver',
+        'params': {
+          'placementId': '55:test_placement',
+          'siteid': 'testSiteID',
+          'dealid': 'dealidTest'
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250], [300, 600], [300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'transactionId': '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }
+    ];
+
+    let floorTestData = {
+      'currency': 'USD',
+      'floor': floor
+    };
+    bidRequests[0].getFloor = _ => {
+      return floorTestData;
+    };
+
+    beforeEach(function() {
+      getAdUnitsStub = sinon.stub(auctionManager, 'getAdUnits').callsFake(function() {
+        return [];
+      });
+    });
+
+    afterEach(function() {
+      getAdUnitsStub.restore();
+    });
+
+    it('should exist currency', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.cur).to.exist;
+    });
+
+    it('should exist at', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.at).to.exist;
+      expect(payload.at).to.deep.equal(1);
+    });
+
+    it('should parse imp', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0]).to.exist;
+      expect(payload.imp[0].id).to.deep.equal('55:test_placement');
+
+      expect(payload.imp[0].ext).to.exist;
+      expect(payload.imp[0].ext.query).to.deep.equal('bn=15&custom=111=' + '30b31c1838de1e');
+
+      expect(payload.imp[0].banner).to.exist;
+      expect(payload.imp[0].banner.w).to.deep.equal(300);
+      expect(payload.imp[0].banner.h).to.deep.equal(250);
+    });
+
+    it('should parse pmp', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].pmp).to.exist;
+
+      expect(payload.imp[0].pmp.deals).to.exist;
+
+      expect(payload.imp[0].pmp.deals[0].bidfloor).to.exist;
+      expect(payload.imp[0].pmp.deals[0].bidfloor).to.deep.equal(3);
+
+      expect(payload.imp[0].pmp.deals[0].bidfloorcur).to.exist;
+      expect(payload.imp[0].pmp.deals[0].bidfloorcur).to.deep.equal('RUB');
+    });
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(bidRequests);
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('POST');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bfStub;
+    before(function() {
+      bfStub = sinon.stub(bidderFactory, 'getIabSubCategory');
+    });
+
+    after(function() {
+      bfStub.restore();
+    });
+
+    let response = {
+      'id': '221594457-1615288400-1-46-',
+      'bidid': 'D8JW8XU8-L5m7qFMNQGs7i1gcuPvYMEDOKsktw6e9uLy5Eebo9HftVXb0VpKj4R2dXa93i6QmRhjextJVM4y1SqodMAh5vFOb_eVkHA',
+      'seatbid': [{
+        'bid': [{
+          'id': '1',
+          'impid': '/19968336/header-bid-tag-0',
+          'price': 4.29,
+          'h': 250,
+          'w': 300,
+          'adid': '7121351',
+          'adomain': ['http://ikea.com'],
+          'nurl': 'https://ad.adriver.ru/cgi-bin/erle.cgi?expid=D8JW8XU8-L5m7qFMNQGs7i1gcuPvYMEDOKsktw6e9uLy5Eebo9HftVXb0VpKj4R2dXa93i6QmRhjextJVM4y1SqodMAh5vFOb_eVkHA&bid=7121351&wprc=4.29&tuid=-1&custom=207=/19968336/header-bid-tag-0',
+          'cid': '717570',
+          'ext': '2c262a7058758d'
+        }]
+      }, {
+        'bid': [{
+          'id': '1',
+          'impid': '/19968336/header-bid-tag-0',
+          'price': 17.67,
+          'h': 600,
+          'w': 300,
+          'adid': '7121369',
+          'adomain': ['http://ikea.com'],
+          'nurl': 'https://ad.adriver.ru/cgi-bin/erle.cgi?expid=DdtToXX5cpTaMMxrJSEsOsUIXt3WmC3jOvuNI5DguDrY8edFG60Jg1M-iMkVNKQ4OiAdHSLPJLQQXMUXZfI9VbjMoGCb-zzOTPiMpshI&bid=7121369&wprc=17.67&tuid=-1&custom=207=/19968336/header-bid-tag-0',
+          'cid': '717570',
+          'ext': '2c262a7058758d'
+        }]
+      }],
+      'cur': 'RUB'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '2c262a7058758d',
+          cpm: 4.29,
+          width: 300,
+          height: 250,
+          creativeId: '/19968336/header-bid-tag-0',
+          currency: 'RUB',
+          netRevenue: true,
+          ttl: 3000,
+          meta: {
+            advertiserDomains: ['http://ikea.com']
+          },
+          ad: ''
+        }
+      ];
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      };
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+
+    it('handles nobid responses', function () {
+      let response = {
+        'version': '0.0.1',
+        'tags': [{
+          'uuid': '84ab500420319d',
+          'tag_id': 5976557,
+          'auction_id': '297492697822162468',
+          'nobid': true
+        }]
+      };
+      let bidderRequest;
+
+      let result = spec.interpretResponse({ body: response }, {bidderRequest});
+      expect(result.length).to.equal(0);
+    });
+  });
+
+  describe('function _getFloor', function () {
+    let bidRequests = [
+      {
+        bidder: 'adriver',
+        params: {
+          placementId: '55:test_placement',
+          siteid: 'testSiteID',
+          dealid: 'dealidTest',
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [[300, 250], [300, 600], [300, 250]],
+        bidId: '30b31c1838de1e',
+        bidderRequestId: '22edbae2733bf6',
+        auctionId: '1d1a030790a475',
+        transactionId: '04f2659e-c005-4eb1-a57c-fa93145e3843'
+      }
+    ];
+
+    const floorTestData = {
+      'currency': 'RUB',
+      'floor': 1.50
+    };
+
+    const bitRequestStandard = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestStandard[0].getFloor = () => {
+      return floorTestData;
+    };
+
+    it('valid BidRequests', function () {
+      const request = spec.buildRequests(bitRequestStandard);
+      const payload = JSON.parse(request.data);
+
+      expect(typeof bitRequestStandard[0].getFloor).to.equal('function');
+      expect(payload.imp[0].bidfloor).to.equal(1.50);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestEmptyCurrency = JSON.parse(JSON.stringify(bidRequests));
+
+    const floorTestDataEmptyCurrency = {
+      'currency': 'RUB',
+      'floor': 1.50
+    };
+
+    bitRequestEmptyCurrency[0].getFloor = () => {
+      return floorTestDataEmptyCurrency;
+    };
+
+    it('empty currency', function () {
+      const request = spec.buildRequests(bitRequestEmptyCurrency);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(1.50);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestFloorNull = JSON.parse(JSON.stringify(bidRequests));
+
+    const floorTestDataFloorNull = {
+      'currency': '',
+      'floor': null
+    };
+
+    bitRequestFloorNull[0].getFloor = () => {
+      return floorTestDataFloorNull;
+    };
+
+    it('empty floor', function () {
+      const request = spec.buildRequests(bitRequestFloorNull);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(0);
+    });
+
+    const bitRequestGetFloorNotFunction = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestGetFloorNotFunction[0].getFloor = 0;
+
+    it('bid.getFloor is not a function', function () {
+      const request = spec.buildRequests(bitRequestGetFloorNotFunction);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(0);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+
+    const bitRequestGetFloorBySized = JSON.parse(JSON.stringify(bidRequests));
+
+    bitRequestGetFloorBySized[0].getFloor = (requestParams = {currency: 'USD', mediaType: '*', size: '*'}) => {
+      if (requestParams.size.length === 2 && requestParams.size[0] === 300 && requestParams.size[1] === 250) {
+        return {
+          'currency': 'RUB',
+          'floor': 3.33
+        }
+      } else {
+        return {}
+      }
+    };
+
+    it('bid.getFloor get size', function () {
+      const request = spec.buildRequests(bitRequestGetFloorBySized);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.imp[0].bidfloor).to.equal(3.33);
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+      expect(payload.imp[0].bidfloorcur).to.equal('RUB');
+    });
+  });
+});
diff --git a/test/spec/modules/adtargetBidAdapter_spec.js b/test/spec/modules/adtargetBidAdapter_spec.js
index 5a867e7dd52..d1221d24022 100644
--- a/test/spec/modules/adtargetBidAdapter_spec.js
+++ b/test/spec/modules/adtargetBidAdapter_spec.js
@@ -45,7 +45,8 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
+    'cpm': 0.9,
+    'adomain': ['a.com']
   }]
 };
 const SERVER_DISPLAY_RESPONSE = {
@@ -107,7 +108,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -120,7 +124,10 @@ const displayEqResponse = [{
   height: 250,
   width: 300,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
 }];
 
 describe('adtargetBidAdapter', () => {
diff --git a/test/spec/modules/adtelligentBidAdapter_spec.js b/test/spec/modules/adtelligentBidAdapter_spec.js
index 9c694668703..4cfb367efb3 100644
--- a/test/spec/modules/adtelligentBidAdapter_spec.js
+++ b/test/spec/modules/adtelligentBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/adtelligentBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { config } from 'src/config.js';
+import { deepClone } from 'src/utils.js';
 
 const EXPECTED_ENDPOINTS = [
   'https://ghb.adtelligent.com/v2/auction/',
@@ -9,7 +10,16 @@ const EXPECTED_ENDPOINTS = [
   'https://ghb2.adtelligent.com/v2/auction/',
   'https://ghb.adtelligent.com/v2/auction/'
 ];
+const aliasEP = {
+  appaloosa: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  appaloosa_publisherSuffix: 'https://ghb.hb.appaloosa.media/v2/auction/',
+  onefiftytwomedia: 'https://ghb.ads.152media.com/v2/auction/',
+  mediafuse: 'https://ghb.hbmp.mediafuse.com/v2/auction/',
+  navelix: 'https://ghb.hb.navelix.com/v2/auction/',
+  bidsxchange: 'https://ghb.hbd.bidsxchange.com/v2/auction/',
+};
 
+const DEFAULT_ADATPER_REQ = { bidderCode: 'adtelligent' };
 const DISPLAY_REQUEST = {
   'bidder': 'adtelligent',
   'params': {
@@ -70,15 +80,16 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
-  }
-  ]
+    '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,
@@ -152,7 +163,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -162,10 +176,15 @@ const displayEqResponse = [{
   netRevenue: true,
   currency: 'USD',
   ad: '',
+  adUrl: 'adUrl',
   height: 250,
   width: 300,
   ttl: 300,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
+
 }];
 
 describe('adtelligentBidAdapter', () => {
@@ -241,15 +260,24 @@ describe('adtelligentBidAdapter', () => {
     let videoBidRequests = [VIDEO_REQUEST];
     let displayBidRequests = [DISPLAY_REQUEST];
     let videoAndDisplayBidRequests = [DISPLAY_REQUEST, VIDEO_REQUEST];
-    const displayRequest = spec.buildRequests(displayBidRequests, {});
-    const videoRequest = spec.buildRequests(videoBidRequests, {});
-    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, {});
-    const rotatingRequest = spec.buildRequests(displayBidRequests, {});
+    const displayRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
+    const videoRequest = spec.buildRequests(videoBidRequests, DEFAULT_ADATPER_REQ);
+    const videoAndDisplayRequests = spec.buildRequests(videoAndDisplayBidRequests, DEFAULT_ADATPER_REQ);
+    const rotatingRequest = spec.buildRequests(displayBidRequests, DEFAULT_ADATPER_REQ);
     it('rotates endpoints', () => {
       const bidReqUrls = [displayRequest[0], videoRequest[0], videoAndDisplayRequests[0], rotatingRequest[0]].map(br => br.url);
       expect(bidReqUrls).to.deep.equal(EXPECTED_ENDPOINTS);
     })
 
+    it('makes correct host for aliases', () => {
+      for (const alias in aliasEP) {
+        const bidReq = deepClone(DISPLAY_REQUEST)
+        bidReq.bidder = alias;
+        const [bidderRequest] = spec.buildRequests([bidReq], { bidderCode: alias });
+        expect(bidderRequest.url).to.equal(aliasEP[alias]);
+      }
+    })
+
     it('building requests as arrays', () => {
       expect(videoRequest).to.be.a('array');
       expect(displayRequest).to.be.a('array');
@@ -264,7 +292,7 @@ describe('adtelligentBidAdapter', () => {
       expect(videoAndDisplayRequests.every(comparator)).to.be.true;
     });
     it('forms correct ADPOD request', () => {
-      const pbBidReqData = spec.buildRequests([ADPOD_REQUEST], {})[0].data;
+      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');
@@ -277,7 +305,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       };
       expect(data.BidRequests[0]).to.deep.equal(eq);
     });
@@ -289,7 +318,8 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       };
 
       expect(data.BidRequests[0]).to.deep.equal(eq);
@@ -301,12 +331,14 @@ describe('adtelligentBidAdapter', () => {
         CallbackId: '84ab500420319d',
         AdType: 'display',
         Aid: 12345,
-        Sizes: '300x250'
+        Sizes: '300x250',
+        PlacementId: 'adunit-code'
       }, {
         CallbackId: '84ab500420319d',
         AdType: 'video',
         Aid: 12345,
-        Sizes: '480x360,640x480'
+        Sizes: '480x360,640x480',
+        PlacementId: 'adunit-code'
       }]
 
       expect(bidRequests.BidRequests).to.deep.equal(expectedBidReqs);
diff --git a/test/spec/modules/adtrueBidAdapter_spec.js b/test/spec/modules/adtrueBidAdapter_spec.js
new file mode 100644
index 00000000000..8e1c872d460
--- /dev/null
+++ b/test/spec/modules/adtrueBidAdapter_spec.js
@@ -0,0 +1,431 @@
+import {expect} from 'chai'
+import {spec} from 'modules/adtrueBidAdapter.js'
+import {newBidder} from 'src/adapters/bidderFactory.js'
+import * as utils from '../../../src/utils.js';
+import {config} from 'src/config.js';
+
+describe('AdTrueBidAdapter', function () {
+  const adapter = newBidder(spec)
+  let bidRequests;
+  let bidResponses;
+  let bidResponses2;
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'adtrue',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]]
+          }
+        },
+        params: {
+          publisherId: '1212',
+          zoneId: '21423',
+          reserve: 0.2
+        },
+        placementCode: 'adunit-code-1',
+        sizes: [[300, 250]],
+        bidId: '23acc48ad47af5',
+        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        schain: {
+          'ver': '1.0',
+          'complete': 1,
+          'nodes': [
+            {
+              'asi': 'indirectseller.com',
+              'sid': '00001',
+              'hp': 1
+            },
+
+            {
+              'asi': 'indirectseller-2.com',
+              'sid': '00002',
+              'hp': 2
+            }
+          ]
+        }
+      }
+    ];
+    bidResponses = {
+      body: {
+        id: '1610681506302',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '1',
+                impid: '201fb513ca24e9',
+                price: 2.880000114440918,
+                burl: 'https://hb.adtrue.com/prebid/win-notify?impid=1610681506302&wp=${AUCTION_PRICE}',
+                adm: '',
+                adid: '1610681506302',
+                adomain: [
+                  'adtrue.com'
+                ],
+                cid: 'f6l0r6n',
+                crid: 'abc77au4',
+                attr: [],
+                w: 300,
+                h: 250
+              }
+            ],
+            seat: 'adtrue',
+            group: 0
+          }
+        ],
+        bidid: '1610681506302',
+        cur: 'USD',
+        ext: {
+          cookie_sync: [
+            {
+              type: 1,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue'
+            }
+          ]
+        }
+      }
+    };
+    bidResponses2 = {
+      body: {
+        id: '1610681506302',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '1',
+                impid: '201fb513ca24e9',
+                price: 2.880000114440918,
+                burl: 'https://hb.adtrue.com/prebid/win-notify?impid=1610681506302&wp=${AUCTION_PRICE}',
+                adm: '',
+                adid: '1610681506302',
+                adomain: [
+                  'adtrue.com'
+                ],
+                cid: 'f6l0r6n',
+                crid: 'abc77au4',
+                attr: [],
+                w: 300,
+                h: 250
+              }
+            ],
+            seat: 'adtrue',
+            group: 0
+          }
+        ],
+        bidid: '1610681506302',
+        cur: 'USD',
+        ext: {
+          cookie_sync: [
+            {
+              type: 2,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&type=image'
+            },
+            {
+              type: 1,
+              url: 'https://hb.adtrue.com/prebid/usersync?bidder=appnexus'
+            }
+          ]
+        }
+      }
+    };
+  });
+
+  describe('.code', function () {
+    it('should return a bidder code of adtrue', function () {
+      expect(spec.code).to.equal('adtrue')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+  describe('implementation', function () {
+    describe('Bid validations', function () {
+      it('valid bid case', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423',
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(true);
+      });
+      it('invalid bid case: publisherId not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              zoneId: '21423'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('valid bid case: zoneId is not passed', function () {
+        let validBid = {
+            bidder: 'adtrue',
+            params: {
+              publisherId: '1212'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+      it('should return false if there are no params', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no publisherId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return false if there is no zoneId param', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+      it('should return true if the bid is valid', () => {
+        const bid = {
+          'bidder': 'adtrue',
+          'adUnitCode': 'adunit-code',
+          params: {
+            zoneId: '21423',
+            publisherId: '1212',
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+    describe('Request formation', function () {
+      it('buildRequests function should not modify original bidRequests object', function () {
+        let originalBidRequests = utils.deepClone(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(bidRequests).to.deep.equal(originalBidRequests);
+      });
+
+      it('Endpoint/method checking', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        expect(request.url).to.equal('https://hb.adtrue.com/prebid/auction');
+        expect(request.method).to.equal('POST');
+      });
+
+      it('test flag not sent when adtrueTest=true is absent in page url', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.test).to.equal(undefined);
+      });
+      it('Request params check', function () {
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.at).to.equal(1); // auction  type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
+        expect(data.imp[0].bidfloor).to.equal(bidRequests[0].params.reserve); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with GDPR Consent', function () {
+        let bidRequest = {
+          gdprConsent: {
+            consentString: 'kjfdniwjnifwenrif3',
+            gdprApplies: true
+          }
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.user.ext.consent).to.equal('kjfdniwjnifwenrif3');
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        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.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+      it('Request params check with USP/CCPA Consent', function () {
+        let bidRequest = {
+          uspConsent: '1NYN'
+        };
+        let request = spec.buildRequests(bidRequests, bidRequest);
+        let data = JSON.parse(request.data);
+        expect(data.regs.ext.us_privacy).to.equal('1NYN');// USP/CCPAs
+        expect(data.at).to.equal(1); // auction type
+        expect(data.cur[0]).to.equal('USD'); // currency
+        expect(data.site.domain).to.be.a('string'); // domain should be set
+        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+        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.reserve)); // reverse
+        expect(data.imp[0].tagid).to.equal(bidRequests[0].params.zoneId); // zoneId
+        expect(data.imp[0].banner.w).to.equal(300); // width
+        expect(data.imp[0].banner.h).to.equal(250); // height
+        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+      });
+
+      it('should NOT include coppa flag in bid request if coppa config is not present', () => {
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+      });
+      it('should include coppa flag in bid request if coppa is set to true', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': true
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        expect(data.regs.coppa).to.equal(1);
+        sandbox.restore();
+      });
+      it('should NOT include coppa flag in bid request if coppa is set to false', () => {
+        let sandbox = sinon.sandbox.create();
+        sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            'coppa': false
+          };
+          return config[key];
+        });
+        const request = spec.buildRequests(bidRequests, {});
+        let data = JSON.parse(request.data);
+        if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+          expect(data.regs.coppa).to.equal(undefined);
+        } else {
+          expect(data.regs).to.equal(undefined);
+        }
+        sandbox.restore();
+      });
+    });
+  });
+  describe('Response checking', function () {
+    it('should check for valid response values', function () {
+      let request = spec.buildRequests(bidRequests, {
+        auctionId: 'new-auction-id'
+      });
+      let data = JSON.parse(request.data);
+      let response = spec.interpretResponse(bidResponses, request);
+      expect(response).to.be.an('array').with.length.above(0);
+      expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+      expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+      expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+      if (bidResponses.body.seatbid[0].bid[0].crid) {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+      } else {
+        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+      }
+      expect(response[0].currency).to.equal('USD');
+      expect(response[0].ttl).to.equal(300);
+      expect(response[0].meta.clickUrl).to.equal('adtrue.com');
+      expect(response[0].meta.advertiserDomains[0]).to.equal('adtrue.com');
+      expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+    });
+  });
+  describe('getUserSyncs', function () {
+    let sandbox;
+    beforeEach(function () {
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(function () {
+      sandbox.restore();
+    });
+    it('execute as per config', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, [bidResponses], undefined, undefined)).to.deep.equal([{
+        type: 'iframe',
+        url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+      }]);
+    });
+    // Multiple user sync output
+    it('execute as per config', function () {
+      expect(spec.getUserSyncs({iframeEnabled: true}, [bidResponses2], undefined, undefined)).to.deep.equal([
+        {
+          type: 'image',
+          url: 'https://hb.adtrue.com/prebid/usersync?bidder=adtrue&type=image&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+        },
+        {
+          type: 'iframe',
+          url: 'https://hb.adtrue.com/prebid/usersync?bidder=appnexus&publisherId=1212&zoneId=21423&gdpr=0&gdpr_consent=&us_privacy=&coppa=0'
+        }
+      ]);
+    });
+  });
+});
diff --git a/test/spec/modules/aduptechBidAdapter_spec.js b/test/spec/modules/aduptechBidAdapter_spec.js
index 1e39e0cfc8b..362cd3e506a 100644
--- a/test/spec/modules/aduptechBidAdapter_spec.js
+++ b/test/spec/modules/aduptechBidAdapter_spec.js
@@ -1,180 +1,280 @@
 import { expect } from 'chai';
 import {
   BIDDER_CODE,
-  PUBLISHER_PLACEHOLDER,
-  ENDPOINT_URL,
   ENDPOINT_METHOD,
-  spec,
-  extractGdprFromBidderRequest,
-  extractParamsFromBidRequest,
-  extractSizesFromBidRequest,
-  extractTopWindowReferrerFromBidRequest,
-  extractTopWindowUrlFromBidRequest
+  internal,
+  spec
 } from '../../../modules/aduptechBidAdapter.js';
+import { config } from '../../../src/config.js';
+import * as utils from '../../../src/utils.js';
+import { BANNER, NATIVE } from '../../../src/mediaTypes.js'
 import { newBidder } from '../../../src/adapters/bidderFactory.js';
 
 describe('AduptechBidAdapter', () => {
-  describe('extractGdprFromBidderRequest', () => {
-    it('should handle empty bidder request', () => {
-      const bidderRequest = null;
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.be.null;
-    });
+  describe('internal', () => {
+    describe('extractGdpr', () => {
+      it('should handle empty bidderRequest', () => {
+        expect(internal.extractGdpr(null)).to.be.null;
+        expect(internal.extractGdpr({})).to.be.null;
+      });
 
-    it('should handle missing gdprConsent in bidder request', () => {
-      const bidderRequest = {};
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.be.null;
-    });
+      it('should extract bidderRequest.gdprConsent', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString',
+            gdprApplies: false
+          }
+        };
 
-    it('should handle gdprConsent in bidder request', () => {
-      const bidderRequest = {
-        gdprConsent: {
-          consentString: 'consentString',
-          gdprApplies: true
-        }
-      };
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: bidderRequest.gdprConsent.gdprApplies
+        });
+      });
+
+      it('should handle missing bidderRequest.gdprConsent.gdprApplies', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString'
+          }
+        };
 
-      expect(extractGdprFromBidderRequest(bidderRequest)).to.deep.equal({
-        consentString: bidderRequest.gdprConsent.consentString,
-        consentRequired: true
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: true
+        });
       });
-    });
-  });
 
-  describe('extractParamsFromBidRequest', () => {
-    it('should handle empty bid request', () => {
-      const bidRequest = null;
-      expect(extractParamsFromBidRequest(bidRequest)).to.be.null;
-    });
+      it('should handle invalid bidderRequest.gdprConsent.gdprApplies', () => {
+        const bidderRequest = {
+          gdprConsent: {
+            consentString: 'consentString',
+            gdprApplies: 'foobar'
+          }
+        };
 
-    it('should handle missing params in bid request', () => {
-      const bidRequest = {};
-      expect(extractParamsFromBidRequest(bidRequest)).to.be.null;
+        expect(internal.extractGdpr(bidderRequest)).to.deep.equal({
+          consentString: bidderRequest.gdprConsent.consentString,
+          consentRequired: true
+        });
+      });
     });
 
-    it('should handle params in bid request', () => {
-      const bidRequest = {
-        params: {
-          foo: '123',
-          bar: 456
-        }
-      };
-      expect(extractParamsFromBidRequest(bidRequest)).to.deep.equal(bidRequest.params);
-    });
-  });
+    describe('extractPageUrl', () => {
+      let origPageUrl;
 
-  describe('extractSizesFromBidRequest', () => {
-    it('should handle empty bid request', () => {
-      const bidRequest = null;
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal([]);
-    });
+      beforeEach(() => {
+        // remember original pageUrl in config
+        origPageUrl = config.getConfig('pageUrl');
 
-    it('should handle missing sizes in bid request', () => {
-      const bidRequest = {};
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal([]);
-    });
+        // unset pageUrl in config
+        config.setConfig({ pageUrl: null });
+      });
+
+      afterEach(() => {
+        // set original pageUrl to config
+        config.setConfig({ pageUrl: origPageUrl });
+      });
+
+      it('should handle empty or missing data', () => {
+        expect(internal.extractPageUrl(null)).to.equal(utils.getWindowTop().location.href);
+        expect(internal.extractPageUrl({})).to.equal(utils.getWindowTop().location.href);
+        expect(internal.extractPageUrl({ refererInfo: {} })).to.equal(utils.getWindowTop().location.href);
+        expect(internal.extractPageUrl({ refererInfo: { canonicalUrl: null } })).to.equal(utils.getWindowTop().location.href);
+        expect(internal.extractPageUrl({ refererInfo: { canonicalUrl: '' } })).to.equal(utils.getWindowTop().location.href);
+      });
+
+      it('should use "pageUrl" from config', () => {
+        config.setConfig({ pageUrl: 'http://page.url' });
 
-    it('should handle sizes in bid request', () => {
-      const bidRequest = {
-        mediaTypes: {
-          banner: {
-            sizes: [[12, 34], [56, 78]]
+        expect(internal.extractPageUrl({})).to.equal(config.getConfig('pageUrl'));
+      });
+
+      it('should use bidderRequest.refererInfo.canonicalUrl', () => {
+        const bidderRequest = {
+          refererInfo: {
+            canonicalUrl: 'http://canonical.url'
           }
-        }
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner.sizes);
-    });
+        };
 
-    it('should handle sizes in bid request (backward compatibility)', () => {
-      const bidRequest = {
-        sizes: [[12, 34], [56, 78]]
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.sizes);
-    });
+        expect(internal.extractPageUrl(bidderRequest)).to.equal(bidderRequest.refererInfo.canonicalUrl);
+      });
 
-    it('should prefer sizes in mediaTypes.banner', () => {
-      const bidRequest = {
-        sizes: [[12, 34]],
-        mediaTypes: {
-          banner: {
-            sizes: [[56, 78]]
+      it('should prefer bidderRequest.refererInfo.canonicalUrl over "pageUrl" from config', () => {
+        const bidderRequest = {
+          refererInfo: {
+            canonicalUrl: 'http://canonical.url'
           }
-        }
-      };
-      expect(extractSizesFromBidRequest(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner.sizes);
-    });
-  });
+        };
 
-  describe('extractTopWindowReferrerFromBidRequest', () => {
-    it('should use fallback if bid request is empty', () => {
-      const bidRequest = null;
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
-    });
+        config.setConfig({ pageUrl: 'http://page.url' });
 
-    it('should use fallback if refererInfo in bid request is missing', () => {
-      const bidRequest = {};
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
+        expect(internal.extractPageUrl(bidderRequest)).to.equal(bidderRequest.refererInfo.canonicalUrl);
+      });
     });
 
-    it('should use fallback if refererInfo.referer in bid request is missing', () => {
-      const bidRequest = {
-        refererInfo: {}
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
-    });
+    describe('extractReferrer', () => {
+      it('should handle empty or missing data', () => {
+        expect(internal.extractReferrer(null)).to.equal(utils.getWindowTop().document.referrer);
+        expect(internal.extractReferrer({})).to.equal(utils.getWindowTop().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: {} })).to.equal(utils.getWindowTop().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: { referer: null } })).to.equal(utils.getWindowTop().document.referrer);
+        expect(internal.extractReferrer({ refererInfo: { referer: '' } })).to.equal(utils.getWindowTop().document.referrer);
+      });
 
-    it('should use fallback if refererInfo.referer in bid request is empty', () => {
-      const bidRequest = {
-        refererInfo: {
-          referer: ''
-        }
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(window.top.document.referrer);
-    });
+      it('hould use bidderRequest.refererInfo.referer', () => {
+        const bidderRequest = {
+          refererInfo: {
+            referer: 'foobar'
+          }
+        };
 
-    it('should use refererInfo.referer from bid request ', () => {
-      const bidRequest = {
-        refererInfo: {
-          referer: 'foobar'
-        }
-      };
-      expect(extractTopWindowReferrerFromBidRequest(bidRequest)).to.equal(bidRequest.refererInfo.referer);
+        expect(internal.extractReferrer(bidderRequest)).to.equal(bidderRequest.refererInfo.referer);
+      });
     });
-  });
 
-  describe('extractTopWindowUrlFromBidRequest', () => {
-    it('should use fallback if bid request is empty', () => {
-      const bidRequest = null;
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+    describe('extractParams', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractParams(null)).to.be.null;
+        expect(internal.extractParams({})).to.be.null;
+      });
+
+      it('should extract bidRequest.params', () => {
+        const bidRequest = {
+          params: {
+            foo: '123',
+            bar: 456
+          }
+        };
+        expect(internal.extractParams(bidRequest)).to.deep.equal(bidRequest.params);
+      });
     });
 
-    it('should use fallback if refererInfo in bid request is missing', () => {
-      const bidRequest = {};
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+    describe('extractBannerConfig', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractBannerConfig(null)).to.be.null;
+        expect(internal.extractBannerConfig({})).to.be.null;
+      });
+
+      it('should extract bidRequest.mediaTypes.banner', () => {
+        const bidRequest = {
+          mediaTypes: {
+            banner: {
+              sizes: [[12, 34], [56, 78]]
+            }
+          }
+        };
+        expect(internal.extractBannerConfig(bidRequest)).to.deep.equal(bidRequest.mediaTypes.banner);
+      });
+
+      it('should extract bidRequest.sizes (backward compatibility)', () => {
+        const bidRequest = {
+          sizes: [[12, 34], [56, 78]]
+        };
+
+        expect(internal.extractBannerConfig(bidRequest)).to.deep.equal({sizes: bidRequest.sizes});
+      });
     });
 
-    it('should use fallback if refererInfo.canonicalUrl in bid request is missing', () => {
-      const bidRequest = {
-        refererInfo: {}
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+    describe('extractNativeConfig', () => {
+      it('should handle empty bidRequest', () => {
+        expect(internal.extractNativeConfig(null)).to.be.null;
+        expect(internal.extractNativeConfig({})).to.be.null;
+      });
+
+      it('should extract bidRequest.mediaTypes.native', () => {
+        const bidRequest = {
+          mediaTypes: {
+            native: {
+              image: {
+                required: true
+              },
+              title: {
+                required: true
+              }
+            }
+          }
+        };
+
+        expect(internal.extractNativeConfig(bidRequest)).to.deep.equal(bidRequest.mediaTypes.native);
+      });
     });
 
-    it('should use fallback if refererInfo.canonicalUrl in bid request is empty', () => {
-      const bidRequest = {
-        refererInfo: {
-          canonicalUrl: ''
-        }
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(window.top.location.href);
+    describe('groupBidRequestsByPublisher', () => {
+      it('should handle empty bidRequests', () => {
+        expect(internal.groupBidRequestsByPublisher(null)).to.deep.equal({});
+        expect(internal.groupBidRequestsByPublisher([])).to.deep.equal({})
+      });
+
+      it('should group given bidRequests by params.publisher', () => {
+        const bidRequests = [
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[100, 100]]
+              }
+            },
+            params: {
+              publisher: 'publisher1',
+              placement: '1111'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[200, 200]]
+              }
+            },
+            params: {
+              publisher: 'publisher2',
+              placement: '2222'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[300, 300]]
+              }
+            },
+            params: {
+              publisher: 'publisher3',
+              placement: '3333'
+            }
+          },
+          {
+            mediaTypes: {
+              banner: {
+                sizes: [[400, 400]]
+              }
+            },
+            params: {
+              publisher: 'publisher1',
+              placement: '4444'
+            }
+          }
+        ];
+
+        expect(internal.groupBidRequestsByPublisher(bidRequests)).to.deep.equal({
+          publisher1: [
+            bidRequests[0],
+            bidRequests[3]
+          ],
+          publisher2: [
+            bidRequests[1],
+          ],
+          publisher3: [
+            bidRequests[2],
+          ],
+        });
+      });
     });
 
-    it('should use refererInfo.canonicalUrl from bid request ', () => {
-      const bidRequest = {
-        refererInfo: {
-          canonicalUrl: 'foobar'
-        }
-      };
-      expect(extractTopWindowUrlFromBidRequest(bidRequest)).to.equal(bidRequest.refererInfo.canonicalUrl);
+    describe('buildEndpointUrl', () => {
+      it('should build endpoint url based on given publisher code', () => {
+        expect(internal.buildEndpointUrl(1234)).to.be.equal('https://rtb.d.adup-tech.com/prebid/1234_bid');
+        expect(internal.buildEndpointUrl('foobar')).to.be.equal('https://rtb.d.adup-tech.com/prebid/foobar_bid');
+        expect(internal.buildEndpointUrl('foo bar')).to.be.equal('https://rtb.d.adup-tech.com/prebid/foo%20bar_bid');
+      });
     });
   });
 
@@ -185,42 +285,31 @@ describe('AduptechBidAdapter', () => {
       adapter = newBidder(spec);
     });
 
-    describe('inherited functions', () => {
-      it('exists and is a function', () => {
-        expect(adapter.callBids).to.exist.and.to.be.a('function');
+    describe('code', () => {
+      it('should be correct', () => {
+        expect(adapter.getSpec().code).to.equal(BIDDER_CODE);
       });
     });
 
-    describe('isBidRequestValid', () => {
-      it('should return true when necessary information is given', () => {
-        expect(spec.isBidRequestValid({
-          mediaTypes: {
-            banner: {
-              sizes: [[100, 200]]
-            }
-          },
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
-        })).to.be.true;
+    describe('supportedMediaTypes', () => {
+      it('should be correct', () => {
+        expect(adapter.getSpec().supportedMediaTypes).to.deep.equal([BANNER, NATIVE]);
       });
+    });
 
-      it('should return true when necessary information is given (backward compatibility)', () => {
-        expect(spec.isBidRequestValid({
-          sizes: [[100, 200]],
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
-        })).to.be.true;
+    describe('inherited functions', () => {
+      it('should exist and be a function', () => {
+        expect(adapter.callBids).to.exist.and.to.be.a('function');
       });
+    });
 
-      it('should return false on empty bid', () => {
+    describe('isBidRequestValid', () => {
+      it('should be false on empty bid', () => {
+        expect(spec.isBidRequestValid(null)).to.be.false;
         expect(spec.isBidRequestValid({})).to.be.false;
       });
 
-      it('should return false on missing sizes', () => {
+      it('should be false if mediaTypes.banner and mediaTypes.native is missing', () => {
         expect(spec.isBidRequestValid({
           params: {
             publisher: 'test',
@@ -229,63 +318,65 @@ describe('AduptechBidAdapter', () => {
         })).to.be.false;
       });
 
-      it('should return false on empty sizes', () => {
+      it('should be false if params missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
-              sizes: []
+              sizes: [[100, 200]]
             }
           },
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
         })).to.be.false;
       });
 
-      it('should return false on empty sizes (backward compatibility)', () => {
+      it('should be false if params is invalid', () => {
         expect(spec.isBidRequestValid({
-          sizes: [],
-          params: {
-            publisher: 'test',
-            placement: '1234'
-          }
+          mediaTypes: {
+            banner: {
+              sizes: [[100, 200]]
+            }
+          },
+          params: 'bar'
         })).to.be.false;
       });
 
-      it('should return false on missing params', () => {
+      it('should be false if params is empty', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
+          params: {}
         })).to.be.false;
       });
 
-      it('should return false on invalid params', () => {
+      it('should be false if params.publisher is missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
-          params: 'bar'
+          params: {
+            placement: '1234'
+          }
         })).to.be.false;
       });
 
-      it('should return false on empty params', () => {
+      it('should be false if params.placement is missing', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
               sizes: [[100, 200]]
             }
           },
-          params: {}
+          params: {
+            publisher: 'test'
+          }
         })).to.be.false;
       });
 
-      it('should return false on missing publisher', () => {
+      it('should be true if mediaTypes.banner is given', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
             banner: {
@@ -293,34 +384,62 @@ describe('AduptechBidAdapter', () => {
             }
           },
           params: {
+            publisher: 'test',
             placement: '1234'
           }
-        })).to.be.false;
+        })).to.be.true;
       });
 
-      it('should return false on missing placement', () => {
+      it('should be true if mediaTypes.native is given', () => {
         expect(spec.isBidRequestValid({
           mediaTypes: {
-            banner: {
-              sizes: [[100, 200]]
+            native: {
+              image: {
+                required: true
+              },
+              title: {
+                required: true
+              },
+              clickUrl: {
+                required: true
+              },
+              body: {
+                required: true
+              }
             }
           },
           params: {
-            publisher: 'test'
+            publisher: 'test',
+            placement: '1234'
           }
-        })).to.be.false;
+        })).to.be.true;
       });
     });
 
     describe('buildRequests', () => {
-      it('should send one bid request per ad unit to the endpoint via POST', () => {
-        const bidRequests = [
+      it('should handle empty validBidRequests', () => {
+        expect(spec.buildRequests(null)).to.deep.equal([]);
+        expect(spec.buildRequests([])).to.deep.equal([]);
+      });
+
+      it('should build one request per publisher', () => {
+        const bidderRequest = {
+          auctionId: 'auctionId123',
+          refererInfo: {
+            canonicalUrl: 'http://crazy.canonical.url',
+            referer: 'http://crazy.referer.url'
+          },
+          gdprConsent: {
+            consentString: 'consentString123',
+            gdprApplies: true
+          }
+        };
+
+        const validBidRequests = [
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId1',
             adUnitCode: 'adUnitCode1',
             transactionId: 'transactionId1',
-            auctionId: 'auctionId1',
             mediaTypes: {
               banner: {
                 sizes: [[100, 200], [300, 400]]
@@ -332,170 +451,197 @@ describe('AduptechBidAdapter', () => {
             }
           },
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId2',
             adUnitCode: 'adUnitCode2',
             transactionId: 'transactionId2',
-            auctionId: 'auctionId2',
             mediaTypes: {
               banner: {
-                sizes: [[500, 600]]
+                sizes: [[100, 200]]
               }
             },
             params: {
-              publisher: 'publisher2',
+              publisher: 'publisher1',
               placement: 'placement2'
             }
-          }
-        ];
-
-        const result = spec.buildRequests(bidRequests);
-        expect(result.length).to.equal(2);
-
-        expect(result[0].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, bidRequests[0].params.publisher));
-        expect(result[0].method).to.equal(ENDPOINT_METHOD);
-        expect(result[0].data).to.deep.equal({
-          bidId: bidRequests[0].bidId,
-          auctionId: bidRequests[0].auctionId,
-          transactionId: bidRequests[0].transactionId,
-          adUnitCode: bidRequests[0].adUnitCode,
-          pageUrl: extractTopWindowUrlFromBidRequest(bidRequests[0]),
-          referrer: extractTopWindowReferrerFromBidRequest(bidRequests[0]),
-          sizes: extractSizesFromBidRequest(bidRequests[0]),
-          params: extractParamsFromBidRequest(bidRequests[0]),
-          gdpr: null
-        });
-
-        expect(result[1].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, bidRequests[1].params.publisher));
-        expect(result[1].method).to.equal(ENDPOINT_METHOD);
-        expect(result[1].data).to.deep.equal({
-          bidId: bidRequests[1].bidId,
-          auctionId: bidRequests[1].auctionId,
-          transactionId: bidRequests[1].transactionId,
-          adUnitCode: bidRequests[1].adUnitCode,
-          pageUrl: extractTopWindowUrlFromBidRequest(bidRequests[1]),
-          referrer: extractTopWindowReferrerFromBidRequest(bidRequests[1]),
-          sizes: extractSizesFromBidRequest(bidRequests[1]),
-          params: extractParamsFromBidRequest(bidRequests[1]),
-          gdpr: null
-        });
-      });
-
-      it('should pass gdpr informations', () => {
-        const bidderRequest = {
-          gdprConsent: {
-            consentString: 'consentString',
-            gdprApplies: true
-          }
-        };
-
-        const bidRequests = [
+          },
           {
-            bidder: BIDDER_CODE,
             bidId: 'bidId3',
             adUnitCode: 'adUnitCode3',
             transactionId: 'transactionId3',
-            auctionId: 'auctionId3',
             mediaTypes: {
-              banner: {
-                sizes: [[100, 200], [300, 400]]
+              native: {
+                image: {
+                  required: true
+                },
+                title: {
+                  required: true
+                },
+                clickUrl: {
+                  required: true
+                },
+                body: {
+                  required: true
+                }
               }
             },
             params: {
-              publisher: 'publisher3',
+              publisher: 'publisher2',
               placement: 'placement3'
             }
           }
         ];
 
-        const result = spec.buildRequests(bidRequests, bidderRequest);
-        expect(result.length).to.equal(1);
-        expect(result[0].data.gdpr).to.deep.equal(extractGdprFromBidderRequest(bidderRequest));
-      });
-
-      it('should encode publisher param in endpoint url', () => {
-        const bidRequests = [
+        expect(spec.buildRequests(validBidRequests, bidderRequest)).to.deep.equal([
           {
-            bidder: BIDDER_CODE,
-            bidId: 'bidId1',
-            adUnitCode: 'adUnitCode1',
-            transactionId: 'transactionId1',
-            auctionId: 'auctionId1',
-            mediaTypes: {
-              banner: {
-                sizes: [[100, 200]]
-              }
-            },
-            params: {
-              publisher: 'crazy publisher key äÖÜ',
-              placement: 'placement1'
+            url: internal.buildEndpointUrl(validBidRequests[0].params.publisher),
+            method: ENDPOINT_METHOD,
+            data: {
+              auctionId: bidderRequest.auctionId,
+              pageUrl: bidderRequest.refererInfo.canonicalUrl,
+              referrer: bidderRequest.refererInfo.referer,
+              gdpr: {
+                consentString: bidderRequest.gdprConsent.consentString,
+                consentRequired: bidderRequest.gdprConsent.gdprApplies
+              },
+              imp: [
+                {
+                  bidId: validBidRequests[0].bidId,
+                  transactionId: validBidRequests[0].transactionId,
+                  adUnitCode: validBidRequests[0].adUnitCode,
+                  params: validBidRequests[0].params,
+                  banner: validBidRequests[0].mediaTypes.banner
+                },
+                {
+                  bidId: validBidRequests[1].bidId,
+                  transactionId: validBidRequests[1].transactionId,
+                  adUnitCode: validBidRequests[1].adUnitCode,
+                  params: validBidRequests[1].params,
+                  banner: validBidRequests[1].mediaTypes.banner
+                }
+              ]
             }
           },
-        ];
-
-        const result = spec.buildRequests(bidRequests);
-        expect(result[0].url).to.equal(ENDPOINT_URL.replace(PUBLISHER_PLACEHOLDER, encodeURIComponent(bidRequests[0].params.publisher)));
-      });
-
-      it('should handle empty bidRequests', () => {
-        expect(spec.buildRequests([])).to.deep.equal([]);
-      });
-    });
-
-    describe('interpretResponse', () => {
-      it('should correctly interpret the server response', () => {
-        const serverResponse = {
-          body: {
-            bid: {
-              bidId: 'bidId1',
-              price: 0.12,
-              net: true,
-              currency: 'EUR',
-              ttl: 123
-            },
-            creative: {
-              id: 'creativeId1',
-              width: 100,
-              height: 200,
-              html: '
Hello World
'
-            }
-          }
-        };
-
-        const result = spec.interpretResponse(serverResponse);
-        expect(result).to.deep.equal([
           {
-            requestId: serverResponse.body.bid.bidId,
-            cpm: serverResponse.body.bid.price,
-            netRevenue: serverResponse.body.bid.net,
-            currency: serverResponse.body.bid.currency,
-            ttl: serverResponse.body.bid.ttl,
-            creativeId: serverResponse.body.creative.id,
-            width: serverResponse.body.creative.width,
-            height: serverResponse.body.creative.height,
-            ad: serverResponse.body.creative.html
+            url: internal.buildEndpointUrl(validBidRequests[2].params.publisher),
+            method: ENDPOINT_METHOD,
+            data: {
+              auctionId: bidderRequest.auctionId,
+              pageUrl: bidderRequest.refererInfo.canonicalUrl,
+              referrer: bidderRequest.refererInfo.referer,
+              gdpr: {
+                consentString: bidderRequest.gdprConsent.consentString,
+                consentRequired: bidderRequest.gdprConsent.gdprApplies
+              },
+              imp: [
+                {
+                  bidId: validBidRequests[2].bidId,
+                  transactionId: validBidRequests[2].transactionId,
+                  adUnitCode: validBidRequests[2].adUnitCode,
+                  params: validBidRequests[2].params,
+                  native: validBidRequests[2].mediaTypes.native
+                }
+              ]
+            }
           }
         ]);
       });
+    });
 
+    describe('interpretResponse', () => {
       it('should handle empty serverResponse', () => {
+        expect(spec.interpretResponse(null)).to.deep.equal([]);
         expect(spec.interpretResponse({})).to.deep.equal([]);
+        expect(spec.interpretResponse({ body: {} })).to.deep.equal([]);
+        expect(spec.interpretResponse({ body: { bids: [] } })).to.deep.equal([]);
       });
 
-      it('should handle missing bid', () => {
-        expect(spec.interpretResponse({
+      it('should correctly interpret the server response', () => {
+        const serverResponse = {
           body: {
-            creative: {}
+            bids: [
+              {
+                bid: {
+                  bidId: 'bidId1',
+                  price: 0.12,
+                  net: true,
+                  currency: 'EUR',
+                  ttl: 123
+                },
+                creative: {
+                  id: 'creativeId1',
+                  advertiserDomains: ['advertiser1.com', 'advertiser2.org'],
+                  width: 100,
+                  height: 200,
+                  html: '
Hello World
'
+                }
+              },
+              {
+                bid: {
+                  bidId: 'bidId2',
+                  price: 0.99,
+                  net: false,
+                  currency: 'USD',
+                  ttl: 465
+                },
+                creative: {
+                  id: 'creativeId2',
+                  advertiserDomains: ['advertiser3.com'],
+                  native: {
+                    title: 'Ad title',
+                    body: 'Ad description',
+                    displayUrl: 'Ad display url',
+                    clickUrl: 'http://click.url/ad.html',
+                    image: {
+                      url: 'https://image.url/ad.png',
+                      width: 123,
+                      height: 456
+                    },
+                    sponsoredBy: 'Ad sponsored by',
+                    impressionTrackers: [
+                      'https://impression.tracking.url/1',
+                      'https://impression.tracking.url/2',
+                    ],
+                    privacyLink: 'https://example.com/privacy',
+                    privacyIcon: 'https://example.com/icon.png'
+                  }
+                }
+              },
+              null, // should be skipped
+              {} // should be skipped
+            ]
           }
-        })).to.deep.equal([]);
-      });
+        };
 
-      it('should handle missing creative', () => {
-        expect(spec.interpretResponse({
-          body: {
-            bid: {}
+        expect(spec.interpretResponse(serverResponse)).to.deep.equal([
+          {
+            requestId: serverResponse.body.bids[0].bid.bidId,
+            cpm: serverResponse.body.bids[0].bid.price,
+            netRevenue: serverResponse.body.bids[0].bid.net,
+            currency: serverResponse.body.bids[0].bid.currency,
+            ttl: serverResponse.body.bids[0].bid.ttl,
+            creativeId: serverResponse.body.bids[0].creative.id,
+            meta: {
+              advertiserDomains: serverResponse.body.bids[0].creative.advertiserDomains
+            },
+            mediaType: BANNER,
+            width: serverResponse.body.bids[0].creative.width,
+            height: serverResponse.body.bids[0].creative.height,
+            ad: serverResponse.body.bids[0].creative.html
+          },
+          {
+            requestId: serverResponse.body.bids[1].bid.bidId,
+            cpm: serverResponse.body.bids[1].bid.price,
+            netRevenue: serverResponse.body.bids[1].bid.net,
+            currency: serverResponse.body.bids[1].bid.currency,
+            ttl: serverResponse.body.bids[1].bid.ttl,
+            creativeId: serverResponse.body.bids[1].creative.id,
+            meta: {
+              advertiserDomains: serverResponse.body.bids[1].creative.advertiserDomains
+            },
+            mediaType: NATIVE,
+            native: serverResponse.body.bids[1].creative.native
           }
-        })).to.deep.equal([]);
+        ]);
       });
     });
   });
diff --git a/test/spec/modules/adxcgBidAdapter_spec.js b/test/spec/modules/adxcgBidAdapter_spec.js
index 306914960c3..551d50b60e7 100644
--- a/test/spec/modules/adxcgBidAdapter_spec.js
+++ b/test/spec/modules/adxcgBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/adxcgBidAdapter.js';
 import {deepClone, parseUrl} from 'src/utils.js';
+import * as utils from '../../../src/utils.js';
 
 describe('AdxcgAdapter', function () {
   let bidBanner = {
@@ -29,15 +30,15 @@ describe('AdxcgAdapter', function () {
       adzoneid: '20',
       video: {
         api: [2],
-        protocols: [1, 2],
-        mimes: ['video/mp4'],
         maxduration: 30
       }
     },
     mediaTypes: {
       video: {
         context: 'instream',
-        playerSize: [[640, 480]]
+        playerSize: [[640, 480]],
+        protocols: [1, 2],
+        mimes: ['video/mp4'],
       }
     },
     adUnitCode: 'adunit-code',
@@ -91,7 +92,7 @@ describe('AdxcgAdapter', function () {
       expect(spec.isBidRequestValid(bidBanner)).to.equal(true);
     });
 
-    it('should return true when required params not found', function () {
+    it('should return false when required params not found', function () {
       expect(spec.isBidRequestValid({})).to.be.false;
     });
 
@@ -106,10 +107,6 @@ describe('AdxcgAdapter', function () {
       const simpleVideo = JSON.parse(JSON.stringify(bidVideo));
       simpleVideo.params.adzoneid = 123;
       expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
-      simpleVideo.params.mimes = [1, 2, 3];
-      expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
-      simpleVideo.params.mimes = 'bad type';
-      expect(spec.isBidRequestValid(simpleVideo)).to.be.false;
     });
   });
 
@@ -124,7 +121,7 @@ describe('AdxcgAdapter', function () {
 
       let query = parsedRequestUrl.search;
       expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
+      expect(query.ver).to.equal('r20210330PB40');
       expect(query.source).to.equal('pbjs10');
       expect(query.pbjs).to.equal('$prebid.version$');
       expect(query.adzoneid).to.equal('1');
@@ -158,7 +155,7 @@ describe('AdxcgAdapter', function () {
       let query = parsedRequestUrl.search;
       // general part
       expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
+      expect(query.ver).to.equal('r20210330PB40');
       expect(query.source).to.equal('pbjs10');
       expect(query.pbjs).to.equal('$prebid.version$');
       expect(query.adzoneid).to.equal('20');
@@ -196,7 +193,7 @@ describe('AdxcgAdapter', function () {
 
       let query = parsedRequestUrl.search;
       expect(query.renderformat).to.equal('javascript');
-      expect(query.ver).to.equal('r20191128PB30');
+      expect(query.ver).to.equal('r20210330PB40');
       expect(query.source).to.equal('pbjs10');
       expect(query.pbjs).to.equal('$prebid.version$');
       expect(query.adzoneid).to.equal('2379');
@@ -281,7 +278,7 @@ describe('AdxcgAdapter', function () {
     let bid = deepClone([bidBanner]);
     let bidderRequests = {};
 
-    bid[0].userId = {id5id: 'id5idsample'};
+    bid[0].userId = {id5id: {uid: 'id5idsample'}};
 
     it('should send pubcid if available', function () {
       let request = spec.buildRequests(bid, bidderRequests);
@@ -327,123 +324,164 @@ describe('AdxcgAdapter', function () {
     };
 
     let BANNER_RESPONSE = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 300,
-          height: 250,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          ad: ''
-        }
-      ],
-      header: {someheader: 'fakedata'}
+      body: {
+        id: 'auctionid',
+        bidid: '84ab500420319d',
+        seatbid: [{
+          bid: [
+            {
+              impid: '84ab500420319d',
+              price: 0.45,
+              crid: '42',
+              adm: '',
+              w: 300,
+              h: 250,
+              adomain: ['adomain.com'],
+              cat: ['IAB1-4', 'IAB8-16', 'IAB25-5'],
+              ext: {
+                crType: 'banner',
+                advertiser_id: '777',
+                advertiser_name: 'advertiser',
+                agency_name: 'agency'
+              }
+            }
+          ]
+        }],
+        cur: 'USD'
+      },
+      headers: {someheader: 'fakedata'}
     };
 
     let BANNER_RESPONSE_WITHDEALID = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 300,
-          height: 250,
-          deal_id: '7722',
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          ad: ''
-        }
-      ],
-      header: {someheader: 'fakedata'}
+      body: {
+        id: 'auctionid',
+        bidid: '84ab500420319d',
+        seatbid: [{
+          bid: [
+            {
+              impid: '84ab500420319d',
+              price: 0.45,
+              crid: '42',
+              dealid: '7722',
+              adm: '',
+              w: 300,
+              h: 250,
+              adomain: ['adomain.com'],
+              ext: {
+                crType: 'banner'
+              }
+            }
+          ]
+        }],
+        cur: 'USD'
+      }
     };
 
     let VIDEO_RESPONSE = {
-      body: [
-        {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 640,
-          height: 360,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          vastUrl: 'vastContentUrl'
-        }
-      ],
-      header: {someheader: 'fakedata'}
+      body: {
+        id: 'auctionid',
+        bidid: '84ab500420319d',
+        seatbid: [{
+          bid: [
+            {
+              impid: '84ab500420319d',
+              price: 0.45,
+              crid: '42',
+              nurl: 'vastContentUrl',
+              adomain: ['adomain.com'],
+              w: 640,
+              h: 360,
+              ext: {
+                crType: 'video'
+              }
+            }
+          ]
+        }],
+        cur: 'USD'
+      },
+      headers: {someheader: 'fakedata'}
     };
 
-    let NATIVE_RESPONSE = {
-      body: [
+    let NATIVE_RESPONSEob = {
+      assets: [
         {
-          bidId: '84ab500420319d',
-          bidderCode: 'adxcg',
-          width: 0,
-          height: 0,
-          creativeId: '42',
-          cpm: 0.45,
-          currency: 'USD',
-          netRevenue: true,
-          nativeResponse: {
-            assets: [
-              {
-                id: 1,
-                required: 0,
-                title: {
-                  text: 'titleContent'
-                }
-              },
-              {
-                id: 2,
-                required: 0,
-                img: {
-                  url: 'imageContent',
-                  w: 600,
-                  h: 600
-                }
-              },
-              {
-                id: 3,
-                required: 0,
-                data: {
-                  label: 'DESC',
-                  value: 'descriptionContent'
-                }
-              },
-              {
-                id: 0,
-                required: 0,
-                data: {
-                  label: 'SPONSORED',
-                  value: 'sponsoredByContent'
-                }
-              },
-              {
-                id: 5,
-                required: 0,
-                icon: {
-                  url: 'iconContent',
-                  w: 400,
-                  h: 400
-                }
-              }
-            ],
-            link: {
-              url: 'linkContent'
-            },
-            imptrackers: ['impressionTracker1', 'impressionTracker2']
+          id: 1,
+          required: 0,
+          title: {
+            text: 'titleContent'
+          }
+        },
+        {
+          id: 2,
+          required: 0,
+          img: {
+            url: 'imageContent',
+            w: 600,
+            h: 600
+          }
+        },
+        {
+          id: 3,
+          required: 0,
+          data: {
+            label: 'DESC',
+            value: 'descriptionContent'
+          }
+        },
+        {
+          id: 0,
+          required: 0,
+          data: {
+            label: 'SPONSORED',
+            value: 'sponsoredByContent'
+          }
+        },
+        {
+          id: 5,
+          required: 0,
+          icon: {
+            url: 'iconContent',
+            w: 400,
+            h: 400
           }
         }
       ],
-      header: {someheader: 'fakedata'}
+      link: {
+        url: 'linkContent'
+      },
+      imptrackers: ['impressionTracker1', 'impressionTracker2']
+    }
+
+    let NATIVE_RESPONSE = {
+      body: {
+        id: 'auctionid',
+        bidid: '84ab500420319d',
+        seatbid: [{
+          bid: [
+            {
+              impid: '84ab500420319d',
+              price: 0.45,
+              crid: '42',
+              w: 0,
+              h: 0,
+              adm: JSON.stringify(NATIVE_RESPONSEob),
+              adomain: ['adomain.com'],
+              ext: {
+                crType: 'native'
+              }
+            }
+          ]
+        }],
+        cur: 'USD'
+      },
+      headers: {someheader: 'fakedata'}
     };
 
     it('handles regular responses', function () {
+      expect(BANNER_RESPONSE).to.exist;
+      expect(BANNER_RESPONSE.body).to.exist;
+      expect(BANNER_RESPONSE.body.id).to.exist;
+      expect(BANNER_RESPONSE.body.seatbid[0]).to.exist;
       let result = spec.interpretResponse(BANNER_RESPONSE, BIDDER_REQUEST);
 
       expect(result).to.have.lengthOf(1);
@@ -452,26 +490,30 @@ describe('AdxcgAdapter', function () {
       expect(result[0].width).to.equal(300);
       expect(result[0].height).to.equal(250);
       expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
+      expect(result[0].cpm).to.be.within(0.45, 0.46);
       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('adomain.com');
+      expect(result[0].meta.advertiserId).to.be.eql('777');
+      expect(result[0].meta.advertiserName).to.be.eql('advertiser');
+      expect(result[0].meta.agencyName).to.be.eql('agency');
+      expect(result[0].meta.advertiserDomains).to.be.eql(['adomain.com']);
+      expect(result[0].meta.secondaryCatIds).to.be.eql(['IAB1-4', 'IAB8-16', 'IAB25-5']);
     });
 
     it('handles regular responses with dealid', function () {
-      let result = spec.interpretResponse(
-        BANNER_RESPONSE_WITHDEALID,
-        BIDDER_REQUEST
-      );
+      let result = spec.interpretResponse(BANNER_RESPONSE_WITHDEALID);
 
       expect(result).to.have.lengthOf(1);
 
       expect(result[0].width).to.equal(300);
       expect(result[0].height).to.equal(250);
       expect(result[0].creativeId).to.equal(42);
-      expect(result[0].cpm).to.equal(0.45);
+      // expect(result[0].cpm).to.equal(0.45);
+      expect(result[0].cpm).to.be.within(0.45, 0.46);
       expect(result[0].ad).to.equal('');
       expect(result[0].currency).to.equal('USD');
       expect(result[0].netRevenue).to.equal(true);
@@ -479,7 +521,7 @@ describe('AdxcgAdapter', function () {
     });
 
     it('handles video responses', function () {
-      let result = spec.interpretResponse(VIDEO_RESPONSE, BIDDER_REQUEST);
+      let result = spec.interpretResponse(VIDEO_RESPONSE);
       expect(result).to.have.lengthOf(1);
 
       expect(result[0].width).to.equal(640);
@@ -494,17 +536,19 @@ describe('AdxcgAdapter', function () {
     });
 
     it('handles native responses', function () {
-      let result = spec.interpretResponse(NATIVE_RESPONSE, BIDDER_REQUEST);
+      let result = spec.interpretResponse(NATIVE_RESPONSE);
 
       expect(result[0].width).to.equal(0);
       expect(result[0].height).to.equal(0);
-      expect(result[0].mediaType).to.equal('native');
+
       expect(result[0].creativeId).to.equal(42);
       expect(result[0].cpm).to.equal(0.45);
       expect(result[0].currency).to.equal('USD');
       expect(result[0].netRevenue).to.equal(true);
       expect(result[0].ttl).to.equal(300);
 
+      expect(result[0].mediaType).to.equal('native');
+
       expect(result[0].native.clickUrl).to.equal('linkContent');
       expect(result[0].native.impressionTrackers).to.deep.equal([
         'impressionTracker1',
@@ -545,4 +589,65 @@ describe('AdxcgAdapter', function () {
       );
     });
   });
+
+  describe('on bidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+    it('should replace burl for banner', function () {
+      const burl = 'burl=${' + 'AUCTION_PRICE}';
+      const bid = {
+        'bidderCode': 'adxcg',
+        'width': 0,
+        'height': 0,
+        'statusMessage': 'Bid available',
+        'adId': '3d0b6ff1dda89',
+        'requestId': '2a423489e058a1',
+        'mediaType': 'banner',
+        'source': 'client',
+        'ad': burl,
+        'cpm': 0.66,
+        'creativeId': '353538_591471',
+        'currency': 'USD',
+        'dealId': '',
+        'netRevenue': true,
+        'ttl': 300,
+        // 'nurl': nurl,
+        'burl': burl,
+        'isBurl': true,
+        'auctionId': 'a92bffce-14d2-4f8f-a78a-7b9b5e4d28fa',
+        'responseTimestamp': 1556867386065,
+        'requestTimestamp': 1556867385916,
+        'bidder': 'adxcg',
+        'adUnitCode': 'div-gpt-ad-1555415275793-0',
+        'timeToRespond': 149,
+        'pbLg': '0.50',
+        'pbMg': '0.60',
+        'pbHg': '0.66',
+        'pbAg': '0.65',
+        'pbDg': '0.66',
+        'pbCg': '',
+        'size': '0x0',
+        'adserverTargeting': {
+          'hb_bidder': 'mgid',
+          'hb_adid': '3d0b6ff1dda89',
+          'hb_pb': '0.66',
+          'hb_size': '0x0',
+          'hb_source': 'client',
+          'hb_format': 'banner',
+          'hb_banner_title': 'TITLE',
+          'hb_banner_image': 'hb_banner_image:3d0b6ff1dda89',
+          'hb_banner_icon': 'IconURL',
+          'hb_banner_linkurl': 'hb_banner_linkurl:3d0b6ff1dda89'
+        },
+        'status': 'targetingSet',
+        'params': [{'adzoneid': '20'}]
+      };
+      spec.onBidWon(bid);
+      expect(bid.burl).to.deep.equal(burl);
+    });
+  });
 });
diff --git a/test/spec/modules/adyoulikeBidAdapter_spec.js b/test/spec/modules/adyoulikeBidAdapter_spec.js
index d2d4e10c17f..e6e95ea5423 100644
--- a/test/spec/modules/adyoulikeBidAdapter_spec.js
+++ b/test/spec/modules/adyoulikeBidAdapter_spec.js
@@ -58,12 +58,137 @@ describe('Adyoulike Adapter', function () {
       'mediaTypes':
         { 'banner':
           {'sizes': ['300x250']
+          },
+        'native':
+          { 'image': {
+            'required': true,
+          },
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'cta': {
+            'required': false
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'clickUrl': {
+            'required': true
+          },
+          'privacyIcon': {
+            'required': false
+          },
+          'privacyLink': {
+            'required': false
+          },
+          'body': {
+            'required': true
+          },
+          'icon': {
+            'required': true,
+            'sizes': []
           }
+          },
         },
       'transactionId': 'bid_id_0_transaction_id'
     }
   ];
 
+  const bidRequestWithNativeImageType = [
+    {
+      'bidId': 'bid_id_0',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-0',
+      'params': {
+        'placement': 'placement_0'
+      },
+      'sizes': '300x250',
+      'mediaTypes':
+      {
+        'native': {
+          'type': 'image',
+          'additional': {
+            'will': 'be',
+            'sent': ['300x250']
+          }
+        },
+      },
+      'transactionId': 'bid_id_0_transaction_id'
+    }
+  ];
+
+  const sentBidNative = {
+    'bid_id_0': {
+      'PlacementID': 'e622af275681965d3095808561a1e510',
+      'TransactionID': 'e8355240-d976-4cd5-a493-640656fe08e8',
+      'AvailableSizes': '',
+      'Native': {
+        'image': {
+          'required': true,
+          'sizes': []
+        },
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'cta': {
+          'required': false
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'clickUrl': {
+          'required': true
+        },
+        'privacyIcon': {
+          'required': false
+        },
+        'privacyLink': {
+          'required': false
+        },
+        'body': {
+          'required': true
+        },
+        'icon': {
+          'required': true,
+          'sizes': []
+        }
+      }
+    }
+  };
+
+  const sentNativeImageType = {
+    'additional': {
+      'sent': [
+        '300x250'
+      ],
+      'will': 'be'
+    },
+    'body': {
+      'required': false
+    },
+    'clickUrl': {
+      'required': true
+    },
+    'cta': {
+      'required': false
+    },
+    'icon': {
+      'required': false
+    },
+    'image': {
+      'required': true
+    },
+    'sponsoredBy': {
+      'required': true
+    },
+    'title': {
+      'required': true
+    },
+    'type': 'image'
+  };
+
   const bidRequestWithDCPlacement = [
     {
       'bidId': 'bid_id_0',
@@ -165,15 +290,99 @@ describe('Adyoulike Adapter', function () {
       'Placement': 'placement_0'
     }
   ];
+
+  const testMetaObject = {
+    'networkId': 123,
+    'advertiserId': '3',
+    'advertiserName': 'foobar',
+    'advertiserDomains': ['foobar.com'],
+    'brandId': '345',
+    'brandName': 'Foo',
+    'primaryCatId': '34',
+    'secondaryCatIds': ['IAB-222', 'IAB-333'],
+    'mediaType': 'banner'
+  };
+
+  const admSample = "\u003cscript id=\"ayl-prebid-a11a121205932e75e622af275681965d\"\u003e\n(function(){\n\twindow.isPrebid = true\n\tvar prebidResults = /*PREBID*/{\"OnEvents\":{\"CLICK\":[{\"Kind\":\"PIXEL_URL\",\"Url\":\"https://testPixelCLICK.com/fake\"}],\"IMPRESSION\":[{\"Kind\":\"PIXEL_URL\",\"Url\":\"https://testPixelIMP.com/fake\"},{\"Kind\":\"JAVASCRIPT_URL\",\"Url\":\"https://testJsIMP.com/fake.js\"}]},\"Disabled\":false,\"Attempt\":\"a11a121205932e75e622af275681965d\",\"ApiPrefix\":\"https://fo-api.omnitagjs.com/fo-api\",\"TrackingPrefix\":\"https://tracking.omnitagjs.com/tracking\",\"DynamicPrefix\":\"https://tag-dyn.omnitagjs.com/fo-dyn\",\"StaticPrefix\":\"https://fo-static.omnitagjs.com/fo-static\",\"BlobPrefix\":\"https://fo-api.omnitagjs.com/fo-api/blobs\",\"SspPrefix\":\"https://fo-ssp.omnitagjs.com/fo-ssp\",\"VisitorPrefix\":\"https://visitor.omnitagjs.com/visitor\",\"Trusted\":true,\"Placement\":\"e622af275681965d3095808561a1e510\",\"PlacementAccess\":\"ALL\",\"Site\":\"6e2df7a92203c3c7a25561ed63f25a27\",\"Lang\":\"EN\",\"SiteLogo\":null,\"HasSponsorImage\":false,\"ResizeIframe\":true,\"IntegrationConfig\":{\"Kind\":\"WIDGET\",\"Widget\":{\"ExtraStyleSheet\":\"\",\"Placeholders\":{\"Body\":{\"Color\":{\"R\":77,\"G\":21,\"B\":82,\"A\":100},\"BackgroundColor\":{\"R\":255,\"G\":255,\"B\":255,\"A\":100},\"FontFamily\":\"Lato\",\"Width\":\"100%\",\"Align\":\"\",\"BoxShadow\":true},\"CallToAction\":{\"Color\":{\"R\":26,\"G\":157,\"B\":212,\"A\":100}},\"Description\":{\"Length\":130},\"Image\":{\"Width\":600,\"Height\":600,\"Lowres\":false,\"Raw\":false},\"Size\":{\"Height\":\"250px\",\"Width\":\"300px\"},\"Sponsor\":{\"Color\":{\"R\":35,\"G\":35,\"B\":35,\"A\":100},\"Label\":true,\"WithoutLogo\":false},\"Title\":{\"Color\":{\"R\":219,\"G\":181,\"B\":255,\"A\":100}}},\"Selector\":{\"Kind\":\"CSS\",\"Css\":\"#ayl-prebid-a11a121205932e75e622af275681965d\"},\"Insertion\":\"AFTER\",\"ClickFormat\":true,\"Creative20\":true,\"WidgetKind\":\"CREATIVE_TEMPLATE_4\"}},\"Legal\":\"Sponsored\",\"ForcedCampaign\":\"f1c80d4bb5643c222ae8de75e9b2f991\",\"ForcedTrack\":\"\",\"ForcedCreative\":\"\",\"ForcedSource\":\"\",\"DisplayMode\":\"DEFAULT\",\"Campaign\":\"f1c80d4bb5643c222ae8de75e9b2f991\",\"CampaignAccess\":\"ALL\",\"CampaignKind\":\"AD_TRAFFIC\",\"DataSource\":\"LOCAL\",\"DataSourceUrl\":\"\",\"DataSourceOnEventsIsolated\":false,\"DataSourceWithoutCookie\":false,\"Content\":{\"Preview\":{\"Thumbnail\":{\"Image\":{\"Kind\":\"EXTERNAL\",\"Data\":{\"External\":{\"Url\":\"https://tag-dyn.omnitagjs.com/fo-dyn/native/preview/image?key=fd4362d35bb174d6f1c80d4bb5643c22\\u0026kind=INTERNAL\\u0026ztop=0.000000\\u0026zleft=0.000000\\u0026zwidth=0.333333\\u0026zheight=1.000000\\u0026width=[width]\\u0026height=[height]\"}},\"ZoneTop\":0,\"ZoneLeft\":0,\"ZoneWidth\":1,\"ZoneHeight\":1,\"Smart\":false,\"NoTransform\":false,\"Quality\":\"NORMAL\"}},\"Text\":{\"CALLTOACTION\":\"Click here to learn more\",\"DESCRIPTION\":\"Considérant l'extrémité conjoncturelle, il serait bon d'anticiper toutes les voies de bon sens.\",\"SPONSOR\":\"Tested by\",\"TITLE\":\"Adserver Traffic Redirect Internal\"},\"Sponsor\":{\"Name\":\"QA Team\"},\"Credit\":{\"Logo\":{\"Resource\":{\"Kind\":\"EXTERNAL\",\"Data\":{\"External\":{\"Url\":\"https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png\"}},\"ZoneTop\":0,\"ZoneLeft\":0,\"ZoneWidth\":1,\"ZoneHeight\":1,\"Smart\":false,\"NoTransform\":false,\"Quality\":\"NORMAL\"}},\"Url\":\"https://blobs.omnitagjs.com/adchoice/\"}},\"Landing\":{\"Url\":\"https://www.w3.org/People/mimasa/test/xhtml/entities/entities-11.xhtml#lat1\",\"LegacyTracking\":false},\"ViewButtons\":{\"Close\":{\"Skip\":6000}},\"InternalContentFields\":{\"AnimatedImage\":false}},\"AdDomain\":\"adyoulike.com\",\"Opener\":\"REDIRECT\",\"PerformUITriggers\":[\"CLICK\"],\"RedirectionTarget\":\"TAB\"}/*PREBID*/;\n\tvar insertAds = function insertAds() {\insertAds();\n\t}\n})();\n\u003c/script\u003e";
   const responseWithSinglePlacement = [
     {
       'BidID': 'bid_id_0',
       'Placement': 'placement_0',
-      'Ad': 'placement_0',
+      'Ad': admSample,
       'Price': 0.5,
       'Height': 600,
+      'Meta': testMetaObject
     }
   ];
+
+  const responseWithSingleNative = [{
+    'BidID': 'bid_id_0',
+    'Placement': 'placement_0',
+    'Native': {
+      'body': 'Considérant l\'extrémité conjoncturelle, il serait bon d\'anticiper toutes les voies de bon sens.',
+      'cta': 'Click here to learn more',
+      'clickUrl': 'https://tracking.omnitagjs.com/tracking/ar?event_kind=CLICK&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991&url=https%3A%2F%2Fwww.w3.org%2FPeople%2Fmimasa%2Ftest%2Fxhtml%2Fentities%2Fentities-11.xhtml%23lat1',
+      'image': {
+        'height': 600,
+        'url': 'https://blobs.omnitagjs.com/blobs/f1/f1c80d4bb5643c22/fd4362d35bb174d6f1c80d4bb5643c22',
+        'width': 300
+      },
+      'privacyIcon': 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png',
+      'privacyLink': 'https://blobs.omnitagjs.com/adchoice/',
+      'sponsoredBy': 'QA Team',
+      'title': 'Adserver Traffic Redirect Internal',
+      'impressionTrackers': [
+        'https://testPixelIMP.com/fake',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=IMPRESSION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=INSERTION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+      ],
+      'javascriptTrackers': [
+        'https://testJsIMP.com/fake.js'
+      ],
+      'clickTrackers': [
+        'https://testPixelCLICK.com/fake'
+      ]
+    },
+    'Price': 0.5,
+    'Height': 600,
+  }];
+
+  const nativeResult = [{
+    cpm: 0.5,
+    creativeId: undefined,
+    currency: 'USD',
+    netRevenue: true,
+    requestId: 'bid_id_0',
+    ttl: 3600,
+    mediaType: 'native',
+    native: {
+      body: 'Considérant l\'extrémité conjoncturelle, il serait bon d\'anticiper toutes les voies de bon sens.',
+      clickTrackers: [
+        'https://testPixelCLICK.com/fake'
+      ],
+      clickUrl: 'https://tracking.omnitagjs.com/tracking/ar?event_kind=CLICK&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991&url=https%3A%2F%2Fwww.w3.org%2FPeople%2Fmimasa%2Ftest%2Fxhtml%2Fentities%2Fentities-11.xhtml%23lat1',
+      cta: 'Click here to learn more',
+      image: {
+        height: 600,
+        url: 'https://blobs.omnitagjs.com/blobs/f1/f1c80d4bb5643c22/fd4362d35bb174d6f1c80d4bb5643c22',
+        width: 300,
+      },
+      impressionTrackers: [
+        'https://testPixelIMP.com/fake',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=IMPRESSION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991',
+        'https://tracking.omnitagjs.com/tracking/pixel?event_kind=INSERTION&attempt=a11a121205932e75e622af275681965d&campaign=f1c80d4bb5643c222ae8de75e9b2f991'
+      ],
+      javascriptTrackers: [
+        'https://testJsIMP.com/fake.js'
+      ],
+      privacyIcon: 'https://fo-static.omnitagjs.com/fo-static/native/images/info-ayl.png',
+      privacyLink: 'https://blobs.omnitagjs.com/adchoice/',
+      sponsoredBy: 'QA Team',
+      title: 'Adserver Traffic Redirect Internal',
+    },
+    meta: testMetaObject
+  }];
+
   const responseWithMultiplePlacements = [
     {
       'BidID': 'bid_id_0',
@@ -214,15 +423,34 @@ describe('Adyoulike Adapter', function () {
       'transactionId': 'bid_id_1_transaction_id'
     };
 
+    let nativeBid = {
+      'bidId': 'bid_id_1',
+      'bidder': 'adyoulike',
+      'placementCode': 'adunit/hb-1',
+      'params': {
+        'placement': 'placement_1'
+      },
+      mediaTypes: {
+        native: {
+
+        }
+      },
+      'transactionId': 'bid_id_1_transaction_id'
+    };
+
     it('should return true when required params found', function () {
-      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when required params found for native ad', function () {
+      expect(!!spec.isBidRequestValid(nativeBid)).to.equal(true);
     });
 
     it('should return false when required params are not passed', function () {
       let bid = Object.assign({}, bid);
       delete bid.size;
 
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
 
     it('should return false when required params are not passed', function () {
@@ -231,7 +459,7 @@ describe('Adyoulike Adapter', function () {
       bid.params = {
         'placement': 0
       };
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(!!spec.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
@@ -250,6 +478,23 @@ describe('Adyoulike Adapter', function () {
       canonicalQuery.restore();
     });
 
+    it('Should expand short native image config type', function() {
+      const request = spec.buildRequests(bidRequestWithNativeImageType, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(request.url).to.contain(getEndpoint());
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
+      expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
+      expect(request.url).to.contains('PublisherDomain=http%3A%2F%2Flocalhost%3A9876');
+
+      expect(payload.Version).to.equal('1.0');
+      expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
+      expect(payload.PageRefreshed).to.equal(false);
+      expect(payload.Bids['bid_id_0'].TransactionID).to.be.equal('bid_id_0_transaction_id');
+      expect(payload.Bids['bid_id_0'].Native).deep.equal(sentNativeImageType);
+    });
+
     it('should add gdpr/usp consent information to the request', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let uspConsentData = '1YCC';
@@ -306,6 +551,7 @@ describe('Adyoulike Adapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.contains('CanonicalUrl=' + encodeURIComponent(canonicalUrl));
       expect(request.url).to.contains('RefererUrl=' + encodeURIComponent(referrerUrl));
+      expect(request.url).to.contains('PublisherDomain=http%3A%2F%2Flocalhost%3A9876');
 
       expect(payload.Version).to.equal('1.0');
       expect(payload.Bids['bid_id_0'].PlacementID).to.be.equal('placement_0');
@@ -383,9 +629,10 @@ describe('Adyoulike Adapter', function () {
 
       expect(result.length).to.equal(1);
       expect(result[0].cpm).to.equal(0.5);
-      expect(result[0].ad).to.equal('placement_0');
+      expect(result[0].ad).to.equal(admSample);
       expect(result[0].width).to.equal(300);
       expect(result[0].height).to.equal(600);
+      expect(result[0].meta).to.deep.equal(testMetaObject);
     });
 
     it('receive reponse with multiple placement', function () {
@@ -404,5 +651,29 @@ describe('Adyoulike Adapter', function () {
       expect(result[1].width).to.equal(400);
       expect(result[1].height).to.equal(250);
     });
+
+    it('receive reponse with Native from ad markup', function () {
+      serverResponse.body = responseWithSinglePlacement;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidNative) + '}'});
+
+      expect(result.length).to.equal(1);
+
+      expect(result).to.deep.equal(nativeResult);
+    });
+
+    it('receive reponse with Native ad', function () {
+      serverResponse.body = responseWithSingleNative;
+      let result = spec.interpretResponse(serverResponse, {data: '{"Bids":' + JSON.stringify(sentBidNative) + '}'});
+
+      expect(result.length).to.equal(1);
+
+      const noMeta = [...nativeResult];
+      const metaBackup = noMeta[0].meta;
+
+      // this test should return default meta object
+      noMeta[0].meta = { advertiserDomains: [] };
+
+      expect(result).to.deep.equal(noMeta);
+    });
   });
 });
diff --git a/test/spec/modules/amxBidAdapter_spec.js b/test/spec/modules/amxBidAdapter_spec.js
new file mode 100644
index 00000000000..f502d631c17
--- /dev/null
+++ b/test/spec/modules/amxBidAdapter_spec.js
@@ -0,0 +1,563 @@
+import * as utils from 'src/utils.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+import { expect } from 'chai';
+import { spec } from 'modules/amxBidAdapter.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { config } from 'src/config.js';
+
+const sampleRequestId = '82c91e127a9b93e';
+const sampleDisplayAd = (additionalImpressions) => `${additionalImpressions}`;
+const sampleDisplayCRID = '78827819';
+// minimal example vast
+const sampleVideoAd = (addlImpression) => `
+00:00:15${addlImpression}
+`.replace(/\n+/g, '')
+
+const embeddedTrackingPixel = `https://1x1.a-mo.net/hbx/g_impression?A=sample&B=20903`;
+const sampleNurl = 'https://example.exchange/nurl';
+
+const sampleFPD = {
+  site: {
+    keywords: 'sample keywords',
+    ext: {
+      data: {
+        pageType: 'article'
+      }
+    }
+  },
+  user: {
+    gender: 'O',
+    yob: 1982,
+  }
+};
+
+const stubConfig = (withStub) => {
+  const stub = sinon.stub(config, 'getConfig').callsFake(
+    (arg) => arg === 'ortb2' ? sampleFPD : null
+  )
+
+  withStub();
+  stub.restore();
+};
+
+const sampleBidderRequest = {
+  gdprConsent: {
+    gdprApplies: true,
+    consentString: utils.getUniqueIdentifierStr(),
+    vendorData: {}
+  },
+  auctionId: utils.getUniqueIdentifierStr(),
+  uspConsent: '1YYY',
+  refererInfo: {
+    referer: 'https://www.prebid.org',
+    canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+  }
+};
+
+const sampleBidRequestBase = {
+  bidder: spec.code,
+  params: {
+    endpoint: 'https://httpbin.org/post',
+  },
+  sizes: [[320, 50]],
+  getFloor(params) {
+    if (params.size == null || params.currency == null || params.mediaType == null) {
+      throw new Error(`getFloor called with incomplete params: ${JSON.stringify(params)}`)
+    }
+    return {
+      floor: 0.5,
+      currency: 'USD'
+    }
+  },
+  mediaTypes: {
+    [BANNER]: {
+      sizes: [[300, 250]]
+    }
+  },
+  adUnitCode: 'div-gpt-ad-example',
+  transactionId: utils.getUniqueIdentifierStr(),
+  bidId: sampleRequestId,
+  auctionId: utils.getUniqueIdentifierStr(),
+};
+
+const schainConfig = {
+  ver: '1.0',
+  nodes: [{
+    asi: 'greatnetwork.exchange',
+    sid: '000001',
+    hp: 1,
+    rid: 'bid_request_1',
+    domain: 'publisher.com'
+  }]
+};
+
+const sampleBidRequestVideo = {
+  ...sampleBidRequestBase,
+  bidId: sampleRequestId + '_video',
+  sizes: [[300, 150]],
+  schain: schainConfig,
+  mediaTypes: {
+    [VIDEO]: {
+      sizes: [[360, 250]],
+      context: 'adpod',
+      adPodDurationSec: 90,
+      contentMode: 'live'
+    }
+  }
+};
+
+const sampleServerResponse = {
+  'p': {
+    'hreq': ['https://1x1.a-mo.net/hbx/g_sync?partner=test', 'https://1x1.a-mo.net/hbx/g_syncf?__st=iframe']
+  },
+  'r': {
+    [sampleRequestId]: [
+      {
+        'b': [
+          {
+            'adid': '78827819',
+            'adm': sampleDisplayAd(''),
+            'adomain': [
+              'example.com'
+            ],
+            'crid': sampleDisplayCRID,
+            'ext': {
+              'himp': [
+                embeddedTrackingPixel
+              ],
+            },
+            'nurl': sampleNurl,
+            'h': 600,
+            'id': '2014691335735134254',
+            'impid': '1',
+            'exp': 90,
+            'price': 0.25,
+            'w': 300
+          },
+          {
+            'adid': '222976952',
+            'adm': sampleVideoAd(''),
+            'adomain': [
+              'example.com'
+            ],
+            'crid': sampleDisplayCRID,
+            'ext': {
+              'himp': [
+                embeddedTrackingPixel
+              ],
+            },
+            'nurl': sampleNurl,
+            'h': 1,
+            'id': '7735706981389902829',
+            'impid': '1',
+            'exp': 90,
+            'price': 0.25,
+            'w': 1
+          },
+        ],
+      }
+    ]
+  },
+}
+
+describe('AmxBidAdapter', () => {
+  describe('isBidRequestValid', () => {
+    it('endpoint must be an optional string', () => {
+      expect(spec.isBidRequestValid({params: { endpoint: 1 }})).to.equal(false)
+      expect(spec.isBidRequestValid({params: { endpoint: 'test' }})).to.equal(true)
+    });
+
+    it('tagId is an optional string', () => {
+      expect(spec.isBidRequestValid({params: { tagId: 1 }})).to.equal(false)
+      expect(spec.isBidRequestValid({params: { tagId: 'test' }})).to.equal(true)
+    });
+
+    it('testMode is an optional truthy value', () => {
+      expect(spec.isBidRequestValid({params: { testMode: 1 }})).to.equal(true)
+      expect(spec.isBidRequestValid({params: { testMode: 'true' }})).to.equal(true)
+      // ignore invalid values (falsy)
+      expect(spec.isBidRequestValid({params: { testMode: 'non-truthy-invalid-value' }})).to.equal(true)
+      expect(spec.isBidRequestValid({params: { testMode: false }})).to.equal(true)
+    });
+
+    it('none of the params are required', () => {
+      expect(spec.isBidRequestValid({})).to.equal(true)
+    });
+  })
+  describe('getUserSync', () => {
+    it('will only sync from valid server responses', () => {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs).to.eql([]);
+    });
+
+    it('will return valid syncs from a server response', () => {
+      const syncs = spec.getUserSyncs({ iframeEnabled: true }, [{body: sampleServerResponse}]);
+      expect(syncs.length).to.equal(2);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[1].type).to.equal('iframe');
+    });
+
+    it('will filter out iframe syncs based on options', () => {
+      const syncs = spec.getUserSyncs({ iframeEnabled: false }, [{body: sampleServerResponse}, {body: sampleServerResponse}]);
+      expect(syncs.length).to.equal(2);
+      expect(syncs).to.satisfy((allSyncs) => allSyncs.every((sync) => sync.type === 'image'))
+    });
+  });
+
+  describe('buildRequests', () => {
+    it('will default to prebid.a-mo.net endpoint', () => {
+      const { url } = spec.buildRequests([], sampleBidderRequest);
+      expect(url).to.equal('https://prebid.a-mo.net/a/c')
+    });
+
+    it('will read the prebid version & global', () => {
+      const { data: { V: prebidVersion, vg: prebidGlobal } } = spec.buildRequests([{
+        ...sampleBidRequestBase,
+        params: {
+          testMode: true
+        }
+      }], sampleBidderRequest);
+      expect(prebidVersion).to.equal('$prebid.version$')
+      expect(prebidGlobal).to.equal('$$PREBID_GLOBAL$$')
+    });
+
+    it('reads test mode from the first bid request', () => {
+      const { data } = spec.buildRequests([{
+        ...sampleBidRequestBase,
+        params: {
+          testMode: true
+        }
+      }], sampleBidderRequest);
+      expect(data.tm).to.equal(true);
+    });
+
+    it('if prebid is in an iframe, will use the frame url as domain, if the topmost is not avialable', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], {
+        ...sampleBidderRequest,
+        refererInfo: {
+          numIframes: 1,
+          referer: 'http://search-traffic-source.com',
+          stack: []
+        }
+      });
+      expect(data.do).to.equal('localhost')
+      expect(data.re).to.equal('http://search-traffic-source.com');
+    });
+
+    it('if we are in AMP, make sure we use the canonical URL or the referrer (which is sourceUrl)', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], {
+        ...sampleBidderRequest,
+        refererInfo: {
+          isAmp: true,
+          referer: 'http://real-publisher-site.com/content',
+          stack: []
+        }
+      });
+      expect(data.do).to.equal('real-publisher-site.com')
+      expect(data.re).to.equal('http://real-publisher-site.com/content');
+    })
+
+    it('if prebid is in an iframe, will use the topmost url as domain', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], {
+        ...sampleBidderRequest,
+        refererInfo: {
+          numIframes: 1,
+          referer: 'http://search-traffic-source.com',
+          stack: ['http://top-site.com', 'http://iframe.com']
+        }
+      });
+      expect(data.do).to.equal('top-site.com');
+      expect(data.re).to.equal('http://search-traffic-source.com');
+    });
+
+    it('handles referer data and GDPR, USP Consent, COPPA', () => {
+      const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
+      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)
+      expect(data.cpp).to.equal(0)
+    });
+
+    it('will forward bid request count & wins count data', () => {
+      const bidderRequestsCount = Math.floor(Math.random() * 100)
+      const bidderWinsCount = Math.floor(Math.random() * 100)
+      const { data } = spec.buildRequests([{
+        ...sampleBidRequestBase,
+        bidderRequestsCount,
+        bidderWinsCount
+      }], sampleBidderRequest);
+
+      expect(data.brc).to.equal(bidderRequestsCount)
+      expect(data.bwc).to.equal(bidderWinsCount)
+      expect(data.trc).to.equal(0)
+    });
+    it('will forward first-party data', () => {
+      stubConfig(() => {
+        const { data } = spec.buildRequests([sampleBidRequestBase], sampleBidderRequest);
+        expect(data.fpd2).to.deep.equal(sampleFPD)
+      });
+    });
+
+    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'},
+        idl_env: 'sample-liveramp',
+        lipb: {lipbid: 'sample-liveintent'},
+        netId: 'sample-netid',
+        parrableId: { eid: 'sample-parrable' },
+        pubcid: 'sample-pubcid',
+        [randomRTI]: 'sample-unknown',
+        tdid: 'sample-ttd',
+      };
+
+      const eids = createEidsArray(userId);
+      const bid = {
+        ...sampleBidRequestBase,
+        userIdAsEids: eids
+      };
+
+      const { data } = spec.buildRequests([bid, bid], sampleBidderRequest);
+      expect(data.eids).to.deep.equal(eids)
+    });
+
+    it('can build a banner request', () => {
+      const { method, url, data } = spec.buildRequests([sampleBidRequestBase, {
+        ...sampleBidRequestBase,
+        bidId: sampleRequestId + '_2',
+        params: {
+          ...sampleBidRequestBase.params,
+          tagId: 'example'
+        }
+      }], sampleBidderRequest)
+
+      expect(url).to.equal(sampleBidRequestBase.params.endpoint)
+      expect(method).to.equal('POST');
+      expect(Object.keys(data.m).length).to.equal(2);
+      expect(data.m[sampleRequestId]).to.deep.equal({
+        av: true,
+        au: 'div-gpt-ad-example',
+        vd: {},
+        ms: [
+          [[320, 50]],
+          [[300, 250]],
+          []
+        ],
+        aw: 300,
+        sc: {},
+        ah: 250,
+        tf: 0,
+        f: 0.5,
+        vr: false
+      });
+      expect(data.m[sampleRequestId + '_2']).to.deep.equal({
+        av: true,
+        aw: 300,
+        au: 'div-gpt-ad-example',
+        sc: {},
+        ms: [
+          [[320, 50]],
+          [[300, 250]],
+          []
+        ],
+        i: 'example',
+        ah: 250,
+        vd: {},
+        tf: 0,
+        f: 0.5,
+        vr: false,
+      });
+    });
+
+    it('can build a video request', () => {
+      const { data } = spec.buildRequests([sampleBidRequestVideo], sampleBidderRequest);
+      expect(Object.keys(data.m).length).to.equal(1);
+      expect(data.m[sampleRequestId + '_video']).to.deep.equal({
+        au: 'div-gpt-ad-example',
+        ms: [
+          [[300, 150]],
+          [],
+          [[360, 250]]
+        ],
+        av: true,
+        aw: 360,
+        ah: 250,
+        sc: schainConfig,
+        vd: {
+          sizes: [[360, 250]],
+          context: 'adpod',
+          adPodDurationSec: 90,
+          contentMode: 'live'
+        },
+        tf: 0,
+        f: 0.5,
+        vr: true
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const baseBidResponse = {
+      requestId: sampleRequestId,
+      cpm: 0.25,
+      creativeId: sampleDisplayCRID,
+      currency: 'USD',
+      netRevenue: true,
+      meta: {
+        advertiserDomains: ['example.com'],
+      },
+    };
+
+    const baseRequest = {
+      data: {
+        m: {
+          [sampleRequestId]: {
+            aw: 300,
+            ah: 250,
+          },
+        }
+      }
+    };
+
+    it('will handle a nobid response', () => {
+      const parsed = spec.interpretResponse({ body: '' }, baseRequest)
+      expect(parsed).to.eql([])
+    });
+
+    it('can parse a display ad', () => {
+      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
+      expect(parsed.length).to.equal(2)
+
+      // we should have display, video, display
+      expect(parsed[0]).to.deep.equal({
+        ...baseBidResponse,
+        meta: {
+          ...baseBidResponse.meta,
+          mediaType: BANNER,
+        },
+        mediaType: BANNER,
+        width: 300,
+        height: 600, // from the bid itself
+        ttl: 90,
+        ad: sampleDisplayAd(
+          `` +
+          ``
+        ),
+      });
+    });
+
+    it('can parse a video ad', () => {
+      const parsed = spec.interpretResponse({ body: sampleServerResponse }, baseRequest)
+      expect(parsed.length).to.equal(2)
+      expect(parsed[1]).to.deep.equal({
+        ...baseBidResponse,
+        meta: {
+          ...baseBidResponse.meta,
+          mediaType: VIDEO,
+        },
+        mediaType: VIDEO,
+        vastXml: sampleVideoAd(''),
+        width: 300,
+        height: 250,
+        ttl: 90,
+      });
+    });
+  });
+
+  describe('analytics methods', () => {
+    let firedPixels = [];
+    let _Image = window.Image;
+    before(() => {
+      _Image = window.Image;
+      window.Image = class FakeImage {
+        set src(value) {
+          firedPixels.push(value)
+        }
+      }
+    });
+
+    beforeEach(() => {
+      firedPixels = [];
+    });
+
+    after(() => {
+      window.Image = _Image;
+    });
+
+    it('will fire an event for onSetTargeting', () => {
+      spec.onSetTargeting({
+        bidder: 'example',
+        width: 300,
+        height: 250,
+        adId: 'ad-id',
+        mediaType: BANNER,
+        cpm: 1.23,
+        requestId: utils.getUniqueIdentifierStr(),
+        adUnitCode: 'div-gpt-ad',
+        adserverTargeting: {
+          hb_pb: '1.23',
+          hb_adid: 'ad-id',
+          hb_bidder: 'example'
+        }
+      });
+      expect(firedPixels.length).to.equal(1)
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbst/)
+      try {
+        const parsed = new URL(firedPixels[0]);
+        const nestedData = parsed.searchParams.get('c2');
+        expect(nestedData).to.equal(utils.formatQS({
+          hb_pb: '1.23',
+          hb_adid: 'ad-id',
+          hb_bidder: 'example'
+        }));
+      } catch (e) {
+        // unsupported browser; try testing for string
+        const pixel = firedPixels[0];
+        expect(pixel).to.have.string(encodeURIComponent('hb_pb=1.23'))
+        expect(pixel).to.have.string(encodeURIComponent('hb_adid=ad-id'))
+      }
+    });
+
+    it('will log an event for timeout', () => {
+      spec.onTimeout({
+        bidder: 'example',
+        bidId: 'test-bid-id',
+        adUnitCode: 'div-gpt-ad',
+        timeout: 300,
+        auctionId: utils.getUniqueIdentifierStr()
+      });
+      expect(firedPixels.length).to.equal(1)
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbto/)
+    });
+
+    it('will log an event for prebid win', () => {
+      spec.onBidWon({
+        bidder: 'example',
+        adId: 'test-ad-id',
+        width: 300,
+        height: 250,
+        mediaType: VIDEO,
+        cpm: 1.34,
+        adUnitCode: 'div-gpt-ad',
+        timeout: 300,
+        auctionId: utils.getUniqueIdentifierStr()
+      });
+      expect(firedPixels.length).to.equal(1)
+      expect(firedPixels[0]).to.match(/\/hbx\/g_pbwin/)
+
+      const pixel = firedPixels[0];
+      try {
+        const url = new URL(pixel);
+        expect(url.searchParams.get('C')).to.equal('1')
+        expect(url.searchParams.get('np')).to.equal('1.34')
+      } catch (e) {
+        expect(pixel).to.have.string('C=1')
+        expect(pixel).to.have.string('np=1.34')
+      }
+    });
+  });
+});
diff --git a/test/spec/modules/aniviewBidAdapter_spec.js b/test/spec/modules/aniviewBidAdapter_spec.js
index cca175c3388..b6d63fc2a8e 100644
--- a/test/spec/modules/aniviewBidAdapter_spec.js
+++ b/test/spec/modules/aniviewBidAdapter_spec.js
@@ -160,6 +160,7 @@ describe('ANIVIEW Bid Adapter Test', function () {
       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('safely handles XML parsing failure from invalid bid response', function () {
@@ -177,15 +178,46 @@ describe('ANIVIEW Bid Adapter Test', function () {
       let result = spec.interpretResponse(nobidResponse, bidRequest);
       expect(result.length).to.equal(0);
     });
+
+    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('getUserSyncs', function () {
-    it('Check get sync pixels from response', function () {
-      let pixelUrl = 'https://sync.pixel.url/sync';
+    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 pixelStr = '{"url":"' + pixelUrl + '", "e":"' + pixelEvent + '", "t":' + pixelType + '}';
-      let bidResponse = 'FORDFORD00:00:15';
+      let bidResponse = createBidResponse(pixelEvent, pixelType);
       let serverResponse = [
         {body: bidResponse}
       ];
@@ -195,5 +227,19 @@ describe('ANIVIEW Bid Adapter Test', function () {
       expect(pixel.url).to.equal(pixelUrl);
       expect(pixel.type).to.equal('iframe');
     });
+
+    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');
+    });
   });
 });
diff --git a/test/spec/modules/aolBidAdapter_spec.js b/test/spec/modules/aolBidAdapter_spec.js
index dd10a57bbfe..50622180ad0 100644
--- a/test/spec/modules/aolBidAdapter_spec.js
+++ b/test/spec/modules/aolBidAdapter_spec.js
@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as utils from 'src/utils.js';
 import {spec} from 'modules/aolBidAdapter.js';
-import {config} from 'src/config.js';
+import {createEidsArray} from '../../../modules/userId/eids.js';
 
 const DEFAULT_AD_CONTENT = '';
 
@@ -80,6 +80,33 @@ describe('AolAdapter', function () {
   const NEXAGE_URL = 'https://c2shb.ssp.yahoo.com/bidRequest?';
   const ONE_DISPLAY_TTL = 60;
   const ONE_MOBILE_TTL = 3600;
+  const SUPPORTED_USER_ID_SOURCES = {
+    'adserver.org': '100',
+    'criteo.com': '200',
+    'id5-sync.com': '300',
+    'intentiq.com': '400',
+    'liveintent.com': '500',
+    'quantcast.com': '600',
+    'verizonmedia.com': '700',
+    'liveramp.com': '800'
+  };
+
+  const USER_ID_DATA = {
+    criteoId: SUPPORTED_USER_ID_SOURCES['criteo.com'],
+    connectid: SUPPORTED_USER_ID_SOURCES['verizonmedia.com'],
+    idl_env: SUPPORTED_USER_ID_SOURCES['liveramp.com'],
+    lipb: {
+      lipbid: SUPPORTED_USER_ID_SOURCES['liveintent.com'],
+      segments: ['100', '200']
+    },
+    tdid: SUPPORTED_USER_ID_SOURCES['adserver.org'],
+    id5id: {
+      uid: SUPPORTED_USER_ID_SOURCES['id5-sync.com'],
+      ext: {foo: 'bar'}
+    },
+    intentIqId: SUPPORTED_USER_ID_SOURCES['intentiq.com'],
+    quantcastId: SUPPORTED_USER_ID_SOURCES['quantcast.com']
+  };
 
   function createCustomBidRequest({bids, params} = {}) {
     var bidderRequest = getDefaultBidRequest();
@@ -133,6 +160,9 @@ describe('AolAdapter', function () {
         currency: 'USD',
         dealId: 'deal-id',
         netRevenue: true,
+        meta: {
+          advertiserDomains: []
+        },
         ttl: bidRequest.ttl
       });
     });
@@ -339,18 +369,6 @@ describe('AolAdapter', function () {
         expect(request.url).not.to.contain('bidfloor=');
       });
 
-      it('should return url with bidFloor option if it is present', function () {
-        let bidRequest = createCustomBidRequest({
-          params: {
-            placement: 1234567,
-            network: '9599.1',
-            bidFloor: 0.80
-          }
-        });
-        let [request] = spec.buildRequests(bidRequest.bids);
-        expect(request.url).to.contain('bidfloor=0.8');
-      });
-
       it('should return url with key values if keyValues param is present', function () {
         let bidRequest = createCustomBidRequest({
           params: {
@@ -463,6 +481,18 @@ describe('AolAdapter', function () {
           '¶m1=val1¶m2=val2¶m3=val3¶m4=val4');
       });
 
+      Object.keys(SUPPORTED_USER_ID_SOURCES).forEach(source => {
+        it(`should set the user ID query param for ${source}`, function () {
+          let bidRequest = createCustomBidRequest({
+            params: getNexageGetBidParams()
+          });
+          bidRequest.bids[0].userId = {};
+          bidRequest.bids[0].userIdAsEids = createEidsArray(USER_ID_DATA);
+          let [request] = spec.buildRequests(bidRequest.bids);
+          expect(request.url).to.contain(`&eid${source}=${encodeURIComponent(SUPPORTED_USER_ID_SOURCES[source])}`);
+        });
+      });
+
       it('should return request object for One Mobile POST endpoint when POST configuration is present', function () {
         let bidConfig = getNexagePostBidParams();
         let bidRequest = createCustomBidRequest({
@@ -581,6 +611,22 @@ describe('AolAdapter', function () {
         }
       });
     });
+
+    it('returns the bid object with eid array populated with PB set eids', () => {
+      let userIdBid = Object.assign({
+        userId: {}
+      }, bid);
+      userIdBid.userIdAsEids = createEidsArray(USER_ID_DATA);
+      expect(spec.buildOpenRtbRequestData(userIdBid)).to.deep.equal({
+        id: 'bid-id',
+        imp: [],
+        user: {
+          ext: {
+            eids: userIdBid.userIdAsEids
+          }
+        }
+      });
+    });
   });
 
   describe('getUserSyncs()', function () {
@@ -723,13 +769,6 @@ describe('AolAdapter', function () {
       });
       expect(spec.formatMarketplaceDynamicParams()).to.be.equal('param1=val1;param2=val2;param3=val3;');
     });
-
-    it('should return formatted bid floor param when it is present', function () {
-      let params = {
-        bidFloor: 0.45
-      };
-      expect(spec.formatMarketplaceDynamicParams(params)).to.be.equal('bidfloor=0.45;');
-    });
   });
 
   describe('formatOneMobileDynamicParams()', function () {
diff --git a/test/spec/modules/apacdexBidAdapter_spec.js b/test/spec/modules/apacdexBidAdapter_spec.js
new file mode 100644
index 00000000000..5f6a935c453
--- /dev/null
+++ b/test/spec/modules/apacdexBidAdapter_spec.js
@@ -0,0 +1,759 @@
+import { expect } from 'chai'
+import { spec, validateGeoObject, getDomain } from '../../../modules/apacdexBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+import { userSync } from '../../../src/userSync.js';
+import { config } from 'src/config.js';
+import { deepClone } from 'src/utils.js';
+
+describe('ApacdexBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  describe('.code', function () {
+    it('should return a bidder code of apacdex', function () {
+      expect(spec.code).to.equal('apacdex')
+    })
+  })
+
+  describe('inherited functions', function () {
+    it('should exist and be a function', function () {
+      expect(adapter.callBids).to.exist.and.to.be.a('function')
+    })
+  })
+
+  describe('.isBidRequestValid', function () {
+    it('should return false if there are no params', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if there is no siteId param', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          site_id: '1a2b3c4d5e6f1a2b3c4d',
+        },
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false if there is no mediaTypes', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          siteId: '1a2b3c4d5e6f1a2b3c4d'
+        },
+        'mediaTypes': {
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true if the bid is valid', () => {
+      const bid = {
+        'bidder': 'apacdex',
+        'adUnitCode': 'adunit-code',
+        params: {
+          siteId: '1a2b3c4d5e6f1a2b3c4d'
+        },
+        'mediaTypes': {
+          banner: {
+            sizes: [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    describe('banner', () => {
+      it('should return false if there are no banner sizes', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d'
+          },
+          'mediaTypes': {
+            banner: {
+
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return true if there is banner sizes', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d'
+          },
+          'mediaTypes': {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+
+    describe('video', () => {
+      it('should return false if there is no playerSize defined in the video mediaType', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d',
+            sizes: [[300, 250], [300, 600]]
+          },
+          'mediaTypes': {
+            video: {
+              context: 'instream'
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      });
+
+      it('should return true if there is playerSize defined on the video mediaType', () => {
+        const bid = {
+          'bidder': 'apacdex',
+          'adUnitCode': 'adunit-code',
+          params: {
+            siteId: '1a2b3c4d5e6f1a2b3c4d',
+          },
+          'mediaTypes': {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]]
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+        };
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      });
+    });
+  });
+
+  describe('.buildRequests', function () {
+    beforeEach(function () {
+      sinon.stub(userSync, 'canBidderRegisterSync');
+    });
+    afterEach(function () {
+      userSync.canBidderRegisterSync.restore();
+    });
+    let bidRequest = [{
+      'schain': {
+        'ver': '1.0',
+        'complete': 1,
+        'nodes': [
+          {
+            'asi': 'indirectseller.com',
+            'sid': '00001',
+            'hp': 1
+          },
+          {
+            'asi': 'indirectseller-2.com',
+            'sid': '00002',
+            'hp': 0
+          },
+        ]
+      },
+      'bidder': 'apacdex',
+      'params': {
+        'siteId': '1a2b3c4d5e6f1a2b3c4d',
+        'geo': { 'lat': 123.13123456, 'lon': 54.23467311, 'accuracy': 60 }
+      },
+      'adUnitCode': 'adunit-code-1',
+      'sizes': [[300, 250], [300, 600]],
+      'targetKey': 0,
+      'bidId': '30b31c1838de1f',
+      'userIdAsEids': [{
+        'source': 'criteo.com',
+        'uids': [{
+          'id': 'p0cCLF9JazY1ZUFjazJRb3NKbEprVTcwZ0IwRUlGalBjOG9laUZNbFJ0ZGpOSnVFbE9VMjBNMzNBTzladGt4cUVGQzBybDY2Y1FqT1dkUkFsMmJIWDRHNjlvNXJjbiUyQlZDd1dOTmt6VlV2TDhRd0F0RTlBcmpyZU5WRHBPU25GQXpyMnlT',
+          'atype': 1
+        }]
+      }, {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': '2ae366c2-2576-45e5-bd21-72ed10598f17',
+          'atype': 1
+        }]
+      }, {
+        'source': 'sharedid.org',
+        'uids': [{
+          'id': '01EZXQDVAPER4KE1VBS29XKV4Z',
+          'atype': 1,
+          'ext': {
+            'third': '01EZXQDVAPER4KE1VBS29XKV4Z'
+          }
+        }]
+      }],
+    },
+    {
+      'bidder': 'apacdex',
+      'params': {
+        'ad_unit': '/7780971/sparks_prebid_LB',
+        'sizes': [[300, 250], [300, 600]],
+        'referrer': 'overrides_top_window_location'
+      },
+      'adUnitCode': 'adunit-code-2',
+      'sizes': [[120, 600], [300, 600], [160, 600]],
+      'targetKey': 1,
+      'bidId': '30b31c1838de1e',
+    }];
+
+    let bidderRequests = {
+      'gdprConsent': {
+        'consentString': 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        'vendorData': {},
+        'gdprApplies': true
+      },
+      'refererInfo': {
+        'numIframes': 0,
+        'reachedTop': true,
+        'referer': 'https://example.com',
+        'stack': ['https://example.com']
+      },
+      uspConsent: 'someCCPAString'
+    };
+
+    it('should return a properly formatted request', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.method).to.equal('POST')
+      expect(bidRequests.bidderRequests).to.eql(bidRequest);
+    })
+
+    it('should return a properly formatted request with GDPR applies set to true', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.method).to.equal('POST')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
+      expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
+    })
+
+    it('should return a properly formatted request with GDPR applies set to false', function () {
+      bidderRequests.gdprConsent.gdprApplies = false;
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.method).to.equal('POST')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
+      expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
+    })
+    it('should return a properly formatted request with GDPR applies set to false with no consent_string param', function () {
+      let bidderRequests = {
+        'gdprConsent': {
+          'consentString': undefined,
+          'vendorData': {},
+          'gdprApplies': false
+        },
+        'refererInfo': {
+          'numIframes': 0,
+          'reachedTop': true,
+          'referer': 'https://example.com',
+          'stack': ['https://example.com']
+        }
+      };
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.method).to.equal('POST')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
+      expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
+    })
+    it('should return a properly formatted request with GDPR applies set to true with no consentString param', function () {
+      let bidderRequests = {
+        'gdprConsent': {
+          'consentString': undefined,
+          'vendorData': {},
+          'gdprApplies': true
+        },
+        'refererInfo': {
+          'numIframes': 0,
+          'reachedTop': true,
+          'referer': 'https://example.com',
+          'stack': ['https://example.com']
+        }
+      };
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
+      expect(bidRequests.method).to.equal('POST')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
+      expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
+    })
+    it('should return a properly formatted request with schain defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.schain).to.deep.equal(bidRequest[0].schain)
+    });
+    it('should return a properly formatted request with eids defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.eids).to.deep.equal(bidRequest[0].userIdAsEids)
+    });
+    it('should return a properly formatted request with geo defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.geo).to.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');
+    });
+    it('should attach bidFloor param when either bid param floorPrice or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let singleBidRequest, request, payload = null;
+
+      // 1 -> floorPrice not defined, getFloor not defined > empty
+      singleBidRequest = deepClone(bidRequest[0]);
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data;
+      expect(payload.bids[0].bidFloor).to.not.exist;
+
+      // 2 -> floorPrice is defined, getFloor not defined > floorPrice is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.params = {
+        'siteId': '1890909',
+        'floorPrice': 0.5
+      };
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(0.5);
+
+      // 3 -> floorPrice is defined, getFloor is defined > getFloor is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.params = {
+        'siteId': '1890909',
+        'floorPrice': 0.5
+      };
+      singleBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(3);
+
+      // 4 -> floorPrice not defined, getFloor is defined > getFloor is used
+      singleBidRequest = deepClone(bidRequest[0]);
+      singleBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([singleBidRequest], bidderRequests);
+      payload = request.data
+      expect(payload.bids[0].bidFloor).to.exist.and.to.equal(3);
+    });
+    describe('debug test', function () {
+      beforeEach(function () {
+        config.setConfig({ debug: true });
+      });
+      afterEach(function () {
+        config.setConfig({ debug: false });
+      });
+      it('should return a properly formatted request with pbjs_debug is true', function () {
+        const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+        expect(bidRequests.data.test).to.equal(1);
+      });
+    });
+  });
+
+  describe('.interpretResponse', function () {
+    const bidRequests = {
+      'method': 'POST',
+      'url': 'https://useast.quantumdex.io/auction/apacdex',
+      'withCredentials': true,
+      'data': {
+        'device': {
+          'ua': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36',
+          'height': 937,
+          'width': 1920,
+          'dnt': 0,
+          'language': 'vi'
+        },
+        'site': {
+          'id': '343',
+          'page': 'https://www.example.com/page',
+          'referrer': '',
+          'hostname': 'www.example.com'
+        }
+      },
+      'bidderRequests': [
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[160, 600], [120, 600]]
+            }
+          },
+          'adUnitCode': 'vi_3431035_1',
+          'transactionId': '994d8404-4a28-4c43-98d8-a38dbb061910',
+          'sizes': [[160, 600], [120, 600]],
+          'bidId': '3000aa31c41a29c21',
+          'bidderRequestId': '299926b3d3628cdd7',
+          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
+          'src': 'client',
+          'bidRequestsCount': 41,
+          'bidderRequestsCount': 41,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        },
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]]
+            }
+          },
+          'adUnitCode': 'vi_3431033_1',
+          'transactionId': '800fe87e-bfec-43a5-ace0-c4e2373ff4b5',
+          'sizes': [[300, 250], [250, 250], [200, 200], [180, 150]],
+          'bidId': '30024615be22ef66a',
+          'bidderRequestId': '299926b3d3628cdd7',
+          'auctionId': '22445943-a0aa-4c63-a413-4deb64fcff1c',
+          'src': 'client',
+          'bidRequestsCount': 41,
+          'bidderRequestsCount': 41,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        },
+        {
+          'bidder': 'apacdex',
+          'params': {
+            'siteId': '343'
+          },
+          'crumbs': {
+            'pubcid': 'c2b2ba08-9954-4850-8ee5-2bf4a2b35eff'
+          },
+          'mediaTypes': {
+            'video': {
+              'playerSize': [[640, 480]],
+              'context': 'instream',
+              'mimes': [
+                'video/mp4',
+                'video/x-flv',
+                'video/x-ms-wmv',
+                'application/vnd.apple.mpegurl',
+                'application/x-mpegurl',
+                'video/3gpp',
+                'video/mpeg',
+                'video/ogg',
+                'video/quicktime',
+                'video/webm',
+                'video/x-m4v',
+                'video/ms-asf',
+                'video/x-msvideo'
+              ],
+              'protocols': [1, 2, 3, 4, 5, 6],
+              'playbackmethod': [6],
+              'maxduration': 120,
+              'linearity': 1,
+              'api': [2]
+            }
+          },
+          'adUnitCode': 'vi_3431909',
+          'transactionId': '33d83d87-43cc-499b-aabe-5c22eb6acfbb',
+          'sizes': [[640, 480]],
+          'bidId': '1854b40107d6745c',
+          'bidderRequestId': '1840763b6bda185d',
+          'auctionId': 'df495de0-5d42-471f-a501-73bcd7254b80',
+          'src': 'client',
+          'bidRequestsCount': 1,
+          'bidderRequestsCount': 1,
+          'bidderWinsCount': 0,
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'freegames66.com',
+                'sid': '343',
+                'hp': 1
+              }
+            ]
+          }
+        }
+      ]
+    };
+
+    let serverResponse = {
+      'body': {
+        'bids': [
+          {
+            'requestId': '3000aa31c41a29c21',
+            'cpm': 1.07,
+            'width': 160,
+            'height': 600,
+            'ad': `
Apacdex AD
`,
+            'ttl': 500,
+            'creativeId': '1234abcd',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'banner',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          },
+          {
+            'requestId': '30024615be22ef66a',
+            'cpm': 1,
+            'width': 300,
+            'height': 250,
+            'ad': `
Apacdex AD
`,
+            'ttl': 500,
+            'creativeId': '1234abcd',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'banner',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          },
+          {
+            'requestId': '1854b40107d6745c',
+            'cpm': 1.25,
+            'width': 300,
+            'height': 250,
+            'vastXml': 'apacdex',
+            'ttl': 500,
+            'creativeId': '30292e432662bd5f86d90774b944b038',
+            'netRevenue': true,
+            'currency': 'USD',
+            'dealId': 'apacdex',
+            'mediaType': 'video',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
+          }
+        ],
+        'pixel': [{
+          'url': 'https://example.com/pixel.png',
+          'type': 'image'
+        }]
+      }
+    };
+
+    let prebidResponse = [
+      {
+        'requestId': '3000aa31c41a29c21',
+        'cpm': 1.07,
+        'width': 160,
+        'height': 600,
+        'ad': `
Apacdex AD
`,
+        'ttl': 500,
+        'creativeId': '1234abcd',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'banner'
+      },
+      {
+        'requestId': '30024615be22ef66a',
+        'cpm': 1,
+        'width': 300,
+        'height': 250,
+        'ad': `
Apacdex AD
`,
+        'ttl': 500,
+        'creativeId': '1234abcd',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'banner'
+      },
+      {
+        'requestId': '1854b40107d6745c',
+        'cpm': 1.25,
+        'width': 300,
+        'height': 250,
+        'vastXml': 'apacdex',
+        'ttl': 500,
+        'creativeId': '30292e432662bd5f86d90774b944b038',
+        'netRevenue': true,
+        'currency': 'USD',
+        'dealId': 'apacdex',
+        'mediaType': 'video'
+      }
+    ];
+
+    it('should map bidResponse to prebidResponse', function () {
+      const response = spec.interpretResponse(serverResponse, bidRequests);
+      response.forEach((resp, i) => {
+        expect(resp.requestId).to.equal(prebidResponse[i].requestId);
+        expect(resp.cpm).to.equal(prebidResponse[i].cpm);
+        expect(resp.width).to.equal(prebidResponse[i].width);
+        expect(resp.height).to.equal(prebidResponse[i].height);
+        expect(resp.ttl).to.equal(prebidResponse[i].ttl);
+        expect(resp.creativeId).to.equal(prebidResponse[i].creativeId);
+        expect(resp.netRevenue).to.equal(prebidResponse[i].netRevenue);
+        expect(resp.currency).to.equal(prebidResponse[i].currency);
+        expect(resp.dealId).to.equal(prebidResponse[i].dealId);
+        if (resp.mediaType === 'video') {
+          expect(resp.vastXml.indexOf('apacdex')).to.be.greaterThan(0);
+        }
+        if (resp.mediaType === 'banner') {
+          expect(resp.ad.indexOf('Apacdex AD')).to.be.greaterThan(0);
+        }
+        expect(resp.meta.advertiserDomains).to.deep.equal(['https://example.com']);
+      });
+    });
+  });
+
+  describe('.getUserSyncs', function () {
+    let bidResponse = [{
+      'body': {
+        'pixel': [{
+          'url': 'https://pixel-test',
+          'type': 'image'
+        }]
+      }
+    }];
+
+    it('should return one sync pixel', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.deep.equal([{
+        type: 'image',
+        url: 'https://pixel-test'
+      }]);
+    });
+    it('should return an empty array when sync is enabled but there are no bidResponses', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
+    });
+
+    it('should return an empty array when sync is enabled but no sync pixel returned', function () {
+      const pixel = Object.assign({}, bidResponse);
+      delete pixel[0].body.pixel;
+      expect(spec.getUserSyncs({ pixelEnabled: true }, bidResponse)).to.have.length(0);
+    });
+
+    it('should return an empty array', function () {
+      expect(spec.getUserSyncs({ pixelEnabled: false }, bidResponse)).to.have.length(0);
+      expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
+    });
+  });
+
+  describe('validateGeoObject', function () {
+    it('should return true if the geo object is valid', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(true);
+    });
+
+    it('should return false if the geo object is not plain object', () => {
+      let geoObject = [{
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      }];
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lat attribute', () => {
+      let geoObject = {
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lon attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing accuracy attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+  });
+
+  describe('getDomain', function () {
+    it('should return valid domain from publisherDomain config', () => {
+      let pageUrl = 'https://www.example.com/page/prebid/exam.html';
+      config.setConfig({ publisherDomain: pageUrl });
+      expect(getDomain(pageUrl)).to.equal('example.com');
+    });
+    it('should return valid domain from pageUrl argument', () => {
+      let pageUrl = 'https://www.example.com/page/prebid/exam.html';
+      config.setConfig({ publisherDomain: '' });
+      expect(getDomain(pageUrl)).to.equal('example.com');
+    });
+    it('should return undefined if pageUrl and publisherDomain not config', () => {
+      let pageUrl;
+      config.setConfig({ publisherDomain: '' });
+      expect(getDomain(pageUrl)).to.equal(pageUrl);
+    });
+  });
+});
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 7e985045c45..fa2baf0db5f 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -265,6 +265,7 @@ describe('AppNexusAdapter', function () {
             placementId: '10433394',
             user: {
               externalUid: '123',
+              segments: [123, { id: 987, value: 876 }],
               foobar: 'invalid'
             }
           }
@@ -277,9 +278,40 @@ describe('AppNexusAdapter', function () {
       expect(payload.user).to.exist;
       expect(payload.user).to.deep.equal({
         external_uid: '123',
+        segments: [{id: 123}, {id: 987, value: 876}]
       });
     });
 
+    it('should attach reserve param when either bid param or getFloor function exists', function () {
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      let request, payload = null;
+      let bidRequest = deepClone(bidRequests[0]);
+
+      // 1 -> reserve not defined, getFloor not defined > empty
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.not.exist;
+
+      // 2 -> reserve is defined, getFloor not defined > reserve is used
+      bidRequest.params = {
+        'placementId': '10433394',
+        'reserve': 0.5
+      };
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(0.5);
+
+      // 3 -> reserve is defined, getFloor is defined > getFloor is used
+      bidRequest.getFloor = () => getFloorResponse;
+
+      request = spec.buildRequests([bidRequest]);
+      payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].reserve).to.exist.and.to.equal(3);
+    });
+
     it('should duplicate adpod placements into batches and set correct maxduration', function() {
       let bidRequest = Object.assign({},
         bidRequests[0],
@@ -627,6 +659,17 @@ describe('AppNexusAdapter', function () {
       expect(payload.tags[0].use_pmt_rule).to.equal(true);
     });
 
+    it('should add gpid to the request', function () {
+      let testGpid = '/12345/my-gpt-tag-0';
+      let bidRequest = deepClone(bidRequests[0]);
+      bidRequest.ortb2Imp = { ext: { data: { pbadslot: testGpid } } };
+
+      const request = spec.buildRequests([bidRequest]);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.tags[0].gpid).to.exist.and.equal(testGpid)
+    });
+
     it('should add gdpr consent information to the request', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let bidderRequest = {
@@ -636,18 +679,20 @@ describe('AppNexusAdapter', function () {
         'timeout': 3000,
         'gdprConsent': {
           consentString: consentString,
-          gdprApplies: true
+          gdprApplies: true,
+          addtlConsent: '1~7.12.35.62.66.70.89.93.108'
         }
       };
       bidderRequest.bids = bidRequests;
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.options).to.be.empty;
+      expect(request.options).to.deep.equal({withCredentials: true});
       const payload = JSON.parse(request.data);
 
       expect(payload.gdpr_consent).to.exist;
       expect(payload.gdpr_consent.consent_string).to.exist.and.to.equal(consentString);
       expect(payload.gdpr_consent.consent_required).to.exist.and.to.be.true;
+      expect(payload.gdpr_consent.addtl_consent).to.exist.and.to.deep.equal([7, 12, 35, 62, 66, 70, 89, 93, 108]);
     });
 
     it('should add us privacy string to payload', function() {
@@ -782,7 +827,25 @@ describe('AppNexusAdapter', function () {
       config.getConfig.restore();
     });
 
-    it('should set withCredentials to false if purpose 1 consent is not given', function () {
+    it('should set the X-Is-Test customHeader if test flag is enabled', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      sinon.stub(config, 'getConfig')
+        .withArgs('apn_test')
+        .returns(true);
+
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.customHeaders).to.deep.equal({'X-Is-Test': 1});
+
+      config.getConfig.restore();
+    });
+
+    it('should always set withCredentials: true on the request.options', function () {
+      let bidRequest = Object.assign({}, bidRequests[0]);
+      const request = spec.buildRequests([bidRequest]);
+      expect(request.options.withCredentials).to.equal(true);
+    });
+
+    it('should set simple domain variant if purpose 1 consent is not given', function () {
       let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
       let bidderRequest = {
         'bidderCode': 'appnexus',
@@ -805,14 +868,21 @@ describe('AppNexusAdapter', function () {
       bidderRequest.bids = bidRequests;
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.options).to.deep.equal({withCredentials: false});
+      expect(request.url).to.equal('https://ib.adnxs-simple.com/ut/v3/prebid');
     });
 
-    it('should populate eids array when ttd id and criteo is available', function () {
+    it('should populate eids when supported userIds are available', function () {
       const bidRequest = Object.assign({}, bidRequests[0], {
         userId: {
           tdid: 'sample-userid',
-          criteoId: 'sample-criteo-userid'
+          uid2: { id: 'sample-uid2-value' },
+          criteoId: 'sample-criteo-userid',
+          netId: 'sample-netId-userid',
+          idl_env: 'sample-idl-userid',
+          flocId: {
+            id: 'sample-flocid-value',
+            version: 'chrome.1.0'
+          }
         }
       });
 
@@ -828,6 +898,73 @@ describe('AppNexusAdapter', function () {
         source: 'criteo.com',
         id: 'sample-criteo-userid',
       });
+
+      expect(payload.eids).to.deep.include({
+        source: 'chrome.com',
+        id: 'sample-flocid-value'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'netid.de',
+        id: 'sample-netId-userid',
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'liveramp.com',
+        id: 'sample-idl-userid'
+      });
+
+      expect(payload.eids).to.deep.include({
+        source: 'uidapi.com',
+        id: 'sample-uid2-value',
+        rti_partner: 'UID2'
+      });
+    });
+
+    it('should populate iab_support object at the root level if omid support is detected', function () {
+      // with bid.params.frameworks
+      let bidRequest_A = Object.assign({}, bidRequests[0], {
+        params: {
+          frameworks: [1, 2, 5, 6],
+          video: {
+            frameworks: [1, 2, 5, 6]
+          }
+        }
+      });
+      let request = spec.buildRequests([bidRequest_A]);
+      let payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.be.an('object');
+      expect(payload.iab_support).to.deep.equal({
+        omidpn: 'Appnexus',
+        omidpv: '$prebid.version$'
+      });
+      expect(payload.tags[0].banner_frameworks).to.be.an('array');
+      expect(payload.tags[0].banner_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video_frameworks).to.be.an('array');
+      expect(payload.tags[0].video_frameworks).to.deep.equal([1, 2, 5, 6]);
+      expect(payload.tags[0].video.frameworks).to.not.exist;
+
+      // without bid.params.frameworks
+      const bidRequest_B = Object.assign({}, bidRequests[0]);
+      request = spec.buildRequests([bidRequest_B]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
+
+      // with video.frameworks but it is not an array
+      const bidRequest_C = Object.assign({}, bidRequests[0], {
+        params: {
+          video: {
+            frameworks: "'1', '2', '3', '6'"
+          }
+        }
+      });
+      request = spec.buildRequests([bidRequest_C]);
+      payload = JSON.parse(request.data);
+      expect(payload.iab_support).to.not.exist;
+      expect(payload.tags[0].banner_frameworks).to.not.exist;
+      expect(payload.tags[0].video_frameworks).to.not.exist;
     });
   })
 
@@ -1161,6 +1298,21 @@ describe('AppNexusAdapter', function () {
       }
       let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
       expect(Object.keys(result[0].meta)).to.include.members(['advertiserId']);
-    })
+    });
+
+    it('should add advertiserDomains', function() {
+      let responseAdvertiserId = deepClone(response);
+      responseAdvertiserId.tags[0].ads[0].adomain = ['123'];
+
+      let bidderRequest = {
+        bids: [{
+          bidId: '3db3773286ee59',
+          adUnitCode: 'code'
+        }]
+      }
+      let result = spec.interpretResponse({ body: responseAdvertiserId }, {bidderRequest});
+      expect(Object.keys(result[0].meta)).to.include.members(['advertiserDomains']);
+      expect(Object.keys(result[0].meta.advertiserDomains)).to.deep.equal([]);
+    });
   });
 });
diff --git a/test/spec/modules/apstreamBidAdapter_spec.js b/test/spec/modules/apstreamBidAdapter_spec.js
new file mode 100644
index 00000000000..e640c009989
--- /dev/null
+++ b/test/spec/modules/apstreamBidAdapter_spec.js
@@ -0,0 +1,346 @@
+// jshint esversion: 6, es3: false, node: true
+import {assert, expect} from 'chai';
+import {config} from 'src/config.js';
+import {spec} from 'modules/apstreamBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const validBidRequests = [{
+  bidId: 'bidId',
+  adUnitCode: '/id/site1/header-ad',
+  sizes: [[980, 120], [980, 180]],
+  mediaTypes: {
+    banner: {
+      sizes: [[980, 120], [980, 180]]
+    }
+  },
+  params: {
+    publisherId: '1234'
+  }
+}];
+
+describe('AP Stream adapter', function() {
+  describe('isBidRequestValid', function() {
+    const bid = {
+      bidder: 'apstream',
+      mediaTypes: {
+        banner: {
+          sizes: [300, 250]
+        }
+      },
+      params: {
+      }
+    };
+
+    let mockConfig;
+    beforeEach(function () {
+      mockConfig = {
+        apstream: {
+          publisherId: '4321'
+        }
+      };
+      sinon.stub(config, 'getConfig').callsFake((key) => {
+        return utils.deepAccess(mockConfig, key);
+      });
+    });
+
+    afterEach(function () {
+      config.getConfig.restore();
+    });
+
+    it('should return true when publisherId is configured and one media type', function() {
+      bid.params.publisherId = '1234';
+      assert(spec.isBidRequestValid(bid))
+    });
+
+    it('should return false when publisherId is configured and two media types', function() {
+      bid.mediaTypes.video = {sizes: [300, 250]};
+      assert.isFalse(spec.isBidRequestValid(bid))
+    });
+
+    it('should return true when publisherId is configured via config', function() {
+      delete bid.mediaTypes.video;
+      delete bid.params.publisherId;
+      assert.isTrue(spec.isBidRequestValid(bid))
+    });
+  });
+
+  describe('buildRequests', function() {
+    it('should send request with correct structure', function() {
+      const request = spec.buildRequests(validBidRequests, { })[0];
+
+      assert.equal(request.method, 'GET');
+      assert.deepEqual(request.options, {withCredentials: false});
+      assert.ok(request.data);
+    });
+
+    it('should send request with different endpoints', function() {
+      const validTwoBidRequests = [
+        ...validBidRequests,
+        ...[{
+          bidId: 'bidId2',
+          adUnitCode: '/id/site1/header-ad',
+          sizes: [[980, 980], [980, 900]],
+          mediaTypes: {
+            banner: {
+              sizes: [[980, 980], [980, 900]]
+            }
+          },
+          params: {
+            publisherId: '1234',
+            endpoint: 'site2.com'
+          }
+        }]
+      ];
+
+      const request = spec.buildRequests(validTwoBidRequests, {});
+      assert.isArray(request);
+      assert.lengthOf(request, 2);
+      assert.equal(request[1].data.bids, 'bidId2:t=b,s=980x980_980x900,c=/id/site1/header-ad');
+    });
+
+    it('should send request with adUnit code', function() {
+      const adunitCodeValidBidRequests = [
+        {
+          ...validBidRequests[0],
+          ...{
+            params: {
+              code: 'Site1_Leaderboard'
+            }
+          }
+        }
+      ];
+
+      const request = spec.buildRequests(adunitCodeValidBidRequests, { })[0];
+      assert.equal(request.data.bids, 'bidId:t=b,s=980x120_980x180,c=Site1_Leaderboard');
+    });
+
+    it('should send request with adUnit id', function() {
+      const adunitIdValidBidRequests = [
+        {
+          ...validBidRequests[0],
+          ...{
+            params: {
+              adunitId: '12345'
+            }
+          }
+        }
+      ];
+
+      const request = spec.buildRequests(adunitIdValidBidRequests, { })[0];
+      assert.equal(request.data.bids, 'bidId:t=b,s=980x120_980x180,u=12345');
+    });
+
+    it('should send request with different media type', function() {
+      const types = {
+        'audio': 'a',
+        'banner': 'b',
+        'native': 'n',
+        'video': 'v'
+      }
+      Object.keys(types).forEach(key => {
+        const adunitIdValidBidRequests = [
+          {
+            ...validBidRequests[0],
+            ...{
+              mediaTypes: {
+                [key]: {
+                  sizes: [300, 250]
+                }
+              }
+            }
+          }
+        ];
+
+        const request = spec.buildRequests(adunitIdValidBidRequests, { })[0];
+        assert.equal(request.data.bids, `bidId:t=${types[key]},s=980x120_980x180,c=/id/site1/header-ad`);
+      })
+    });
+
+    describe('gdpr', function() {
+      let mockConfig;
+
+      beforeEach(function () {
+        mockConfig = {
+          consentManagement: {
+            cmpApi: 'iab'
+          }
+        };
+        sinon.stub(config, 'getConfig').callsFake((key) => {
+          return utils.deepAccess(mockConfig, key);
+        });
+      });
+
+      afterEach(function () {
+        config.getConfig.restore();
+      });
+
+      it('should send GDPR Consent data', function() {
+        const bidderRequest = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentDataString',
+            vendorData: {
+              vendorConsents: {
+                '394': true
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        assert.equal(request.iab_consent, bidderRequest.gdprConsent.consentString);
+      });
+    });
+
+    describe('dsu', function() {
+      it('should pass DSU from local storage if set', function() {
+        let dsu = 'some_dsu';
+        localStorage.setItem('apr_dsu', dsu);
+
+        const bidderRequest = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentDataString',
+            vendorData: {
+              vendorConsents: {
+                '394': true
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+
+        assert.equal(request.dsu, dsu);
+      });
+
+      it('should generate new DSU if nothing in local storage', function() {
+        localStorage.removeItem('apr_dsu');
+
+        const bidderRequest = {
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentDataString',
+            vendorData: {
+              vendorConsents: {
+                '394': true
+              }
+            }
+          }
+        };
+
+        const request = spec.buildRequests(validBidRequests, bidderRequest)[0].data;
+        let dsu = localStorage.getItem('apr_dsu');
+
+        assert.isNotEmpty(dsu);
+        assert.equal(request.dsu, dsu);
+      });
+    });
+  });
+
+  describe('dsu config', function() {
+    let mockConfig;
+    beforeEach(function () {
+      mockConfig = {
+        apstream: {
+          noDsu: true
+        }
+      };
+      sinon.stub(config, 'getConfig').callsFake((key) => {
+        return utils.deepAccess(mockConfig, key);
+      });
+    });
+
+    afterEach(function () {
+      config.getConfig.restore();
+    });
+
+    it('should not send DSU if it is disabled in config', function() {
+      const request = spec.buildRequests(validBidRequests, { })[0];
+
+      assert.equal(request.data.dsu, '');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should return empty array if no body in response', function () {
+      const serverResponse = {};
+      const bidRequest = {};
+
+      assert.isEmpty(spec.interpretResponse(serverResponse, bidRequest));
+    });
+
+    it('should map server response', function () {
+      const serverResponse = {
+        body: [
+          {
+            bidId: 123,
+            bidDetails: {
+              cpm: 1.23,
+              width: 980,
+              height: 300,
+              currency: 'DKK',
+              netRevenue: 'true',
+              creativeId: '1234',
+              dealId: '99008',
+              ad: '
Buy our something!
',
+              ttl: 360
+            }
+          }
+        ]
+      };
+      const bidRequest = {};
+
+      const response = spec.interpretResponse(serverResponse, bidRequest);
+
+      const expected = {
+        requestId: 123,
+        cpm: 1.23,
+        width: 980,
+        height: 300,
+        currency: 'DKK',
+        creativeId: '1234',
+        netRevenue: 'true',
+        dealId: '99008',
+        ad: '
Buy our something!
',
+        ttl: 360
+      };
+
+      assert.deepEqual(response[0], expected);
+    });
+
+    it('should add pixels to ad', function () {
+      const serverResponse = {
+        body: [
+          {
+            bidId: 123,
+            bidDetails: {
+              cpm: 1.23,
+              width: 980,
+              height: 300,
+              currency: 'DKK',
+              creativeId: '1234',
+              netRevenue: 'true',
+              dealId: '99008',
+              ad: '
Buy our something!
',
+              ttl: 360,
+              noticeUrls: [
+                'site1',
+                'site2'
+              ],
+              impressionScripts: [
+                'url_to_script'
+              ]
+            }
+          }
+        ]
+      };
+      const bidRequest = {};
+
+      const response = spec.interpretResponse(serverResponse, bidRequest);
+
+      assert.match(response[0].ad, /site1/);
+      assert.match(response[0].ad, /site2/);
+    });
+  });
+});
diff --git a/test/spec/modules/astraoneBidAdapter_spec.js b/test/spec/modules/astraoneBidAdapter_spec.js
index e422f64b570..0e545081869 100644
--- a/test/spec/modules/astraoneBidAdapter_spec.js
+++ b/test/spec/modules/astraoneBidAdapter_spec.js
@@ -14,7 +14,7 @@ function getSlotConfigs(mediaTypes, params) {
 
 describe('AstraOne Adapter', function() {
   describe('isBidRequestValid method', function() {
-    const PLACE_ID = '5af45ad34d506ee7acad0c26';
+    const PLACE_ID = '5f477bf94d506ebe2c4240f3';
     const IMAGE_URL = 'https://creative.astraone.io/files/default_image-1-600x400.jpg';
 
     describe('returns true', function() {
@@ -176,21 +176,23 @@ describe('AstraOne Adapter', function() {
       describe('the bid is a banner', function() {
         it('should return a banner bid', function() {
           const serverResponse = {
-            body: [
-              {
-                bidId: '2df8c0733f284e',
-                price: 0.5,
-                currency: 'USD',
-                content: {
-                  content: 'html',
-                  actionUrls: {},
-                  seanceId: '123123'
-                },
-                width: 100,
-                height: 100,
-                ttl: 360
-              }
-            ]
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    actionUrls: {},
+                    seanceId: '123123'
+                  },
+                  width: 100,
+                  height: 100,
+                  ttl: 360
+                }
+              ]
+            }
           }
           const bids = spec.interpretResponse(serverResponse)
           expect(bids.length).to.equal(1)
diff --git a/test/spec/modules/atsAnalyticsAdapter_spec.js b/test/spec/modules/atsAnalyticsAdapter_spec.js
index 3dd6f261c11..85a7b16aee4 100644
--- a/test/spec/modules/atsAnalyticsAdapter_spec.js
+++ b/test/spec/modules/atsAnalyticsAdapter_spec.js
@@ -2,27 +2,38 @@ import atsAnalyticsAdapter from '../../../modules/atsAnalyticsAdapter.js';
 import { expect } from 'chai';
 import adapterManager from 'src/adapterManager.js';
 import {server} from '../../mocks/xhr.js';
-import {browserIsChrome, browserIsEdge, browserIsFirefox, browserIsSafari} from '../../../modules/atsAnalyticsAdapter.js';
+import {parseBrowser} from '../../../modules/atsAnalyticsAdapter.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+import {analyticsUrl} from '../../../modules/atsAnalyticsAdapter.js';
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
+export const storage = getStorageManager();
+
 describe('ats analytics adapter', function () {
   beforeEach(function () {
     sinon.stub(events, 'getEvents').returns([]);
+    storage.setCookie('_lr_env_src_ats', 'true', 'Thu, 01 Jan 1970 00:00:01 GMT');
   });
 
   afterEach(function () {
     events.getEvents.restore();
+    atsAnalyticsAdapter.getUserAgent.restore();
     atsAnalyticsAdapter.disableAnalytics();
   });
 
   describe('track', function () {
     it('builds and sends request and response data', function () {
-      sinon.spy(atsAnalyticsAdapter, 'track');
+      sinon.stub(atsAnalyticsAdapter, 'shouldFireRequest').returns(true);
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      let now = new Date();
+      now.setTime(now.getTime() + 3600000);
+      storage.setCookie('_lr_env_src_ats', 'true', now.toUTCString());
+      storage.setCookie('_lr_sampling_rate', '10', now.toUTCString());
 
       let initOptions = {
-        pid: '10433394',
-        host: 'https://example.com/dev',
+        pid: '10433394'
       };
       let auctionTimestamp = 1496510254326;
 
@@ -74,13 +85,15 @@ describe('ats analytics adapter', function () {
       let expectedAfterBid = {
         'Data': [{
           'has_envelope': true,
+          'adapter_version': 1,
           'bidder': 'appnexus',
           'bid_id': '30c77d079cdf17',
           'auction_id': 'a5b849e5-87d7-4205-8300-d063084fcfb7',
-          'user_browser': (browserIsFirefox() || browserIsEdge() || browserIsChrome() || browserIsSafari()),
+          'user_browser': parseBrowser(),
           'user_platform': navigator.platform,
           'auction_start': '2020-02-03T14:14:25.161Z',
           'domain': window.location.hostname,
+          'envelope_source': true,
           'pid': '10433394',
           'response_time_stamp': '2020-02-03T14:23:11.978Z',
           'currency': 'USD',
@@ -132,19 +145,36 @@ describe('ats analytics adapter', function () {
       events.emit(constants.EVENTS.AUCTION_END, {});
 
       let requests = server.requests.filter(req => {
-        return req.url.indexOf(initOptions.host) > -1;
+        return req.url.indexOf(analyticsUrl) > -1;
       });
-
       expect(requests.length).to.equal(1);
 
       let realAfterBid = JSON.parse(requests[0].requestBody);
-
       // Step 6: assert real data after bid and expected data
       expect(realAfterBid['Data']).to.deep.equal(expectedAfterBid['Data']);
 
-      // check that the host and publisher ID is configured via options
-      expect(atsAnalyticsAdapter.context.host).to.equal(initOptions.host);
+      // check that the publisher ID is configured via options
       expect(atsAnalyticsAdapter.context.pid).to.equal(initOptions.pid);
     })
+    it('check browser is safari', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_5) AppleWebKit/536.25 (KHTML, like Gecko) Version/6.0 Safari/536.25');
+      let browser = parseBrowser();
+      expect(browser).to.equal('Safari');
+    })
+    it('check browser is chrome', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU iPhone OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/80.0.3987.95 Mobile/15E148 Safari/604.1');
+      let browser = parseBrowser();
+      expect(browser).to.equal('Chrome');
+    })
+    it('check browser is edge', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.74 Safari/537.36 Edg/79.0.309.43');
+      let browser = parseBrowser();
+      expect(browser).to.equal('Microsoft Edge');
+    })
+    it('check browser is firefox', function () {
+      sinon.stub(atsAnalyticsAdapter, 'getUserAgent').returns('Mozilla/5.0 (iPhone; CPU OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/23.0  Mobile/15E148 Safari/605.1.15');
+      let browser = parseBrowser();
+      expect(browser).to.equal('Firefox');
+    })
   })
 })
diff --git a/test/spec/modules/audienceNetworkBidAdapter_spec.js b/test/spec/modules/audienceNetworkBidAdapter_spec.js
deleted file mode 100644
index 5d3a8527953..00000000000
--- a/test/spec/modules/audienceNetworkBidAdapter_spec.js
+++ /dev/null
@@ -1,568 +0,0 @@
-/**
- * @file Tests for AudienceNetwork adapter.
- */
-import { expect } from 'chai';
-
-import { spec } from 'modules/audienceNetworkBidAdapter.js';
-import * as utils from 'src/utils.js';
-
-const {
-  code,
-  supportedMediaTypes,
-  isBidRequestValid,
-  buildRequests,
-  interpretResponse
-} = spec;
-
-const bidder = 'audienceNetwork';
-const placementId = 'test-placement-id';
-const playerwidth = 320;
-const playerheight = 180;
-const requestId = 'test-request-id';
-const debug = 'adapterver=1.3.0&platform=2078522619030089&platver=$prebid.version$&cb=test-uuid';
-const expectedPageUrl = encodeURIComponent('http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true');
-const mockBidderRequest = {
-  bidderCode: 'audienceNetwork',
-  auctionId: '720146a0-8f32-4db0-bb30-21f1d057efb4',
-  bidderRequestId: '1312d48561657e',
-  auctionStart: 1579711852920,
-  timeout: 3000,
-  refererInfo: {
-    referer: 'http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true',
-    reachedTop: true,
-    numIframes: 0,
-    stack: ['http://www.prebid-test.com/audienceNetworkTest.html?pbjs_debug=true'],
-    canonicalUrl: undefined
-  },
-  start: 1579711852925
-};
-
-describe('AudienceNetwork adapter', function () {
-  describe('Public API', function () {
-    it('code', function () {
-      expect(code).to.equal(bidder);
-    });
-    it('supportedMediaTypes', function () {
-      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
-    });
-    it('isBidRequestValid', function () {
-      expect(isBidRequestValid).to.be.a('function');
-    });
-    it('buildRequests', function () {
-      expect(buildRequests).to.be.a('function');
-    });
-    it('interpretResponse', function () {
-      expect(interpretResponse).to.be.a('function');
-    });
-  });
-
-  describe('isBidRequestValid', function () {
-    it('missing placementId parameter', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250]]
-      })).to.equal(false);
-    });
-
-    it('invalid sizes parameter', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: ['', undefined, null, '300x100', [300, 100], [300], {}],
-        params: { placementId }
-      })).to.equal(false);
-    });
-
-    it('valid when at least one valid size', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[1, 1], [300, 250]],
-        params: { placementId }
-      })).to.equal(true);
-    });
-
-    it('valid parameters', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250], [320, 50]],
-        params: { placementId }
-      })).to.equal(true);
-    });
-
-    it('fullwidth', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250], [336, 280]],
-        params: {
-          placementId,
-          format: 'fullwidth'
-        }
-      })).to.equal(true);
-    });
-
-    it('native', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[300, 250]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      })).to.equal(true);
-    });
-
-    it('native with non-IAB size', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[728, 90]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      })).to.equal(true);
-    });
-
-    it('video', function () {
-      expect(isBidRequestValid({
-        bidder,
-        sizes: [[playerwidth, playerheight]],
-        params: {
-          placementId,
-          format: 'video'
-        }
-      })).to.equal(true);
-    });
-  });
-
-  describe('buildRequests', function () {
-    before(function () {
-      sinon
-        .stub(utils, 'generateUUID')
-        .returns('test-uuid');
-    });
-
-    after(function () {
-      utils.generateUUID.restore();
-    });
-
-    it('takes the canonicalUrl as priority over referer for pageurl', function () {
-      let expectedCanonicalUrl = encodeURIComponent('http://www.this-is-canonical-url.com/hello-world.html?pbjs_debug=true');
-      mockBidderRequest.refererInfo.canonicalUrl = 'http://www.this-is-canonical-url.com/hello-world.html?pbjs_debug=true';
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 50], [300, 250], [320, 50]],
-        params: { placementId }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedCanonicalUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedCanonicalUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-      mockBidderRequest.refererInfo.canonicalUrl = undefined;
-    });
-
-    it('can build URL for IAB unit', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 50], [300, 250], [320, 50]],
-        params: { placementId }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-    });
-
-    it('can build URL for video unit', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[640, 480]],
-        params: {
-          placementId,
-          format: 'video'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['video'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['640x480'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=video&testmode=false&pageurl=${expectedPageUrl}&sdk[]=&${debug}&playerwidth=640&playerheight=480`
-      }]);
-    });
-
-    it('can build URL for native unit in non-IAB size', function () {
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[728, 90]],
-        params: {
-          placementId,
-          format: 'native'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['native'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['728x90'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=native&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debug}`
-      }]);
-    });
-
-    it('can build URL for deprecated fullwidth unit, overriding platform', function () {
-      const platform = 'test-platform';
-      const debugPlatform = debug.replace('2078522619030089', platform);
-
-      expect(buildRequests([{
-        bidder,
-        bidId: requestId,
-        sizes: [[300, 250]],
-        params: {
-          placementId,
-          platform,
-          format: 'fullwidth'
-        }
-      }], mockBidderRequest)).to.deep.equal([{
-        adformats: ['300x250'],
-        method: 'GET',
-        pageurl: expectedPageUrl,
-        requestIds: [requestId],
-        sizes: ['300x250'],
-        url: 'https://an.facebook.com/v2/placementbid.json',
-        data: `placementids[]=test-placement-id&adformats[]=300x250&testmode=false&pageurl=${expectedPageUrl}&sdk[]=6.0.web&${debugPlatform}`
-      }]);
-    });
-  });
-
-  describe('interpretResponse', function () {
-    it('error in response', function () {
-      expect(interpretResponse({
-        body: {
-          errors: ['test-error-message']
-        }
-      }, {})).to.deep.equal([]);
-    });
-
-    it('valid native bid in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.to.contain('getElementsByTagName("style")', 'ad missing native styles')
-        .and.to.contain('
', 'ad missing native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('native');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('valid IAB bid in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['300x250'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: '300x250',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.not.to.contain('getElementsByTagName("style")', 'ad should not contain native styles')
-        .and.not.to.contain('
', 'ad should not contain native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('300x250');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('filters invalid slot sizes', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['300x250'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('300x250');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-
-    it('valid multiple bids in response', function () {
-      const placementIdNative = 'test-placement-id-native';
-      const placementIdIab = 'test-placement-id-iab';
-
-      const [bidResponseNative, bidResponseIab] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementIdNative]: [{
-              placement_id: placementIdNative,
-              bid_id: 'test-bid-id-native',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }],
-            [placementIdIab]: [{
-              placement_id: placementIdIab,
-              bid_id: 'test-bid-id-iab',
-              bid_price_cents: 456,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native', '300x250'],
-        requestIds: [requestId, requestId],
-        sizes: ['300x250', [300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponseNative.cpm).to.equal(1.23);
-      expect(bidResponseNative.requestId).to.equal(requestId);
-      expect(bidResponseNative.width).to.equal(300);
-      expect(bidResponseNative.height).to.equal(250);
-      expect(bidResponseNative.ad)
-        .to.contain(`placementid: '${placementIdNative}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id-native',`);
-      expect(bidResponseNative.ttl).to.equal(600);
-      expect(bidResponseNative.creativeId).to.equal(placementIdNative);
-      expect(bidResponseNative.netRevenue).to.equal(true);
-      expect(bidResponseNative.currency).to.equal('USD');
-      expect(bidResponseNative.hb_bidder).to.equal('fan');
-      expect(bidResponseNative.fb_bidid).to.equal('test-bid-id-native');
-      expect(bidResponseNative.fb_format).to.equal('native');
-      expect(bidResponseNative.fb_placementid).to.equal(placementIdNative);
-
-      expect(bidResponseIab.cpm).to.equal(4.56);
-      expect(bidResponseIab.requestId).to.equal(requestId);
-      expect(bidResponseIab.width).to.equal(300);
-      expect(bidResponseIab.height).to.equal(250);
-      expect(bidResponseIab.ad)
-        .to.contain(`placementid: '${placementIdIab}',`)
-        .and.to.contain(`format: '300x250',`)
-        .and.to.contain(`bidid: 'test-bid-id-iab',`);
-      expect(bidResponseIab.ttl).to.equal(600);
-      expect(bidResponseIab.creativeId).to.equal(placementIdIab);
-      expect(bidResponseIab.netRevenue).to.equal(true);
-      expect(bidResponseIab.currency).to.equal('USD');
-      expect(bidResponseIab.hb_bidder).to.equal('fan');
-      expect(bidResponseIab.fb_bidid).to.equal('test-bid-id-iab');
-      expect(bidResponseIab.fb_format).to.equal('300x250');
-      expect(bidResponseIab.fb_placementid).to.equal(placementIdIab);
-    });
-
-    it('valid video bid in response', function () {
-      const bidId = 'test-bid-id-video';
-
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: bidId,
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['video'],
-        requestIds: [requestId],
-        sizes: [[playerwidth, playerheight]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.ttl).to.equal(3600);
-      expect(bidResponse.mediaType).to.equal('video');
-      expect(bidResponse.vastUrl).to.equal(`https://an.facebook.com/v1/instream/vast.xml?placementid=${placementId}&pageurl=${expectedPageUrl}&playerwidth=${playerwidth}&playerheight=${playerheight}&bidid=${bidId}`);
-      expect(bidResponse.width).to.equal(playerwidth);
-      expect(bidResponse.height).to.equal(playerheight);
-    });
-
-    it('mixed video and native bids', function () {
-      const videoPlacementId = 'test-video-placement-id';
-      const videoBidId = 'test-video-bid-id';
-      const nativePlacementId = 'test-native-placement-id';
-      const nativeBidId = 'test-native-bid-id';
-
-      const [bidResponseVideo, bidResponseNative] = interpretResponse({
-        body: {
-          errors: [],
-          bids: {
-            [videoPlacementId]: [{
-              placement_id: videoPlacementId,
-              bid_id: videoBidId,
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }],
-            [nativePlacementId]: [{
-              placement_id: nativePlacementId,
-              bid_id: nativeBidId,
-              bid_price_cents: 456,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['video', 'native'],
-        requestIds: [requestId, requestId],
-        sizes: [[playerwidth, playerheight], [300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponseVideo.cpm).to.equal(1.23);
-      expect(bidResponseVideo.requestId).to.equal(requestId);
-      expect(bidResponseVideo.ttl).to.equal(3600);
-      expect(bidResponseVideo.mediaType).to.equal('video');
-      expect(bidResponseVideo.vastUrl).to.equal(`https://an.facebook.com/v1/instream/vast.xml?placementid=${videoPlacementId}&pageurl=${expectedPageUrl}&playerwidth=${playerwidth}&playerheight=${playerheight}&bidid=${videoBidId}`);
-      expect(bidResponseVideo.width).to.equal(playerwidth);
-      expect(bidResponseVideo.height).to.equal(playerheight);
-
-      expect(bidResponseNative.cpm).to.equal(4.56);
-      expect(bidResponseNative.requestId).to.equal(requestId);
-      expect(bidResponseNative.ttl).to.equal(600);
-      expect(bidResponseNative.width).to.equal(300);
-      expect(bidResponseNative.height).to.equal(250);
-      expect(bidResponseNative.ad)
-        .to.contain(`placementid: '${nativePlacementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: '${nativeBidId}',`);
-    });
-
-    it('mixture of valid native bid and error in response', function () {
-      const [bidResponse] = interpretResponse({
-        body: {
-          errors: ['test-error-message'],
-          bids: {
-            [placementId]: [{
-              placement_id: placementId,
-              bid_id: 'test-bid-id',
-              bid_price_cents: 123,
-              bid_price_currency: 'usd',
-              bid_price_model: 'cpm'
-            }]
-          }
-        }
-      }, {
-        adformats: ['native'],
-        requestIds: [requestId],
-        sizes: [[300, 250]],
-        pageurl: expectedPageUrl
-      });
-
-      expect(bidResponse.cpm).to.equal(1.23);
-      expect(bidResponse.requestId).to.equal(requestId);
-      expect(bidResponse.width).to.equal(300);
-      expect(bidResponse.height).to.equal(250);
-      expect(bidResponse.ad)
-        .to.contain(`placementid: '${placementId}',`)
-        .and.to.contain(`format: 'native',`)
-        .and.to.contain(`bidid: 'test-bid-id',`)
-        .and.to.contain('getElementsByTagName("style")', 'ad missing native styles')
-        .and.to.contain('
', 'ad missing native container');
-      expect(bidResponse.ttl).to.equal(600);
-      expect(bidResponse.creativeId).to.equal(placementId);
-      expect(bidResponse.netRevenue).to.equal(true);
-      expect(bidResponse.currency).to.equal('USD');
-
-      expect(bidResponse.hb_bidder).to.equal('fan');
-      expect(bidResponse.fb_bidid).to.equal('test-bid-id');
-      expect(bidResponse.fb_format).to.equal('native');
-      expect(bidResponse.fb_placementid).to.equal(placementId);
-    });
-  });
-});
diff --git a/test/spec/modules/automatadBidAdapter_spec.js b/test/spec/modules/automatadBidAdapter_spec.js
index 788fd3aefc4..9d828bad4c3 100644
--- a/test/spec/modules/automatadBidAdapter_spec.js
+++ b/test/spec/modules/automatadBidAdapter_spec.js
@@ -86,6 +86,11 @@ describe('automatadBidAdapter', function () {
       expect(rdata.imp.length).to.equal(1)
     })
 
+    it('should include placement', function () {
+      let r = rdata.imp[0]
+      expect(r.placement !== null).to.be.true
+    })
+
     it('should include media types', function () {
       let r = rdata.imp[0]
       expect(r.media_types !== null).to.be.true
@@ -95,12 +100,68 @@ describe('automatadBidAdapter', function () {
       let r = rdata.imp[0]
       expect(r.siteID !== null && r.placementID !== null).to.be.true
     })
+
+    it('should include adunit code', function () {
+      let r = rdata.imp[0]
+      expect(r.adUnitCode !== null).to.be.true
+    })
   })
 
   describe('interpretResponse', function () {
     it('should get the correct bid response', function () {
       let result = spec.interpretResponse(expectedResponse[0])
       expect(result).to.be.an('array').that.is.not.empty
+      expect(result[0].meta.advertiserDomains[0]).to.equal('someAdDomain');
+    })
+
+    it('should interpret multiple bids in seatbid', function () {
+      let multipleBidResponse = [{
+        'body': {
+          'id': 'abc-321',
+          'seatbid': [
+            {
+              'bid': [
+                {
+                  'adm': '',
+                  'adomain': [
+                    'someAdDomain'
+                  ],
+                  'crid': 123,
+                  'h': 600,
+                  'id': 'bid1',
+                  'impid': 'imp1',
+                  'nurl': 'https://example/win',
+                  'price': 0.5,
+                  'w': 300
+                }
+              ]
+            }, {
+              'bid': [
+                {
+                  'adm': '',
+                  'adomain': [
+                    'someAdDomain'
+                  ],
+                  'crid': 321,
+                  'h': 600,
+                  'id': 'bid1',
+                  'impid': 'imp2',
+                  'nurl': 'https://example/win',
+                  'price': 0.5,
+                  'w': 300
+                }
+              ]
+            }
+          ]
+        }
+      }]
+      let result = spec.interpretResponse(multipleBidResponse[0]).map(bid => {
+        const {requestId} = bid;
+        return [ requestId ];
+      });
+
+      assert.equal(result.length, 2);
+      assert.deepEqual(result, [[ 'imp1' ], [ 'imp2' ]]);
     })
 
     it('handles empty bid response', function () {
diff --git a/test/spec/modules/avocetBidAdapter_spec.js b/test/spec/modules/avocetBidAdapter_spec.js
index 4cfd8ab89d4..2a2f29e48d2 100644
--- a/test/spec/modules/avocetBidAdapter_spec.js
+++ b/test/spec/modules/avocetBidAdapter_spec.js
@@ -69,7 +69,9 @@ describe('Avocet adapter', function () {
               placement: '012345678901234567890123',
             },
             userId: {
-              id5id: 'test'
+              id5id: {
+                uid: 'test'
+              }
             }
           },
           {
diff --git a/test/spec/modules/axonixBidAdapter_spec.js b/test/spec/modules/axonixBidAdapter_spec.js
new file mode 100644
index 00000000000..a952d527600
--- /dev/null
+++ b/test/spec/modules/axonixBidAdapter_spec.js
@@ -0,0 +1,378 @@
+import { expect } from 'chai';
+import { spec } from 'modules/axonixBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
+
+describe('AxonixBidAdapter', function () {
+  const adapter = newBidder(spec);
+
+  const SUPPLY_ID_1 = '91fd110a-5685-11eb-8db6-a7e0eeefbbc7';
+  const SUPPLY_ID_2 = '22de2092-568b-11eb-bae3-cfa975dc72aa';
+  const REGION_1 = 'us-east-1';
+  const REGION_2 = 'eu-west-1';
+
+  const BANNER_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250],
+          [300, 200]
+        ]
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const VIDEO_REQUEST = {
+    adUnitCode: 'ad_code',
+    bidId: 'abcd1234',
+    mediaTypes: {
+      video: {
+        context: 'outstream',
+        mimes: ['video/mp4'],
+        playerSize: [400, 300],
+        renderer: {
+          url: 'https://url.com',
+          backupOnly: true,
+          render: () => true
+        },
+      }
+    },
+    bidder: 'axonix',
+    params: {
+      supplyId: SUPPLY_ID_1,
+      region: REGION_1
+    },
+    requestId: 'q4owht8ofqi3ulwsd',
+    transactionId: 'fvpq3oireansdwo'
+  };
+
+  const BIDDER_REQUEST = {
+    bidderCode: 'axonix',
+    auctionId: '18fd8b8b0bd757',
+    bidderRequestId: '418b37f85e772c',
+    timeout: 3000,
+    gdprConsent: {
+      consentString: 'BOKAVy4OKAVy4ABAB8AAAAAZ+A==',
+      gdprApplies: true
+    },
+    refererInfo: {
+      referer: 'https://www.prebid.org',
+      canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
+    }
+  };
+
+  const BANNER_RESPONSE = {
+    body: [{
+      requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+      cpm: 6,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ad: '',
+      creativeId: 'abc',
+      netRevenue: false,
+      meta: {
+        networkId: 'nid',
+        advertiserDomains: [
+          'https://the.url'
+        ],
+        secondaryCatIds: [
+          'IAB1'
+        ],
+        mediaType: 'banner'
+      },
+      nurl: 'https://win.url'
+    }]
+  };
+
+  const VIDEO_RESPONSE = {
+    body: [{
+      requestId: 'f08b3a8dcff747eabada295dcf94eee0',
+      cpm: 6,
+      currency: 'USD',
+      width: 300,
+      height: 250,
+      ad: '',
+      creativeId: 'abc',
+      netRevenue: false,
+      meta: {
+        networkId: 'nid',
+        advertiserDomains: [
+          'https://the.url'
+        ],
+        secondaryCatIds: [
+          'IAB1'
+        ],
+        mediaType: 'video'
+      },
+      nurl: 'https://win.url'
+    }]
+  };
+
+  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 validBids = [
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_1,
+          region: REGION_1
+        },
+      },
+      {
+        bidder: 'axonix',
+        params: {
+          supplyId: SUPPLY_ID_2,
+          region: REGION_2
+        },
+        future_parameter: {
+          future: 'ididid'
+        }
+      },
+    ];
+
+    let invalidBids = [
+      {
+        bidder: 'axonix',
+        params: {},
+      },
+      {
+        bidder: 'axonix',
+      },
+    ];
+
+    it('should accept valid bids', function () {
+      for (let bid of validBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(true);
+      }
+    });
+
+    it('should reject invalid bids', function () {
+      for (let bid of invalidBids) {
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      }
+    });
+  });
+
+  describe('buildRequests: can handle banner ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([BANNER_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', BANNER_REQUEST);
+      expect(data).to.have.property('connectionType').to.exist;
+      expect(data).to.have.property('effectiveType').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[0].params.endpoint = 'https://the.url';
+      bannerRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', bannerRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const bannerRequests = [utils.deepClone(BANNER_REQUEST), utils.deepClone(BANNER_REQUEST)];
+      bannerRequests[1].params.supplyId = SUPPLY_ID_2;
+      bannerRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(bannerRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const bannerRequest = utils.deepClone(BANNER_REQUEST);
+      delete bannerRequest.params.region;
+
+      const requests = spec.buildRequests([bannerRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe('buildRequests: can handle video ad requests', function () {
+    it('creates ServerRequests with the correct data', function () {
+      const [request] = spec.buildRequests([VIDEO_REQUEST], BIDDER_REQUEST);
+
+      expect(request).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(request).to.have.property('method', 'POST');
+      expect(request).to.have.property('data');
+
+      const { data } = request;
+      expect(data.app).to.be.undefined;
+
+      expect(data).to.have.property('site');
+      expect(data.site).to.have.property('page', 'https://www.prebid.org');
+
+      expect(data).to.have.property('validBidRequest', VIDEO_REQUEST);
+      expect(data).to.have.property('connectionType').to.exist;
+      expect(data).to.have.property('effectiveType').to.exist;
+      expect(data).to.have.property('devicetype', 2);
+      expect(data).to.have.property('bidfloor', 0);
+      expect(data).to.have.property('dnt', 0);
+      expect(data).to.have.property('language').to.be.a('string');
+      expect(data).to.have.property('prebidVersion').to.be.a('string');
+      expect(data).to.have.property('screenHeight').to.be.a('number');
+      expect(data).to.have.property('screenWidth').to.be.a('number');
+      expect(data).to.have.property('tmax').to.be.a('number');
+      expect(data).to.have.property('ua').to.be.a('string');
+    });
+
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[0].params.endpoint = 'https://the.url';
+      videoRequests[1].params.endpoint = 'https://the.other.url';
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+
+      requests.forEach((request, index) => {
+        expect(request).to.have.property('url', videoRequests[index].params.endpoint);
+      });
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      const videoRequests = [utils.deepClone(VIDEO_REQUEST), utils.deepClone(VIDEO_REQUEST)];
+      videoRequests[1].params.supplyId = SUPPLY_ID_2;
+      videoRequests[1].params.region = REGION_2;
+
+      const requests = spec.buildRequests(videoRequests, BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+      expect(requests[1]).to.have.property('url', `https://openrtb-${REGION_2}.axonix.com/supply/prebid/${SUPPLY_ID_2}`);
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      const videoRequest = utils.deepClone(VIDEO_REQUEST);
+      delete videoRequest.params.region;
+
+      const requests = spec.buildRequests([videoRequest], BIDDER_REQUEST);
+      expect(requests[0]).to.have.property('url', `https://openrtb-${REGION_1}.axonix.com/supply/prebid/${SUPPLY_ID_1}`);
+    });
+  });
+
+  describe.skip('buildRequests: can handle native ad requests', function () {
+    it('creates ServerRequests pointing to the correct region and endpoint if it changes', function () {
+      // loop:
+      //   set supply id
+      //   set region/endpoint in ssp config
+      //   call buildRequests, validate request (url, method, supply id)
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default endpoint if missing', function () {
+      // no endpoint in config means default value openrtb.axonix.com
+      expect.fail('Not implemented');
+    });
+
+    it('creates ServerRequests pointing to default region if missing', function () {
+      // no region in config means default value us-east-1
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('considers corner cases', function() {
+      expect(spec.interpretResponse(null)).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse()).to.be.an('array').that.is.empty;
+    });
+
+    it('ignores unparseable responses', function() {
+      expect(spec.interpretResponse('invalid')).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse(['invalid'])).to.be.an('array').that.is.empty;
+      expect(spec.interpretResponse({ body: [{ invalid: 'object' }] })).to.be.an('array').that.is.empty;
+    });
+
+    it('parses banner responses', function () {
+      const response = spec.interpretResponse(BANNER_RESPONSE);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(BANNER_RESPONSE.body[0]);
+    });
+
+    it('parses 1 video responses', function () {
+      const response = spec.interpretResponse(VIDEO_RESPONSE);
+
+      expect(response).to.be.an('array').that.is.not.empty;
+      expect(response[0]).to.equal(VIDEO_RESPONSE.body[0]);
+    });
+
+    it.skip('parses 1 native responses', function () {
+      // passing 1 valid native in a response generates an array with 1 correct prebid response
+      // examine mediaType:native, native element
+      // check nativeBidIsValid from {@link file://./../../../src/native.js}
+      expect.fail('Not implemented');
+    });
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('called once', function () {
+      spec.onBidWon(BANNER_RESPONSE.body[0]);
+      expect(utils.triggerPixel.calledOnce).to.equal(true);
+    });
+
+    it('called false', function () {
+      spec.onBidWon({ cpm: '2.21' });
+      expect(utils.triggerPixel.called).to.equal(false);
+    });
+
+    it('when there is no notification expected server side, none is called', function () {
+      var response = spec.onBidWon({});
+      expect(utils.triggerPixel.called).to.equal(false);
+      expect(response).to.be.an('undefined')
+    });
+  });
+
+  describe('onTimeout', function () {
+    it('banner response', () => {
+      spec.onTimeout(spec.interpretResponse(BANNER_RESPONSE));
+    });
+
+    it('video response', () => {
+      spec.onTimeout(spec.interpretResponse(VIDEO_RESPONSE));
+    });
+  });
+});
diff --git a/test/spec/modules/beachfrontBidAdapter_spec.js b/test/spec/modules/beachfrontBidAdapter_spec.js
index 5711e111e30..555f2c21262 100644
--- a/test/spec/modules/beachfrontBidAdapter_spec.js
+++ b/test/spec/modules/beachfrontBidAdapter_spec.js
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import sinon from 'sinon';
 import { spec, VIDEO_ENDPOINT, BANNER_ENDPOINT, OUTSTREAM_SRC, DEFAULT_MIMES } from 'modules/beachfrontBidAdapter.js';
 import { parseUrl } from 'src/utils.js';
 
@@ -172,6 +171,24 @@ describe('BeachfrontAdapter', function () {
         expect(data.cur).to.deep.equal(['USD']);
       });
 
+      it('must read from the floors module if available', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.getFloor = () => ({ currency: 'USD', floor: 1.16 });
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.imp[0].bidfloor).to.equal(1.16);
+      });
+
+      it('must use the bid floor param if no value is returned from the floors module', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.getFloor = () => ({});
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
+      });
+
       it('must parse bid size from a nested array', function () {
         const width = 640;
         const height = 480;
@@ -223,17 +240,33 @@ describe('BeachfrontAdapter', function () {
         expect(data.imp[0].video).to.deep.contain({ w: width, h: height });
       });
 
-      it('must override video targeting params', function () {
+      it('must set video params from the standard object', function () {
         const bidRequest = bidRequests[0];
         const mimes = ['video/webm'];
         const playbackmethod = 2;
         const maxduration = 30;
         const placement = 4;
-        bidRequest.mediaTypes = { video: {} };
-        bidRequest.params.video = { mimes, playbackmethod, maxduration, placement };
+        const skip = 1;
+        bidRequest.mediaTypes = {
+          video: { mimes, playbackmethod, maxduration, placement, skip }
+        };
         const requests = spec.buildRequests([ bidRequest ]);
         const data = requests[0].data;
-        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement });
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
+      });
+
+      it('must override video params from the bidder object', function () {
+        const bidRequest = bidRequests[0];
+        const mimes = ['video/webm'];
+        const playbackmethod = 2;
+        const maxduration = 30;
+        const placement = 4;
+        const skip = 1;
+        bidRequest.mediaTypes = { video: { placement: 3, skip: 0 } };
+        bidRequest.params.video = { mimes, playbackmethod, maxduration, placement, skip };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.imp[0].video).to.deep.contain({ mimes, playbackmethod, maxduration, placement, skip });
       });
 
       it('must add US privacy data to the request', function () {
@@ -262,6 +295,27 @@ describe('BeachfrontAdapter', function () {
         expect(data.user.ext.consent).to.equal(consentString);
       });
 
+      it('must add schain data to the request', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'directseller.com',
+              sid: '00001',
+              rid: 'BidRequest1',
+              hp: 1
+            }
+          ]
+        };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.schain = schain;
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.source.ext.schain).to.deep.equal(schain);
+      });
+
       it('must add the Trade Desk User ID to the request', () => {
         const tdid = '4321';
         const bidRequest = bidRequests[0];
@@ -279,6 +333,42 @@ describe('BeachfrontAdapter', function () {
           }]
         });
       });
+
+      it('must add the IdentityLink ID to the request', () => {
+        const idl_env = '4321';
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.userId = { idl_env };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.user.ext.eids[0]).to.deep.equal({
+          source: 'liveramp.com',
+          uids: [{
+            id: idl_env,
+            ext: {
+              rtiPartner: 'idl'
+            }
+          }]
+        });
+      });
+
+      it('must add the Unified ID 2.0 to the request', () => {
+        const uid2 = { id: '4321' };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { video: {} };
+        bidRequest.userId = { uid2 };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.user.ext.eids[0]).to.deep.equal({
+          source: 'uidapi.com',
+          uids: [{
+            id: uid2.id,
+            ext: {
+              rtiPartner: 'UID2'
+            }
+          }]
+        });
+      });
     });
 
     describe('for banner bids', function () {
@@ -302,6 +392,7 @@ describe('BeachfrontAdapter', function () {
         const width = 300;
         const height = 250;
         const bidRequest = bidRequests[0];
+        bidRequest.params.tagid = '7cd7a7b4-ef3f-4aeb-9565-3627f255fa10';
         bidRequest.mediaTypes = {
           banner: {
             sizes: [ width, height ]
@@ -320,6 +411,7 @@ describe('BeachfrontAdapter', function () {
             slot: bidRequest.adUnitCode,
             id: bidRequest.params.appId,
             bidfloor: bidRequest.params.bidfloor,
+            tagid: bidRequest.params.tagid,
             sizes: [{ w: width, h: height }]
           }
         ]);
@@ -329,6 +421,24 @@ describe('BeachfrontAdapter', function () {
         expect(data.ua).to.equal(navigator.userAgent);
       });
 
+      it('must read from the floors module if available', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.getFloor = () => ({ currency: 'USD', floor: 1.16 });
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.slots[0].bidfloor).to.equal(1.16);
+      });
+
+      it('must use the bid floor param if no value is returned from the floors module', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.getFloor = () => ({});
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.slots[0].bidfloor).to.equal(bidRequest.params.bidfloor);
+      });
+
       it('must parse bid size from a nested array', function () {
         const width = 300;
         const height = 250;
@@ -410,6 +520,27 @@ describe('BeachfrontAdapter', function () {
         expect(data.gdprConsent).to.equal(consentString);
       });
 
+      it('must add schain data to the request', () => {
+        const schain = {
+          ver: '1.0',
+          complete: 1,
+          nodes: [
+            {
+              asi: 'directseller.com',
+              sid: '00001',
+              rid: 'BidRequest1',
+              hp: 1
+            }
+          ]
+        };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.schain = schain;
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.schain).to.deep.equal(schain);
+      });
+
       it('must add the Trade Desk User ID to the request', () => {
         const tdid = '4321';
         const bidRequest = bidRequests[0];
@@ -419,6 +550,26 @@ describe('BeachfrontAdapter', function () {
         const data = requests[0].data;
         expect(data.tdid).to.equal(tdid);
       });
+
+      it('must add the IdentityLink ID to the request', () => {
+        const idl_env = '4321';
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.userId = { idl_env };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.idl).to.equal(idl_env);
+      });
+
+      it('must add the Unified ID 2.0 to the request', () => {
+        const uid2 = { id: '4321' };
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        bidRequest.userId = { uid2 };
+        const requests = spec.buildRequests([ bidRequest ]);
+        const data = requests[0].data;
+        expect(data.uid2).to.equal(uid2.id);
+      });
     });
 
     describe('for multi-format bids', function () {
@@ -486,16 +637,6 @@ describe('BeachfrontAdapter', function () {
         expect(bidResponse.length).to.equal(0);
       });
 
-      it('should return no bids if the response "url" is missing', function () {
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = { video: {} };
-        const serverResponse = {
-          bidPrice: 5.00
-        };
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse.length).to.equal(0);
-      });
-
       it('should return no bids if the response "bidPrice" is missing', function () {
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = { video: {} };
@@ -518,6 +659,7 @@ describe('BeachfrontAdapter', function () {
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
+          vast: '',
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
@@ -527,10 +669,11 @@ describe('BeachfrontAdapter', function () {
           cpm: serverResponse.bidPrice,
           creativeId: serverResponse.crid,
           vastUrl: serverResponse.url,
-          vastXml: undefined,
+          vastXml: serverResponse.vast,
           width: width,
           height: height,
           renderer: null,
+          meta: { mediaType: 'video', advertiserDomains: [] },
           mediaType: 'video',
           currency: 'USD',
           netRevenue: true,
@@ -538,7 +681,7 @@ describe('BeachfrontAdapter', function () {
         });
       });
 
-      it('should default to the legacy "cmpId" value for the creative ID', () => {
+      it('should return only vast url if the response type is "nurl"', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
@@ -547,18 +690,19 @@ describe('BeachfrontAdapter', function () {
             playerSize: [ width, height ]
           }
         };
+        bidRequest.params.video = { responseType: 'nurl' };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          cmpId: '123abc'
+          vast: '',
+          crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse).to.deep.contain({
-          creativeId: serverResponse.cmpId
-        });
+        expect(bidResponse.vastUrl).to.equal(serverResponse.url);
+        expect(bidResponse.vastXml).to.equal(undefined);
       });
 
-      it('should return vast xml if found on the bid response', () => {
+      it('should return only vast xml if the response type is "adm"', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
@@ -567,6 +711,7 @@ describe('BeachfrontAdapter', function () {
             playerSize: [ width, height ]
           }
         };
+        bidRequest.params.video = { responseType: 'adm' };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
@@ -574,10 +719,8 @@ describe('BeachfrontAdapter', function () {
           crid: '123abc'
         };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        expect(bidResponse).to.deep.contain({
-          vastUrl: serverResponse.url,
-          vastXml: serverResponse.vast
-        });
+        expect(bidResponse.vastUrl).to.equal(undefined);
+        expect(bidResponse.vastXml).to.equal(serverResponse.vast);
       });
 
       it('should return a renderer for outstream video bids', function () {
@@ -597,63 +740,32 @@ describe('BeachfrontAdapter', function () {
           id: bidRequest.bidId,
           url: OUTSTREAM_SRC
         });
+        expect(bidResponse.renderer.render).to.be.a('function');
       });
 
-      it('should initialize a player for outstream bids', () => {
+      it('should return meta data for the bid response', () => {
         const width = 640;
         const height = 480;
         const bidRequest = bidRequests[0];
         bidRequest.mediaTypes = {
           video: {
-            context: 'outstream',
             playerSize: [ width, height ]
           }
         };
         const serverResponse = {
           bidPrice: 5.00,
           url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          crid: '123abc'
-        };
-        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        window.Beachfront = { Player: sinon.spy() };
-        bidResponse.adUnitCode = bidRequest.adUnitCode;
-        bidResponse.renderer.render(bidResponse);
-        sinon.assert.calledWith(window.Beachfront.Player, bidResponse.adUnitCode, sinon.match({
-          adTagUrl: bidResponse.vastUrl,
-          width: bidResponse.width,
-          height: bidResponse.height,
-          expandInView: false,
-          collapseOnComplete: true
-        }));
-        delete window.Beachfront;
-      });
-
-      it('should configure outstream player settings from the bidder params', () => {
-        const width = 640;
-        const height = 480;
-        const bidRequest = bidRequests[0];
-        bidRequest.mediaTypes = {
-          video: {
-            context: 'outstream',
-            playerSize: [ width, height ]
+          meta: {
+            advertiserDomains: ['example.com'],
+            advertiserId: '123'
           }
         };
-        bidRequest.params.player = {
-          expandInView: true,
-          collapseOnComplete: false,
-          progressColor: 'green'
-        };
-        const serverResponse = {
-          bidPrice: 5.00,
-          url: 'http://reachms.bfmio.com/getmu?aid=bid:19c4a196-fb21-4c81-9a1a-ecc5437a39da',
-          crid: '123abc'
-        };
         const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
-        window.Beachfront = { Player: sinon.spy() };
-        bidResponse.adUnitCode = bidRequest.adUnitCode;
-        bidResponse.renderer.render(bidResponse);
-        sinon.assert.calledWith(window.Beachfront.Player, bidResponse.adUnitCode, sinon.match(bidRequest.params.player));
-        delete window.Beachfront;
+        expect(bidResponse.meta).to.deep.equal({
+          mediaType: 'video',
+          advertiserDomains: ['example.com'],
+          advertiserId: '123'
+        });
       });
     });
 
@@ -709,6 +821,7 @@ describe('BeachfrontAdapter', function () {
             cpm: serverResponse[ i ].price,
             width: serverResponse[ i ].w,
             height: serverResponse[ i ].h,
+            meta: { mediaType: 'banner', advertiserDomains: [] },
             mediaType: 'banner',
             currency: 'USD',
             netRevenue: true,
@@ -716,6 +829,32 @@ describe('BeachfrontAdapter', function () {
           });
         }
       });
+
+      it('should return meta data for the bid response', () => {
+        bidRequests[0].mediaTypes = {
+          banner: {
+            sizes: [[ 300, 250 ], [ 728, 90 ]]
+          }
+        };
+        const serverResponse = [{
+          slot: bidRequests[0].adUnitCode,
+          adm: '
',
+          crid: 'crid_1',
+          price: 3.02,
+          w: 728,
+          h: 90,
+          meta: {
+            advertiserDomains: ['example.com'],
+            advertiserId: '123'
+          }
+        }];
+        const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest: bidRequests });
+        expect(bidResponse[0].meta).to.deep.equal({
+          mediaType: 'banner',
+          advertiserDomains: ['example.com'],
+          advertiserId: '123'
+        });
+      });
     });
   });
 
diff --git a/test/spec/modules/betweenBidAdapter_spec.js b/test/spec/modules/betweenBidAdapter_spec.js
index 94db41ba014..0e772e7be02 100644
--- a/test/spec/modules/betweenBidAdapter_spec.js
+++ b/test/spec/modules/betweenBidAdapter_spec.js
@@ -20,7 +20,7 @@ describe('betweenBidAdapterTests', function () {
       sizes: [[240, 400]]
     }]
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
     expect(req_data.bidid).to.equal('bid1234');
   });
   it('validate itu param', function() {
@@ -37,7 +37,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.itu).to.equal('https://something.url');
   });
@@ -55,7 +55,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.cur).to.equal('THX');
   });
@@ -73,7 +73,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.subid).to.equal(1138);
   });
@@ -91,7 +91,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.click3rd).to.equal('https://something.url');
   });
@@ -111,7 +111,7 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data['pubside_macro[param]']).to.equal('%26test%3Dtset');
   });
@@ -134,7 +134,7 @@ describe('betweenBidAdapterTests', function () {
     }
 
     let request = spec.buildRequests(bidRequestData, bidderRequest);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
     expect(req_data.gdprApplies).to.equal(bidderRequest.gdprConsent.gdprApplies);
     expect(req_data.consentString).to.equal(bidderRequest.gdprConsent.consentString);
@@ -217,8 +217,87 @@ describe('betweenBidAdapterTests', function () {
     }];
 
     let request = spec.buildRequests(bidRequestData);
-    let req_data = request[0].data;
+    let req_data = JSON.parse(request.data)[0].data;
 
-    expect(req_data.sizes).to.deep.equal('970x250%2C240x400%2C728x90');
+    expect(req_data.sizes).to.deep.equal(['970x250', '240x400', '728x90'])
+  });
+
+  it('check sharedId with id and third', function() {
+    const bidRequestData = [{
+      bidId: 'bid123',
+      bidder: 'between',
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90]]
+        }
+      },
+      params: {
+        s: 1112,
+      },
+      userId: {
+        sharedid: {
+          id: '01EXQE7JKNDRDDVATB0S2GX1NT',
+          third: '01EXQE7JKNDRDDVATB0S2GX1NT'
+        }
+      }
+    }];
+    const shid = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid;
+    const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
+    expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT');
+  });
+  it('check sharedId with only id', function() {
+    const bidRequestData = [{
+      bidId: 'bid123',
+      bidder: 'between',
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90]]
+        }
+      },
+      params: {
+        s: 1112,
+      },
+      userId: {
+        sharedid: {
+          id: '01EXQE7JKNDRDDVATB0S2GX1NT',
+        }
+      }
+    }];
+    const shid = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid;
+    const shid3 = JSON.parse(spec.buildRequests(bidRequestData).data)[0].data.shid3;
+    expect(shid).to.equal('01EXQE7JKNDRDDVATB0S2GX1NT') && expect(shid3).to.equal('');
+  });
+  it('check adomain', function() {
+    const serverResponse = {
+      body: [{
+        bidid: 'bid1234',
+        cpm: 1.12,
+        w: 240,
+        h: 400,
+        currency: 'USD',
+        ad: 'Ad html',
+        adomain: ['domain1.com', 'domain2.com']
+      }]
+    };
+    const bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.meta.advertiserDomains).to.deep.equal(['domain1.com', 'domain2.com']);
+  });
+  it('check server response without adomain', function() {
+    const serverResponse = {
+      body: [{
+        bidid: 'bid1234',
+        cpm: 1.12,
+        w: 240,
+        h: 400,
+        currency: 'USD',
+        ad: 'Ad html',
+      }]
+    };
+    const bids = spec.interpretResponse(serverResponse);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.meta.advertiserDomains).to.deep.equal([]);
   });
 });
diff --git a/test/spec/modules/bidViewability_spec.js b/test/spec/modules/bidViewability_spec.js
new file mode 100644
index 00000000000..211dec090a5
--- /dev/null
+++ b/test/spec/modules/bidViewability_spec.js
@@ -0,0 +1,297 @@
+import * as bidViewability from 'modules/bidViewability.js';
+import { config } from 'src/config.js';
+import * as events from 'src/events.js';
+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 { EVENTS } from 'src/constants.json';
+import adapterManager, { gdprDataHandler, uspDataHandler } from 'src/adapterManager.js';
+import parse from 'url-parse';
+
+const GPT_SLOT = {
+  getAdUnitPath() {
+    return '/harshad/Jan/2021/';
+  },
+
+  getSlotElementId() {
+    return 'DIV-1';
+  }
+};
+
+const PBJS_WINNING_BID = {
+  'adUnitCode': '/harshad/Jan/2021/',
+  'bidderCode': 'pubmatic',
+  'bidder': 'pubmatic',
+  'width': 300,
+  'height': 250,
+  'statusMessage': 'Bid available',
+  'adId': 'id',
+  'requestId': 1024,
+  'source': 'client',
+  'no_bid': false,
+  'cpm': '1.1495',
+  'ttl': 180,
+  'creativeId': 'id',
+  'netRevenue': true,
+  'currency': 'USD',
+  'vurls': [
+    'https://domain-1.com/end-point?a=1',
+    'https://domain-2.com/end-point/',
+    'https://domain-3.com/end-point?a=1'
+  ]
+};
+
+describe('#bidViewability', function() {
+  let gptSlot;
+  let pbjsWinningBid;
+
+  beforeEach(function() {
+    gptSlot = Object.assign({}, GPT_SLOT);
+    pbjsWinningBid = Object.assign({}, PBJS_WINNING_BID);
+  });
+
+  describe('isBidAdUnitCodeMatchingSlot', function() {
+    it('match found by GPT Slot getAdUnitPath', function() {
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match found by GPT Slot getSlotElementId', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-1';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(true);
+    });
+
+    it('match not found', function() {
+      pbjsWinningBid.adUnitCode = 'DIV-10';
+      expect(bidViewability.isBidAdUnitCodeMatchingSlot(pbjsWinningBid, gptSlot)).to.equal(false);
+    });
+  });
+
+  describe('getMatchingWinningBidForGPTSlot', function() {
+    let winningBidsArray;
+    let sandbox
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('should find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      let newWinningBid = Object.assign({}, PBJS_WINNING_BID, {adUnitCode: 'AD-' + PBJS_WINNING_BID.adUnitCode});
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(newWinningBid);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.deep.equal(newWinningBid);
+    });
+
+    it('should NOT find a match by using customMatchFunction provided in config', function() {
+      // Needs config to be passed with customMatchFunction
+      let bidViewabilityConfig = {
+        customMatchFunction(bid, slot) {
+          return ('AD-' + slot.getAdUnitPath()) === bid.adUnitCode;
+        }
+      };
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot(bidViewabilityConfig, gptSlot);
+      expect(wb).to.equal(null);
+    });
+
+    it('should find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented with match
+      winningBidsArray.push(PBJS_WINNING_BID);
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('should NOT find a match by using default matching function', function() {
+      // Needs config to be passed without customMatchFunction
+      // Needs pbjs.getWinningBids to be implemented without match; winningBidsArray is set to empty in beforeEach
+      let wb = bidViewability.getMatchingWinningBidForGPTSlot({}, gptSlot);
+      expect(wb).to.equal(null);
+    });
+  });
+
+  describe('fireViewabilityPixels', function() {
+    let sandbox;
+    let triggerPixelSpy;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    });
+
+    it('DO NOT fire pixels if NOT mentioned in module config', function() {
+      let moduleConfig = {};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      expect(triggerPixelSpy.callCount).to.equal(0);
+    });
+
+    it('fire pixels if mentioned in module config', function() {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+    });
+
+    it('USP: should include the us_privacy key when USP Consent is available', function () {
+      let uspDataHandlerStub = sinon.stub(uspDataHandler, 'getConsentData');
+      uspDataHandlerStub.returns('1YYY');
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal('1YYY');
+      });
+      uspDataHandlerStub.restore();
+    });
+
+    it('USP: should not include the us_privacy key when USP Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.us_privacy).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should include the GDPR keys when GDPR Consent is available', function() {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent',
+        addtlConsent: 'moreConsent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal('moreConsent');
+      });
+      gdprDataHandlerStub.restore();
+    });
+
+    it('GDPR: should not include the GDPR keys when GDPR Consent is not available', function () {
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal(undefined);
+        expect(queryObject.gdpr_consent).to.equal(undefined);
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+    });
+
+    it('GDPR: should only include the GDPR keys for GDPR Consent fields with values', function () {
+      let gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
+      gdprDataHandlerStub.returns({
+        gdprApplies: true,
+        consentString: 'consent'
+      });
+      let moduleConfig = {firePixels: true};
+      bidViewability.fireViewabilityPixels(moduleConfig, PBJS_WINNING_BID);
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0].indexOf(url)).to.equal(0);
+        const testurl = parse(call.args[0]);
+        const queryObject = utils.parseQS(testurl.query);
+        expect(queryObject.gdpr).to.equal('1');
+        expect(queryObject.gdpr_consent).to.equal('consent');
+        expect(queryObject.addtl_consent).to.equal(undefined);
+      });
+      gdprDataHandlerStub.restore();
+    })
+  });
+
+  describe('impressionViewableHandler', function() {
+    let sandbox;
+    let triggerPixelSpy;
+    let eventsEmitSpy;
+    let logWinningBidNotFoundSpy;
+    let callBidViewableBidderSpy;
+    let winningBidsArray;
+
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      triggerPixelSpy = sandbox.spy(utils, ['triggerPixel']);
+      eventsEmitSpy = sandbox.spy(events, ['emit']);
+      callBidViewableBidderSpy = sandbox.spy(adapterManager, ['callBidViewableBidder']);
+      // mocking winningBidsArray
+      winningBidsArray = [];
+      sandbox.stub(prebidGlobal, 'getGlobal').returns({
+        getAllWinningBids: function (number) {
+          return winningBidsArray;
+        }
+      });
+    });
+
+    afterEach(function() {
+      sandbox.restore();
+    })
+
+    it('matching winning bid is found', function() {
+      let moduleConfig = {
+        firePixels: true
+      };
+      winningBidsArray.push(PBJS_WINNING_BID);
+      bidViewability.impressionViewableHandler(moduleConfig, GPT_SLOT, null);
+      // fire pixels should be called
+      PBJS_WINNING_BID.vurls.forEach((url, i) => {
+        let call = triggerPixelSpy.getCall(i);
+        expect(call.args[0]).to.equal(url);
+      });
+      // adapterManager.callBidViewableBidder is called with required args
+      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);
+      // EVENTS.BID_VIEWABLE is triggered
+      call = eventsEmitSpy.getCall(0);
+      expect(call.args[0]).to.equal(EVENTS.BID_VIEWABLE);
+      expect(call.args[1]).to.deep.equal(PBJS_WINNING_BID);
+    });
+
+    it('matching winning bid is NOT found', function() {
+      // fire pixels should NOT be called
+      expect(triggerPixelSpy.callCount).to.equal(0);
+      // adapterManager.callBidViewableBidder is NOT called
+      expect(callBidViewableBidderSpy.callCount).to.equal(0);
+      // EVENTS.BID_VIEWABLE is NOT triggered
+      expect(eventsEmitSpy.callCount).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/bidglassAdapter_spec.js b/test/spec/modules/bidglassAdapter_spec.js
index d153430103d..7b007f7cc1f 100644
--- a/test/spec/modules/bidglassAdapter_spec.js
+++ b/test/spec/modules/bidglassAdapter_spec.js
@@ -65,7 +65,10 @@ describe('Bid Glass Adapter', function () {
             'creativeId': '-1',
             'width': '300',
             'height': '250',
-            'requestId': '30b31c1838de1e'
+            'requestId': '30b31c1838de1e',
+            'meta': {
+              'advertiserDomains': ['https://example.com']
+            }
           }]
         }
       };
@@ -83,7 +86,10 @@ describe('Bid Glass Adapter', function () {
         'mediaType': 'banner',
         'netRevenue': true,
         'ttl': 10,
-        'ad': ''
+        'ad': '',
+        'meta': {
+          'advertiserDomains': ['https://example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/bidscubeBidAdapter_spec.js b/test/spec/modules/bidscubeBidAdapter_spec.js
new file mode 100644
index 00000000000..26cf19fc310
--- /dev/null
+++ b/test/spec/modules/bidscubeBidAdapter_spec.js
@@ -0,0 +1,226 @@
+import { expect } from 'chai'
+import { spec } from '../../../modules/bidscubeBidAdapter.js'
+import { deepStrictEqual, notEqual, ok, strictEqual } from 'assert'
+
+describe('BidsCubeAdapter', () => {
+  const bid = {
+    bidId: '9ec5b177515ee2e5',
+    bidder: 'bidscube',
+    params: {
+      placementId: 0,
+      traffic: 'banner',
+      allParams: '{}'
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    it('Should return true if there are bidId, params and placementId parameters present', () => {
+      strictEqual(true, spec.isBidRequestValid(bid))
+    })
+
+    it('Should return false if at least one of parameters is not present', () => {
+      const b = { ...bid }
+      delete b.params.placementId
+      strictEqual(false, spec.isBidRequestValid(b))
+    })
+  })
+
+  describe('buildRequests', () => {
+    const serverRequest = spec.buildRequests([bid])
+
+    it('Creates a ServerRequest object with method, URL and data', () => {
+      ok(serverRequest)
+      ok(serverRequest.method)
+      ok(serverRequest.url)
+      ok(serverRequest.data)
+    })
+
+    it('Returns POST method', () => {
+      strictEqual('POST', serverRequest.method)
+    })
+
+    it('Returns valid URL', () => {
+      strictEqual('https://supply.bidscube.com/?c=o&m=multi', serverRequest.url)
+    })
+
+    it('Returns valid data if array of bids is valid', () => {
+      const { data } = serverRequest
+      strictEqual('object', typeof data)
+      deepStrictEqual(['deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements'], Object.keys(data))
+      strictEqual('number', typeof data.deviceWidth)
+      strictEqual('number', typeof data.deviceHeight)
+      strictEqual('string', typeof data.language)
+      strictEqual('string', typeof data.host)
+      strictEqual('string', typeof data.page)
+      notEqual(-1, [0, 1].indexOf(data.secure))
+
+      const placement = data.placements[0]
+      deepStrictEqual(['placementId', 'bidId', 'traffic', 'allParams'], Object.keys(placement))
+      strictEqual(0, placement.placementId)
+      strictEqual('9ec5b177515ee2e5', placement.bidId)
+      strictEqual('banner', placement.traffic)
+      strictEqual('{"bidId":"9ec5b177515ee2e5","bidder":"bidscube","params":{"placementId":0,"traffic":"banner","allParams":"{}"}}', placement.allParams)
+    })
+
+    it('Returns empty data if no valid requests are passed', () => {
+      const { placements } = spec.buildRequests([]).data
+
+      expect(spec.buildRequests([]).data.placements).to.be.an('array')
+      strictEqual(0, placements.length)
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const validData = [
+      {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          vastUrl: 'bidscube.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'bidscube.com',
+          title: 'Test',
+          image: 'bidscube.com',
+          creativeId: '2',
+          impressionTrackers: ['bidscube.com'],
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '9ec5b177515ee2e5',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['test.com']
+          }
+        }]
+      }
+    ]
+
+    for (const obj of validData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should interpret ${mediaType} response`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(1, response.length)
+
+        const copy = { ...obj.body[0] }
+        deepStrictEqual(copy, response[0])
+      })
+    }
+
+    for (const obj of validData) {
+      it(`Should interpret response has meta.advertiserDomains`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response[0]['meta']['advertiserDomains']).to.be.an('array')
+        expect(response[0]['meta']['advertiserDomains'][0]).to.be.an('string')
+      })
+    }
+
+    const invalidData = [
+      {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'bidscube.com',
+          title: 'Test',
+          impressionTrackers: ['bidscube.com'],
+          ttl: 120,
+          requestId: '9ec5b177515ee2e5',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      }
+    ]
+
+    for (const obj of invalidData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should return an empty array if invalid ${mediaType} response is passed `, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(0, response.length)
+      })
+    }
+
+    it('Should return an empty array if invalid response is passed', () => {
+      const response = spec.interpretResponse({
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      })
+
+      expect(response).to.be.an('array')
+      strictEqual(0, response.length)
+    })
+  })
+
+  describe('getUserSyncs', () => {
+    it('Returns valid URL and type', () => {
+      const expectedResult = [{ type: 'image', url: 'https://supply.bidscube.com/?c=o&m=cookie' }]
+      deepStrictEqual(expectedResult, spec.getUserSyncs())
+    })
+  })
+})
diff --git a/test/spec/modules/bizzclickBidAdapter_spec.js b/test/spec/modules/bizzclickBidAdapter_spec.js
new file mode 100644
index 00000000000..e0698c9eda8
--- /dev/null
+++ b/test/spec/modules/bizzclickBidAdapter_spec.js
@@ -0,0 +1,396 @@
+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]]
+    }
+  },
+  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('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,
+        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', '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.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,
+        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', '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.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',
+        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');
+      expect(dataItem.requestId).to.equal(expectedBidResponse.requestId);
+      expect(dataItem.cpm).to.equal(expectedBidResponse.cpm);
+      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/bluebillywigBidAdapter_spec.js b/test/spec/modules/bluebillywigBidAdapter_spec.js
index 73bd4803358..c831ddf6ddf 100644
--- a/test/spec/modules/bluebillywigBidAdapter_spec.js
+++ b/test/spec/modules/bluebillywigBidAdapter_spec.js
@@ -40,6 +40,13 @@ describe('BlueBillywigAdapter', () => {
       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;
@@ -184,6 +191,44 @@ describe('BlueBillywigAdapter', () => {
       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', () => {
@@ -510,30 +555,64 @@ describe('BlueBillywigAdapter', () => {
       expect(deepAccess(payload, 'user.ext.eids')).to.be.undefined;
     });
 
-    it('should set digitrust when present on bid', () => {
-      const digiTrust = {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}};
+    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].userId = { digitrustid: digiTrust };
+      newBaseValidBidRequests[0].mediaTypes.video.playerSize = [1, 1];
 
       const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
 
-      expect(payload).to.have.nested.property('user.ext.digitrust');
-      expect(payload.user.ext.digitrust.id).to.equal(digiTrust.data.id);
-      expect(payload.user.ext.digitrust.keyv).to.equal(digiTrust.data.keyv);
+      expect(deepAccess(payload, 'imp.0.video.w')).to.equal(1);
+      expect(deepAccess(payload, 'imp.0.video.h')).to.equal(1);
     });
 
-    it('should not set digitrust when opted out', () => {
-      const digiTrust = {data: {id: 'DTID', keyv: 4, privacy: {optout: true}, producer: 'ABC', version: 2}};
+    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].userId = { digitrustid: digiTrust };
+      newBaseValidBidRequests[0].params.video = {
+        'true': true,
+        'testing': 'some',
+        123: {},
+        '': 'values'
+      };
 
       const request = spec.buildRequests(newBaseValidBidRequests, validBidderRequest);
       const payload = JSON.parse(request.data);
 
-      expect(deepAccess(payload, 'user.ext.digitrust')).to.be.undefined;
+      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', () => {
@@ -571,7 +650,7 @@ describe('BlueBillywigAdapter', () => {
         bidder: BB_CONSTANTS.BIDDER_CODE,
         bidderRequestId: '1a2345b67c8d9e0',
         params: baseValidBid.params,
-        sizes: [[768, 432], [640, 480], [630, 360]],
+        sizes: [[640, 480], [630, 360]],
         transactionId: '2b34c5de-f67a-8901-bcd2-34567efabc89'
       }],
       start: 11585918458869,
@@ -681,6 +760,10 @@ describe('BlueBillywigAdapter', () => {
       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);
@@ -759,6 +842,101 @@ describe('BlueBillywigAdapter', () => {
         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';
diff --git a/test/spec/modules/boldwinBidAdapter_spec.js b/test/spec/modules/boldwinBidAdapter_spec.js
new file mode 100644
index 00000000000..a353665ec33
--- /dev/null
+++ b/test/spec/modules/boldwinBidAdapter_spec.js
@@ -0,0 +1,281 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/boldwinBidAdapter.js';
+import { BANNER, VIDEO } from '../../../src/mediaTypes.js';
+
+describe('BoldwinBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'boldwin',
+    params: {
+      placementId: 0,
+      traffic: BANNER
+    }
+  };
+
+  const bidderRequest = {
+    refererInfo: {
+      referer: 'test.com'
+    }
+  };
+
+  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 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://ssp.videowalldirect.com/?c=o&m=multi');
+    });
+    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');
+      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', 'hPlayer', 'wPlayer', 'schain');
+      expect(placement.placementId).to.equal(0);
+      expect(placement.bidId).to.equal('23fhj33i987f');
+      expect(placement.traffic).to.equal(BANNER);
+      expect(placement.schain).to.be.an('object');
+    });
+
+    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.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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 () {
+    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/?c=o&m=cookie');
+    });
+  });
+});
diff --git a/test/spec/modules/bridgewellBidAdapter_spec.js b/test/spec/modules/bridgewellBidAdapter_spec.js
index 644f468abe8..8da82c71820 100644
--- a/test/spec/modules/bridgewellBidAdapter_spec.js
+++ b/test/spec/modules/bridgewellBidAdapter_spec.js
@@ -2,6 +2,14 @@ import { expect } from 'chai';
 import { spec } from 'modules/bridgewellBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 
+const userId = {
+  'criteoId': 'vYlICF9oREZlTHBGRVdrJTJCUUJnc3U2ckNVaXhrV1JWVUZVSUxzZmJlcnJZR0ZxbVhFRnU5bDAlMkJaUWwxWTlNcmdEeHFrJTJGajBWVlV4T3lFQ0FyRVcxNyUyQlIxa0lLSlFhcWJpTm9PSkdPVkx0JTJCbzlQRTQlM0Q',
+  'pubcid': '074864cb-3705-430e-9ff7-48ccf3c21b94',
+  'sharedid': {'id': '01F61MX53D786DSB2WYD38ZVM7', 'third': '01F61MX53D786DSB2WYD38ZVM7'},
+  'uid2': {'id': 'eb33b0cb-8d35-1234-b9c0-1a31d4064777'},
+  'flocId': {'id': '12345', 'version': 'chrome.1.1'},
+}
+
 describe('bridgewellBidAdapter', function () {
   const adapter = newBidder(spec);
 
@@ -22,6 +30,16 @@ describe('bridgewellBidAdapter', function () {
       expect(spec.isBidRequestValid(validTag)).to.equal(true);
     });
 
+    it('should return true when required params found', function () {
+      const validTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': 1234
+        },
+      };
+      expect(spec.isBidRequestValid(validTag)).to.equal(true);
+    });
+
     it('should return false when required params not found', function () {
       const invalidTag = {
         'bidder': 'bridgewell',
@@ -39,6 +57,26 @@ describe('bridgewellBidAdapter', function () {
       };
       expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
     });
+
+    it('should return false when required params are empty', function () {
+      const invalidTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': '',
+        },
+      };
+      expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
+    });
+
+    it('should return false when required param cid is not a number', function () {
+      const invalidTag = {
+        'bidder': 'bridgewell',
+        'params': {
+          'cid': 'bad_cid',
+        },
+      };
+      expect(spec.isBidRequestValid(invalidTag)).to.equal(false);
+    });
   });
 
   describe('buildRequests', function () {
@@ -57,6 +95,7 @@ describe('bridgewellBidAdapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+        'userId': userId,
       },
       {
         'bidder': 'bridgewell',
@@ -96,6 +135,7 @@ describe('bridgewellBidAdapter', function () {
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+        'userId': userId,
       }
     ];
 
@@ -112,13 +152,66 @@ describe('bridgewellBidAdapter', function () {
       expect(payload.adUnits).to.be.an('array');
       expect(payload.url).to.exist.and.to.equal('https://www.bridgewell.com/');
       for (let i = 0, max_i = payload.adUnits.length; i < max_i; i++) {
-        expect(payload.adUnits[i]).to.have.property('ChannelID').that.is.a('string');
-        expect(payload.adUnits[i]).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        let u = payload.adUnits[i];
+        expect(u).to.have.property('ChannelID').that.is.a('string');
+        expect(u).to.not.have.property('cid');
+        expect(u).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        expect(u).to.have.property('requestId').and.to.equal('3150ccb55da321');
+        expect(u).to.have.property('userIds');
+        expect(u.userIds).to.deep.equal(userId);
+      }
+    });
+
+    it('should attach valid params to the tag, part2', function() {
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'https://www.bridgewell.com/'
+        }
+      }
+      const bidRequests2 = [
+        {
+          'bidder': 'bridgewell',
+          'params': {
+            'cid': 1234,
+          },
+          'adUnitCode': 'adunit-code-2',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [728, 90]
+            }
+          },
+          'bidId': '3150ccb55da321',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'userId': userId
+        },
+      ];
+
+      const request = spec.buildRequests(bidRequests2, bidderRequest);
+      const payload = request.data;
+
+      expect(payload).to.be.an('object');
+      expect(payload.adUnits).to.be.an('array');
+      expect(payload.url).to.exist.and.to.equal('https://www.bridgewell.com/');
+      for (let i = 0, max_i = payload.adUnits.length; i < max_i; i++) {
+        let u = payload.adUnits[i];
+        expect(u).to.have.property('cid').that.is.a('number');
+        expect(u).to.not.have.property('ChannelID');
+        expect(u).to.have.property('adUnitCode').and.to.equal('adunit-code-2');
+        expect(u).to.have.property('requestId').and.to.equal('3150ccb55da321');
+        expect(u).to.have.property('userIds');
+        expect(u.userIds).to.deep.equal(userId);
       }
     });
 
     it('should attach validBidRequests to the tag', function () {
-      const request = spec.buildRequests(bidRequests);
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'https://www.bridgewell.com/'
+        }
+      }
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       const validBidRequests = request.validBidRequests;
       expect(validBidRequests).to.deep.equal(bidRequests);
     });
@@ -168,6 +261,7 @@ describe('bridgewellBidAdapter', function () {
         },
       ]
     };
+
     const nativeServerResponses = [
       {
         'id': '0e4048d3-5c74-4380-a21a-00ba35629f7d',
@@ -175,6 +269,7 @@ describe('bridgewellBidAdapter', function () {
         'cpm': 7.0,
         'width': 1,
         'height': 1,
+        'adomain': ['response.com'],
         'mediaType': 'native',
         'native': {
           'image': {
@@ -199,6 +294,7 @@ describe('bridgewellBidAdapter', function () {
         'currency': 'NTD'
       },
     ];
+
     const bannerBidRequests = {
       validBidRequests: [
         {
@@ -211,6 +307,7 @@ describe('bridgewellBidAdapter', function () {
         },
       ]
     };
+
     const bannerServerResponses = [
       {
         'id': 'e5b10774-32bf-4931-85ee-05095e8cff21',
@@ -218,6 +315,7 @@ describe('bridgewellBidAdapter', function () {
         'cpm': 5.0,
         'width': 300,
         'height': 250,
+        'adomain': ['response.com'],
         'mediaType': 'banner',
         'ad': '
test 300x250
',
         'ttl': 360,
@@ -239,6 +337,7 @@ describe('bridgewellBidAdapter', function () {
       expect(result[0].currency).to.equal('NTD');
       expect(result[0].mediaType).to.equal('native');
       expect(result[0].native.image.url).to.equal('https://img.scupio.com/test/test-image.jpg');
+      expect(String(result[0].meta.advertiserDomains)).to.equal('response.com');
     });
 
     it('should return all required parameters banner', function () {
@@ -254,6 +353,7 @@ describe('bridgewellBidAdapter', function () {
       expect(result[0].currency).to.equal('NTD');
       expect(result[0].mediaType).to.equal('banner');
       expect(result[0].ad).to.equal('
test 300x250
');
+      expect(String(result[0].meta.advertiserDomains)).to.equal('response.com');
     });
 
     it('should give up bid if server response is undefiend', function () {
diff --git a/test/spec/modules/brightMountainMediaBidAdapter_spec.js b/test/spec/modules/brightMountainMediaBidAdapter_spec.js
new file mode 100644
index 00000000000..17f23c5acd3
--- /dev/null
+++ b/test/spec/modules/brightMountainMediaBidAdapter_spec.js
@@ -0,0 +1,235 @@
+import { expect } from 'chai';
+import { spec } from '../../../modules/brightMountainMediaBidAdapter.js';
+
+const BIDDER_CODE = 'bmtm';
+const ENDPOINT_URL = 'https://one.elitebidder.com/api/hb';
+const ENDPOINT_URL_SYNC = 'https://console.brightmountainmedia.com:8443/cookieSync';
+const PLACEMENT_ID = 329;
+
+describe('brightMountainMediaBidAdapter_spec', function () {
+  let bidBanner = {
+    bidId: '2dd581a2b6281d',
+    bidder: BIDDER_CODE,
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      placement_id: PLACEMENT_ID
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+  };
+
+  let bidVideo = {
+    bidId: '2dd581a2b6281d',
+    bidder: BIDDER_CODE,
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      placement_id: PLACEMENT_ID
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      video: {
+        playerSizes: [[300, 250]],
+        context: 'outstream',
+        skip: 0,
+        playbackmethod: [1, 2],
+        mimes: ['video/mp4']
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+  };
+
+  let bidderRequest = {
+    bidderCode: BIDDER_CODE,
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    uspConsent: '1YN-',
+    refererInfo: {
+      referer: 'http://www.example.com',
+      reachedTop: true,
+    }
+  };
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when  when required params found', function () {
+      expect(spec.isBidRequestValid(bidBanner)).to.be.true;
+    });
+    it('Should return false when required params are not passed', function () {
+      bidBanner.params = {}
+      expect(spec.isBidRequestValid(bidBanner)).to.be.false;
+    });
+  });
+
+  function testServerRequestBody(serverRequest) {
+    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(ENDPOINT_URL);
+    });
+
+    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');
+      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'];
+      expect(placements).to.be.an('array');
+    });
+  }
+
+  describe('buildRequests', function () {
+    bidderRequest['bids'] = [bidBanner];
+    let serverRequest = spec.buildRequests([bidBanner], bidderRequest);
+    testServerRequestBody(serverRequest);
+
+    it('sends bidfloor param if present', function () {
+      bidBanner.getFloor = function () {
+        return {
+          currency: 'USD',
+          floor: 0.5,
+        }
+      };
+      const request = spec.buildRequests([bidBanner], bidderRequest);
+      expect(request.data.placements[0].floor['300x250']).to.equal(0.5);
+    });
+
+    it('sends gdpr info if exists', function () {
+      const gdprConsent = {
+        consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==',
+        gdprApplies: true
+      };
+
+      bidderRequest['gdprConsent'] = gdprConsent;
+      const request = spec.buildRequests([bidBanner], bidderRequest);
+
+      expect(request.data.gdpr_require).to.exist.and.to.be.a('number');
+      expect(request.data.gdpr_consent).to.exist.and.to.be.a('string');
+    });
+
+    it('sends schain info if exists', function () {
+      const schain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [
+          {
+            asi: 'directseller.com',
+            sid: '00001',
+            rid: 'BidRequest1',
+            hp: 1
+          }
+        ]
+      };
+      bidBanner.schain = schain;
+      const request = spec.buildRequests([bidBanner], bidderRequest);
+      expect(request.data.placements[0].schain).to.be.an('object');
+    });
+
+    bidderRequest['bids'] = [bidVideo];
+    serverRequest = spec.buildRequests([bidVideo], bidderRequest);
+    testServerRequestBody(serverRequest);
+
+    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;
+    });
+  });
+
+  function testServerResponse(serverResponses) {
+    it('Returns an array of valid server responses if response object is valid', function () {
+      expect(serverResponses).to.be.an('array').that.is.not.empty;
+      for (let i = 0; i < serverResponses.length; i++) {
+        let dataItem = serverResponses[i];
+        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.advertiserDomains[0]).to.be.a('string');
+      }
+    });
+  }
+
+  describe('interpretResponse', function () {
+    let resObjectBanner = {
+      body: [{
+        requestId: '123',
+        mediaType: 'banner',
+        cpm: 0.3,
+        width: 320,
+        height: 50,
+        ad: '
Hello ad
',
+        ttl: 1000,
+        creativeId: '123asd',
+        netRevenue: true,
+        currency: 'USD',
+        adomain: ['adomain.com'],
+      }]
+    };
+
+    let resObjectVideo = {
+      body: [{
+        requestId: '123',
+        mediaType: 'video',
+        cpm: 1.5,
+        width: 320,
+        height: 50,
+        ad: '
Hello ad
',
+        ttl: 1000,
+        creativeId: '123asd',
+        netRevenue: true,
+        currency: 'USD',
+        adomain: ['adomain.com'],
+      }]
+    };
+    let serverResponses = spec.interpretResponse(resObjectBanner);
+    testServerResponse(serverResponses);
+
+    serverResponses = spec.interpretResponse(resObjectVideo);
+    testServerResponse(serverResponses);
+
+    it('Returns an empty array if invalid response is passed', function () {
+      serverResponses = spec.interpretResponse('invalid_response');
+      expect(serverResponses).to.be.an('array').that.is.empty;
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    let syncoptionsIframe = {
+      'iframeEnabled': 'true'
+    }
+    it('should return iframe sync option', function () {
+      expect(spec.getUserSyncs(syncoptionsIframe)).to.be.an('array').with.lengthOf(1);
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].type).to.exist;
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].url).to.exist;
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].type).to.equal('iframe')
+      expect(spec.getUserSyncs(syncoptionsIframe)[0].url).to.equal(ENDPOINT_URL_SYNC)
+    });
+  });
+});
diff --git a/test/spec/modules/brightcomBidAdapter_spec.js b/test/spec/modules/brightcomBidAdapter_spec.js
index 6477e94d9d6..b7d52c9f7d5 100644
--- a/test/spec/modules/brightcomBidAdapter_spec.js
+++ b/test/spec/modules/brightcomBidAdapter_spec.js
@@ -141,6 +141,31 @@ describe('brightcomBidAdapter', function() {
       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: {
+          referer: 'http://example.com/page.html',
+        }
+      };
+      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);
+    });
+
     context('when element is fully in view', function() {
       it('returns 100', function() {
         Object.assign(element, { width: 600, height: 400 });
@@ -222,7 +247,8 @@ describe('brightcomBidAdapter', function() {
               'nurl': '',
               'adm': '',
               'w': 300,
-              'h': 250
+              'h': 250,
+              'adomain': ['example.com']
             }]
           }]
         }
@@ -240,7 +266,10 @@ describe('brightcomBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
@@ -258,7 +287,10 @@ describe('brightcomBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/britepoolIdSystem_spec.js b/test/spec/modules/britepoolIdSystem_spec.js
index 2c6dd234a90..ddb61806006 100644
--- a/test/spec/modules/britepoolIdSystem_spec.js
+++ b/test/spec/modules/britepoolIdSystem_spec.js
@@ -1,5 +1,5 @@
-import { expect } from 'chai';
 import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
+import * as utils from '../../../src/utils.js';
 
 describe('BritePool Submodule', () => {
   const api_key = '1111';
@@ -16,6 +16,32 @@ describe('BritePool Submodule', () => {
     };
   };
 
+  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);
@@ -43,12 +69,48 @@ describe('BritePool Submodule', () => {
     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({ api_key, aaid, url: url_override, getter: getter_override });
+    const response = britepoolIdSubmodule.getId({ params: { api_key, aaid, url: url_override, getter: getter_override } });
     assert.deepEqual(response, { id: { 'primaryBPID': bpid } });
   });
 
@@ -57,7 +119,7 @@ describe('BritePool Submodule', () => {
     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({ api_key, aaid, url: url_override, getter: getter_callback_override });
+    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 });
diff --git a/test/spec/modules/browsiRtdProvider_spec.js b/test/spec/modules/browsiRtdProvider_spec.js
new file mode 100644
index 00000000000..ee37d16905b
--- /dev/null
+++ b/test/spec/modules/browsiRtdProvider_spec.js
@@ -0,0 +1,83 @@
+import * as browsiRTD from '../../../modules/browsiRtdProvider.js';
+import {makeSlot} from '../integration/faker/googletag.js';
+
+describe('browsi Real time  data sub module', function () {
+  const conf = {
+    'auctionDelay': 250,
+    dataProviders: [{
+      'name': 'browsi',
+      'params': {
+        'url': 'testUrl.com',
+        'siteKey': 'testKey',
+        'pubKey': 'testPub',
+        'keyName': 'bv'
+      }
+    }]
+  };
+
+  it('should init and return true', function () {
+    browsiRTD.collectData();
+    expect(browsiRTD.browsiSubmodule.init(conf.dataProviders[0])).to.equal(true)
+  });
+
+  it('should create browsi script', function () {
+    const script = browsiRTD.addBrowsiTag('scriptUrl.com');
+    expect(script.getAttribute('data-sitekey')).to.equal('testKey');
+    expect(script.getAttribute('data-pubkey')).to.equal('testPub');
+    expect(script.async).to.equal(true);
+    expect(script.prebidData.kn).to.equal(conf.dataProviders[0].params.keyName);
+  });
+
+  it('should match placement with ad unit', function () {
+    const slot = makeSlot({code: '/57778053/Browsi_Demo_300x250', divId: 'browsiAd_1'});
+
+    const test1 = browsiRTD.isIdMatchingAdUnit(slot, ['/57778053/Browsi_Demo_300x250']); // true
+    const test2 = browsiRTD.isIdMatchingAdUnit(slot, ['/57778053/Browsi_Demo_300x250', '/57778053/Browsi']); // true
+    const test3 = browsiRTD.isIdMatchingAdUnit(slot, ['/57778053/Browsi_Demo_Low']); // false
+    const test4 = browsiRTD.isIdMatchingAdUnit(slot, []); // true
+
+    expect(test1).to.equal(true);
+    expect(test2).to.equal(true);
+    expect(test3).to.equal(false);
+    expect(test4).to.equal(true);
+  });
+
+  it('should return correct macro values', function () {
+    const slot = makeSlot({code: '/57778053/Browsi_Demo_300x250', divId: 'browsiAd_1'});
+
+    slot.setTargeting('test', ['test', 'value']);
+    // slot getTargeting doesn't act like GPT so we can't expect real value
+    const macroResult = browsiRTD.getMacroId({p: '/'}, slot);
+    expect(macroResult).to.equal('/57778053/Browsi_Demo_300x250/NA');
+
+    const macroResultB = browsiRTD.getMacroId({}, slot);
+    expect(macroResultB).to.equal('browsiAd_1');
+
+    const macroResultC = browsiRTD.getMacroId({p: '', s: {s: 0, e: 1}}, slot);
+    expect(macroResultC).to.equal('/');
+  });
+
+  describe('should return data to RTD module', function () {
+    it('should return empty if no ad units defined', function () {
+      browsiRTD.setData({});
+      expect(browsiRTD.browsiSubmodule.getTargetingData([])).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'])).to.eql({adMock: {bv: 'NA'}});
+    });
+
+    it('should return prediction from server', function () {
+      makeSlot({code: 'hasPrediction', divId: 'hasPrediction'});
+      const data = {
+        p: {'hasPrediction': {p: 0.234}},
+        kn: 'bv',
+        pmd: undefined
+      };
+      browsiRTD.setData(data);
+      expect(browsiRTD.browsiSubmodule.getTargetingData(['hasPrediction'])).to.eql({hasPrediction: {bv: '0.20'}});
+    })
+  })
+});
diff --git a/test/spec/modules/bucksenseBidAdapter_spec.js b/test/spec/modules/bucksenseBidAdapter_spec.js
index f49a63d2003..b977c3a9dd1 100644
--- a/test/spec/modules/bucksenseBidAdapter_spec.js
+++ b/test/spec/modules/bucksenseBidAdapter_spec.js
@@ -128,7 +128,10 @@ describe('Bucksense Adapter', function() {
           'creativeId': 'creative002',
           'currency': 'USD',
           'netRevenue': false,
-          'ad': '
'
+          'ad': '
',
+          'meta': {
+            'advertiserDomains': ['http://www.bucksense.com/']
+          }
         }
       };
     });
diff --git a/test/spec/modules/buzzoolaBidAdapter_spec.js b/test/spec/modules/buzzoolaBidAdapter_spec.js
index 8a04999219d..312441c4202 100644
--- a/test/spec/modules/buzzoolaBidAdapter_spec.js
+++ b/test/spec/modules/buzzoolaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/buzzoolaBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import '../../../src/prebid.js';
 import {executeRenderer, Renderer} from '../../../src/Renderer.js';
 import {deepClone} from '../../../src/utils.js';
 
@@ -54,7 +55,12 @@ const BANNER_RESPONSE = [{
   'netRevenue': true,
   'ttl': 10800,
   'ad': '
',
-  'mediaType': 'banner'
+  'mediaType': 'banner',
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
 }];
 
 const REQUIRED_BANNER_FIELDS = [
@@ -67,7 +73,8 @@ const REQUIRED_BANNER_FIELDS = [
   'creativeId',
   'netRevenue',
   'currency',
-  'mediaType'
+  'mediaType',
+  'meta'
 ];
 
 const VIDEO_BID = {
@@ -92,17 +99,22 @@ const VIDEO_BID_REQUEST = {
 
 const VIDEO_RESPONSE = [{
   'requestId': '325a54271dc40a',
-  'cpm': 4.6158956756756755,
+  'cpm': 5.528554074074074,
   'width': 640,
-  'height': 380,
+  'height': 480,
   'creativeId': '11774',
   'dealId': '',
   'currency': 'RUB',
   'netRevenue': true,
   'ttl': 10800,
   'ad': '{"crs":[{"advertiser_id":165,"title":"qa//PrebidJStestVideoURL","description":"qa//PrebidJStest","duration":0,"ya_id":"55038886","raw_content":"{\\"main_content\\": \\"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4\\"}","content":{"main_content":"https://tube.buzzoola.com/xstatic/o42/mcaug/2.mp4"},"content_type":"video_url","sponsor_link":"","sponsor_name":"","overlay":"","overlay_start_after":0,"overlay_close_after":0,"action_button_title":"","tracking_url":{},"iframe_domains":[],"soc_share_url":"https://tube.buzzoola.com/share.html","player_show_skip_button_before_play":false,"player_show_skip_button_seconds":5,"player_show_title":true,"player_data_attributes":{"expandable":"default","overroll":"default"},"click_event_view":"default","share_panel_position":"left","auto_play":true,"logo_url":{},"share_buttons":["vkontakte","facebook","twitter","moimir","odnoklassniki","embed"],"player_show_panels":false,"thumbnail":"","tracking_js":{},"click_event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/click/0/","vpaid_js_url":"https://tube.buzzoola.com/new/js/lib/vpaid_js_proxy.js","skip_clickthru":false,"landing_link_text":"","sound_enabled_by_default":false,"landing_link_position":"right","displayed_price":"","js_wrapper_url":"","enable_moat":false,"branding_template":"","event_url":"https://exchange.buzzoola.com/event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","resend_event_url":"https://exchange.buzzoola.com/resend_event/f9382ceb-49c2-4683-50d8-5c516c53cd69/14795a96-6261-49dc-7241-207333ab1490/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm/","creative_hash":"m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpIERGosa1adogXgqjDml4Pm","custom_html":"","custom_js":"","height":0,"width":0,"campaign_id":5758,"line_item_id":17319,"creative_id":11774,"extra":{"imp_id":"14795a96-6261-49dc-7241-207333ab1490","rtime":"2019-08-27 13:58:36"},"subcontent":"vast","auction_settings":{"price":"4.6158956756756755","currency":"RUB","event_name":"player_seen","time_slice":0},"hash_to_embed":"kbDH64c7yFYkSu0KCwSkoUD2bNHAnUTHBERqLGtWnaIF4Kow5peD5g","need_ad":false}],"tracking_urls":{"ctor":["https://www.tns-counter.ru/V13a****buzzola_com/ru/CP1251/tmsec=buzzola_total/1322650417245790778","https://www.tns-counter.ru/V13a****buzzoola_kz/ru/UTF-8/tmsec=buzzoola_video/5395765100939533275","https://buzzoolaru.solution.weborama.fr/fcgi-bin/dispatch.fcgi?a.A=ev&a.si=3071&a.te=37&a.aap=1&a.agi=862&a.evn=PrebidJS.test&g.ra=4581478478720298652","https://x01.aidata.io/0.gif?pid=BUZZOOLA&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://top-fwz1.mail.ru/counter?id=3026769","https://www.tns-counter.ru/V13a****buzzola_com/ru/UTF-8/tmsec=buzzola_inread/542059452789128996","https://dm.hybrid.ai/match?id=111&vid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://px.adhigh.net/p/cm/buzzoola?u=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ssp1.rtb.beeline.ru/userbind?src=buz&ssp_user_id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.upravel.com/image?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://relap.io/api/partners/bzcs.gif?uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://x.bidswitch.net/sync?ssp=sspicyads","https://inv-nets.admixer.net/adxcm.aspx?ssp=3C5173FC-CA30-4692-9116-009C19CB1BF9&rurl=%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fadmixer-video%2F%24%24visitor_cookie%24%24","https://sync.datamind.ru/cookie/accepter?source=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://dmp.vihub.ru/match?sysid=buz&redir=no&uid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://ad.adriver.ru/cgi-bin/rle.cgi?sid=1&ad=608223&bt=21&pid=2551979&bid=6150299&bn=6150299&rnd=1279444531737367663","https://reichelcormier.bid/point/?method=match&type=ssp&key=4677290772f9000878093d69c199bfba&id=3509&extUid=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sync.republer.com/match?src=buzzoola&id=dbdb5b13-e719-4987-7f6a-a882322bbfce","https://sm.rtb.mts.ru/p?id=dbdb5b13-e719-4987-7f6a-a882322bbfce&ssp=buzzoola","https://cm.mgid.com/m?cdsp=371151&adu=https%3A%2F%2Fexchange.buzzoola.com%2Fcookiesync%2Fdsp%2Fmarketgid-native%2F%7Bmuidn%7D","https://dmp.gotechnology.io/dmp/syncsspdmp?sspid=122258"]},"tracking_js":{"ctor":["https://buzzoola.fraudscore.mobi/dooJ9sheeeDaZ3fe.js?s=268671&l=417845"]},"placement":{"placement_id":417845,"unit_type":"inread","unit_settings":{"align":"left","autoplay_enable_sound":false,"creatives_amount":1,"debug_mode":false,"expandable":"never","sound_control":"default","target":"","width":"100%"},"unit_settings_list":["width","sound_control","debug_mode","target","creatives_amount","expandable","container_height","align","height"]},"uuid":"dbdb5b13-e719-4987-7f6a-a882322bbfce","auction_id":"f9382ceb-49c2-4683-50d8-5c516c53cd69","env":"prod"}',
-  'vastXml': '\n00:00:30',
-  'mediaType': 'video'
+  'vastUrl': 'https://exchange.buzzoola.com/prebid/adm/6cfa2ee1-f001-4fab-5582-a62eaee46205/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75R6wziBhL0JAERGosa1adogXgqjDml4Pm/?auction_id=92702ce1-2328-4c7a-57aa-41c738e8bb75',
+  'mediaType': 'video',
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
 }];
 
 const RENDERER_DATA = {
@@ -121,8 +133,107 @@ const REQUIRED_VIDEO_FIELDS = [
   'creativeId',
   'netRevenue',
   'currency',
-  'vastXml',
-  'mediaType'
+  'vastUrl',
+  'mediaType',
+  'meta'
+];
+
+const NATIVE_BID = {
+  'bidder': 'buzzoola',
+  'params': {'placementId': 417845},
+  'mediaTypes': {
+    'native': {
+      'image': {
+        'required': true,
+        'sizes': [640, 134]
+      },
+      'title': {
+        'required': true,
+        'len': 80
+      },
+      'sponsoredBy': {
+        'required': true
+      },
+      'clickUrl': {
+        'required': true
+      },
+      'privacyLink': {
+        'required': false
+      },
+      'body': {
+        'required': true
+      },
+      'icon': {
+        'required': true,
+        'sizes': [50, 50]
+      }
+    }
+  },
+  'bidId': '22a42cd3522c6f'
+};
+
+const NATIVE_BID_REQUEST = {
+  bidderCode: 'buzzoola',
+  bids: [NATIVE_BID]
+};
+
+const NATIVE_RESPONSE = [{
+  'requestId': '22a42cd3522c6f',
+  'cpm': 6.553015238095238,
+  'width': 600,
+  'height': 300,
+  'creativeId': '17970',
+  'dealId': '',
+  'currency': 'RUB',
+  'netRevenue': true,
+  'ttl': 10800,
+  'ad': 'https://tube.buzzoola.com/xstatic/o42/stoloto/6',
+  'mediaType': 'native',
+  'native': {
+    'body': 'В 1388-м тираже «Русского лото» джекпот',
+    'clickTrackers': [
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/click/'
+    ],
+    'clickUrl': 'https://ad.doubleclick.net/ddm/trackclk/N250204.3446512BUZZOOLA/B25801892.303578321;dc_trk_aid=496248119;dc_trk_cid=151207455;dc_lat=;dc_rdid=;tag_for_child_directed_treatment=;tfua=;ltd=?https://stoloto.onelink.me/mEJM?pid=Buzzoola_mb4&c=rl_10_05_2021&is_retargeting=true&af_ios_url=https%3A%2F%2Fapps.apple.com%2Fru%2Fapp%2F%25D1%2581%25D1%2582%25D0%25BE%25D0%25BB%25D0%25BE%25D1%2582%25D0%25BE-%25D1%2583-%25D0%25BD%25D0%25B0%25D1%2581-%25D0%25B2%25D1%258B%25D0%25B8%25D0%25B3%25D1%2580%25D1%258B%25D0%25B2%25D0%25B0%25D1%258E%25D1%2582%2Fid579961527&af_android_url=https%3A%2F%2Fgalaxystore.samsung.com%2Fdetail%2Fru.stoloto.mobile&af_dp=stolotoone%3A%2F%2Fgames&af_web_dp=https%3A%2F%2Fwww.stoloto.ru%2Fruslotto%2Fgame%3Flastdraw%3Fad%3Dbuzzoola_app_dx_rl_10_05_2021%26utm_source%3Dbuzzoola_app_dx%26utm_medium%3Dcpm%26utm_campaign%3Drl_10_05_2021%26utm_content%3Dbuzzoola_app_dx_mob_native_ios_mb4%26utm_term%3D__6ple2-9znjyg_',
+    'icon': {
+      'height': '100',
+      'url': 'https://tube.buzzoola.com/xstatic/o42/stoloto/logo3.png',
+      'width': '100'
+    },
+    'image': {
+      'height': '450',
+      'url': 'https://tube.buzzoola.com/xstatic/o42/stoloto/6/16x9.png',
+      'width': '800'
+    },
+    'impressionTrackers': [
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/ctor/',
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/impression/?price=${AUCTION_PRICE}&cur=${AUCTION_CURRENCY}',
+      'https://exchange.buzzoola.com/event/6cee890f-1878-4a37-46b3-0107b6c590ae/a1aedc5b-50f2-4a7c-6d24-e235bb1f87ed/m7JVQI9Y7J35_gEDugNO2bIiP2qTqPKfuLrqqh_LoJu0tD6PoLEglMXUBzVpSg75c-unsaijXpJwP8cy-zNH8GX-_nWFkILh/player_seen/',
+      'https://cr.frontend.weborama.fr/cr?key=mailru&url=https%3A%2F%2Fad.mail.ru%2Fcm.gif%3Fp%3D68%26id%3D%7BWEBO_CID%7D'
+    ],
+    'sponsoredBy': 'Buzzoola',
+    'title': 'Test PrebidJS Native'
+  },
+  'meta': {
+    'advertiserDomains': [
+      'buzzoola.com'
+    ]
+  }
+}];
+
+const REQUIRED_NATIVE_FIELDS = [
+  'requestId',
+  'cpm',
+  'width',
+  'height',
+  'ad',
+  'native',
+  'ttl',
+  'creativeId',
+  'netRevenue',
+  'currency',
+  'mediaType',
+  'meta'
 ];
 
 describe('buzzoolaBidAdapter', () => {
@@ -149,18 +260,22 @@ describe('buzzoolaBidAdapter', () => {
   describe('buildRequests', () => {
     let videoBidRequests = [VIDEO_BID];
     let bannerBidRequests = [BANNER_BID];
+    let nativeBidRequests = [NATIVE_BID];
 
     const bannerRequest = spec.buildRequests(bannerBidRequests, BANNER_BID_REQUEST);
+    const nativeRequest = spec.buildRequests(nativeBidRequests, NATIVE_BID_REQUEST);
     const videoRequest = spec.buildRequests(videoBidRequests, VIDEO_BID_REQUEST);
 
     it('sends bid request to ENDPOINT via POST', () => {
       expect(videoRequest.method).to.equal('POST');
       expect(bannerRequest.method).to.equal('POST');
+      expect(nativeRequest.method).to.equal('POST');
     });
 
     it('sends bid request to correct ENDPOINT', () => {
       expect(videoRequest.url).to.equal(ENDPOINT);
       expect(bannerRequest.url).to.equal(ENDPOINT);
+      expect(nativeRequest.url).to.equal(ENDPOINT);
     });
 
     it('sends correct video bid parameters', () => {
@@ -170,6 +285,10 @@ describe('buzzoolaBidAdapter', () => {
     it('sends correct banner bid parameters', () => {
       expect(bannerRequest.data).to.deep.equal(BANNER_BID_REQUEST);
     });
+
+    it('sends correct native bid parameters', () => {
+      expect(nativeRequest.data).to.deep.equal(NATIVE_BID_REQUEST);
+    });
   });
 
   describe('interpretResponse', () => {
@@ -201,6 +320,10 @@ describe('buzzoolaBidAdapter', () => {
       nobidServerResponseCheck(BANNER_BID_REQUEST);
     });
 
+    it('handles native nobid responses', () => {
+      nobidServerResponseCheck(NATIVE_BID_REQUEST);
+    });
+
     it('handles video empty responses', () => {
       nobidServerResponseCheck(VIDEO_BID_REQUEST, emptyResponse);
     });
@@ -209,6 +332,10 @@ describe('buzzoolaBidAdapter', () => {
       nobidServerResponseCheck(BANNER_BID_REQUEST, emptyResponse);
     });
 
+    it('handles native empty responses', () => {
+      nobidServerResponseCheck(NATIVE_BID_REQUEST, emptyResponse);
+    });
+
     it('should get correct video bid response', () => {
       bidServerResponseCheck(VIDEO_RESPONSE, VIDEO_BID_REQUEST, REQUIRED_VIDEO_FIELDS);
     });
@@ -216,6 +343,10 @@ describe('buzzoolaBidAdapter', () => {
     it('should get correct banner bid response', () => {
       bidServerResponseCheck(BANNER_RESPONSE, BANNER_BID_REQUEST, REQUIRED_BANNER_FIELDS);
     });
+
+    it('should get correct native bid response', () => {
+      bidServerResponseCheck(NATIVE_RESPONSE, NATIVE_BID_REQUEST, REQUIRED_NATIVE_FIELDS);
+    });
   });
 
   describe('outstream renderer', () => {
@@ -268,6 +399,7 @@ describe('buzzoolaBidAdapter', () => {
       };
       const spy = sinon.spy(window.Buzzoola.Core, 'install');
       executeRenderer(renderer, result);
+      renderer.callback();
       expect(spy.called).to.be.true;
 
       const spyCall = spy.getCall(0);
diff --git a/test/spec/modules/ccxBidAdapter_spec.js b/test/spec/modules/ccxBidAdapter_spec.js
index f14612629b1..d346a14d38a 100644
--- a/test/spec/modules/ccxBidAdapter_spec.js
+++ b/test/spec/modules/ccxBidAdapter_spec.js
@@ -337,7 +337,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          ad: ''
+          ad: '',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         },
         {
           requestId: '2e56e1af51a5d8',
@@ -348,7 +351,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          vastXml: ''
+          vastXml: '',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         }
       ];
       expect(spec.interpretResponse({body: response})).to.deep.have.same.members(bidResponses);
@@ -366,7 +372,10 @@ describe('ccxAdapter', function () {
           netRevenue: false,
           ttl: 5,
           currency: 'PLN',
-          ad: ''
+          ad: '',
+          meta: {
+            advertiserDomains: ['clickonometrics.com']
+          }
         }
       ];
       expect(spec.interpretResponse({body: response})).to.deep.have.same.members(bidResponses);
@@ -425,4 +434,58 @@ describe('ccxAdapter', function () {
       expect(spec.getUserSyncs(syncOptions, [{body: response}])).to.be.empty;
     });
   });
+  describe('mediaTypesVideoParams', function () {
+    it('Valid video mediaTypes', function () {
+      let bids = [
+        {
+          adUnitCode: 'video',
+          auctionId: '0b9de793-8eda-481e-a548-c187d58b28d9',
+          bidId: '3u94t90ut39tt3t',
+          bidder: 'ccx',
+          bidderRequestId: '23ur20r239r2r',
+          mediaTypes: {
+            video: {
+              playerSize: [[640, 480]],
+              protocols: [2, 3, 5, 6],
+              mimes: ['video/mp4', 'video/x-flv'],
+              playbackmethod: [1, 2, 3, 4],
+              skip: 1,
+              skipafter: 5
+            }
+          },
+          params: {
+            placementId: 608
+          },
+          sizes: [[640, 480]],
+          transactionId: 'aefddd38-cfa0-48ab-8bdd-325de4bab5f9'
+        }
+      ];
+
+      let imps = [
+        {
+          video: {
+            w: 640,
+            h: 480,
+            protocols: [2, 3, 5, 6],
+            mimes: ['video/mp4', 'video/x-flv'],
+            playbackmethod: [1, 2, 3, 4],
+            skip: 1,
+            skipafter: 5
+          },
+          id: '3u94t90ut39tt3t',
+          secure: 1,
+          ext: {
+            pid: 608
+          }
+        }
+      ];
+
+      let bidsClone = utils.deepClone(bids);
+
+      let response = spec.buildRequests(bidsClone, {'bids': bidsClone});
+      let data = JSON.parse(response.data);
+
+      expect(data.imp).to.deep.have.same.members(imps);
+    });
+  });
 });
diff --git a/test/spec/modules/cointrafficBidAdapter_spec.js b/test/spec/modules/cointrafficBidAdapter_spec.js
new file mode 100644
index 00000000000..3755ddc4c4a
--- /dev/null
+++ b/test/spec/modules/cointrafficBidAdapter_spec.js
@@ -0,0 +1,277 @@
+import { expect } from 'chai';
+import { spec } from 'modules/cointrafficBidAdapter.js';
+import { config } from 'src/config.js'
+import * as utils from 'src/utils.js'
+
+const ENDPOINT_URL = 'https://appspb.cointraffic.io/pb/tmp';
+
+describe('cointrafficBidAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'cointraffic',
+      params: {
+        placementId: 'testPlacementId'
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250]
+      ],
+      bidId: 'bidId12345',
+      bidderRequestId: 'bidderRequestId12345',
+      auctionId: 'auctionId12345'
+    };
+
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        bidder: 'cointraffic',
+        params: {
+          placementId: 'testPlacementId'
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [
+          [300, 250]
+        ],
+        bidId: 'bidId12345',
+        bidderRequestId: 'bidderRequestId12345',
+        auctionId: 'auctionId12345'
+      },
+      {
+        bidder: 'cointraffic',
+        params: {
+          placementId: 'testPlacementId'
+        },
+        adUnitCode: 'adunit-code2',
+        sizes: [
+          [300, 250]
+        ],
+        bidId: 'bidId67890"',
+        bidderRequestId: 'bidderRequestId67890',
+        auctionId: 'auctionId12345'
+      }
+    ];
+
+    let bidderRequests = {
+      refererInfo: {
+        numIframes: 0,
+        reachedTop: true,
+        referer: 'https://example.com',
+        stack: [
+          'https://example.com'
+        ]
+      }
+    };
+
+    it('replaces currency with EUR if there is no currency provided', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].data.currency).to.equal('EUR');
+      expect(request[1].data.currency).to.equal('EUR');
+    });
+
+    it('replaces currency with EUR if there is no currency provided', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'currency.bidderCurrencyDefault.cointraffic' ? 'USD' : 'EUR'
+      );
+
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].data.currency).to.equal('USD');
+      expect(request[1].data.currency).to.equal('USD');
+
+      getConfigStub.restore();
+    });
+
+    it('throws an error if currency provided in params is not allowed', function () {
+      const utilsMock = sinon.mock(utils).expects('logError').twice()
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'currency.bidderCurrencyDefault.cointraffic' ? 'BTC' : 'EUR'
+      );
+
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0]).to.undefined;
+      expect(request[1]).to.undefined;
+
+      utilsMock.restore()
+      getConfigStub.restore();
+    });
+
+    it('sends bid request to our endpoint via POST', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].method).to.equal('POST');
+      expect(request[1].method).to.equal('POST');
+    });
+
+    it('attaches source and version to endpoint URL as query params', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequests);
+
+      expect(request[0].url).to.equal(ENDPOINT_URL);
+      expect(request[1].url).to.equal(ENDPOINT_URL);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should get the correct bid response', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'EUR',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {
+        body: {
+          requestId: 'bidId12345',
+          cpm: 3.9,
+          currency: 'EUR',
+          netRevenue: true,
+          width: 300,
+          height: 250,
+          creativeId: 'creativeId12345',
+          ttl: 90,
+          ad: '
I am an ad
 ',
+          mediaType: 'banner',
+          adomain: ['test.com']
+        }
+      };
+
+      let expectedResponse = [{
+        requestId: 'bidId12345',
+        cpm: 3.9,
+        currency: 'EUR',
+        netRevenue: true,
+        width: 300,
+        height: 250,
+        creativeId: 'creativeId12345',
+        ttl: 90,
+        ad: '
I am an ad
',
+        meta: {
+          mediaType: 'banner',
+          advertiserDomains: [
+            'test.com',
+          ]
+        }
+      }];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+    });
+
+    it('should get the correct bid response with different currency', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'USD',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {
+        body: {
+          requestId: 'bidId12345',
+          cpm: 3.9,
+          currency: 'USD',
+          netRevenue: true,
+          width: 300,
+          height: 250,
+          creativeId: 'creativeId12345',
+          ttl: 90,
+          ad: '
I am an ad
 ',
+          mediaType: 'banner',
+          adomain: ['test.com']
+        }
+      };
+
+      let expectedResponse = [{
+        requestId: 'bidId12345',
+        cpm: 3.9,
+        currency: 'USD',
+        netRevenue: true,
+        width: 300,
+        height: 250,
+        creativeId: 'creativeId12345',
+        ttl: 90,
+        ad: '
I am an ad
',
+        meta: {
+          mediaType: 'banner',
+          advertiserDomains: [
+            'test.com',
+          ]
+        }
+      }];
+
+      const getConfigStub = sinon.stub(config, 'getConfig').returns('USD');
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+
+      getConfigStub.restore();
+    });
+
+    it('should get empty bid response requested currency is not available', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'BTC',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {};
+
+      let expectedResponse = [];
+
+      const getConfigStub = sinon.stub(config, 'getConfig').returns('BTC');
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+
+      getConfigStub.restore();
+    });
+
+    it('should get empty bid response if no server response', function () {
+      let bidRequest = [{
+        method: 'POST',
+        url: ENDPOINT_URL,
+        data: {
+          placementId: 'testPlacementId',
+          device: 'desktop',
+          currency: 'EUR',
+          sizes: ['300x250'],
+          bidId: 'bidId12345',
+          referer: 'www.example.com'
+        }
+      }];
+
+      let serverResponse = {};
+
+      let expectedResponse = [];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
+    });
+  });
+});
diff --git a/test/spec/modules/coinzillaBidAdapter_spec.js b/test/spec/modules/coinzillaBidAdapter_spec.js
index a3438b80126..01f22722abf 100644
--- a/test/spec/modules/coinzillaBidAdapter_spec.js
+++ b/test/spec/modules/coinzillaBidAdapter_spec.js
@@ -85,7 +85,6 @@ describe('coinzillaBidAdapter', function () {
           'bidId': 'bidId123',
           'referer': 'www.example.com'
         }
-
       }
     ];
     let serverResponse = {
@@ -98,7 +97,9 @@ describe('coinzillaBidAdapter', function () {
         'requestId': 'bidId123',
         'width': 300,
         'height': 250,
-        'netRevenue': true
+        'netRevenue': true,
+        'mediaType': 'banner',
+        'advertiserDomain': ['none.com']
       }
     };
     it('should get the correct bid response', function () {
@@ -111,7 +112,9 @@ describe('coinzillaBidAdapter', function () {
         'currency': 'EUR',
         'netRevenue': true,
         'ttl': 3000,
-        'ad': '
I am an ad
'
+        'ad': '
I am an ad
',
+        'mediaType': 'banner',
+        'meta': {'advertiserDomains': ['none.com']}
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
index df9bdcbd47b..f6e24d07c63 100644
--- a/test/spec/modules/colossussspBidAdapter_spec.js
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -88,12 +88,13 @@ describe('ColossussspAdapter', function () {
       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');
+        expect(placement).to.have.all.keys('placementId', 'eids', 'bidId', 'traffic', 'sizes', 'schain', 'floor');
         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.sizes).to.be.an('array');
+        expect(placement.floor).to.be.an('object');
       }
     });
     it('Returns empty data if no valid requests are passed', function () {
@@ -108,7 +109,7 @@ describe('ColossussspAdapter', function () {
     bid.userId.britepoolid = 'britepoolid123';
     bid.userId.idl_env = 'idl_env123';
     bid.userId.tdid = 'tdid123';
-    bid.userId.id5id = 'id5id123'
+    bid.userId.id5id = { uid: 'id5id123' };
     let serverRequest = spec.buildRequests([bid], bidderRequest);
     it('Returns valid data if array of bids is valid', function () {
       let data = serverRequest.data;
@@ -126,7 +127,6 @@ describe('ColossussspAdapter', function () {
           expect(v.uids).to.be.an('array');
           expect(v.uids.length).to.be.equal(1)
           expect(v.uids[0]).to.have.property('id')
-          expect(v.uids[0].id).to.be.oneOf(['britepoolid123', 'idl_env123', 'tdid123', 'id5id123'])
         }
       }
     });
diff --git a/test/spec/modules/concertAnalyticsAdapter_spec.js b/test/spec/modules/concertAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..b0aad2f3156
--- /dev/null
+++ b/test/spec/modules/concertAnalyticsAdapter_spec.js
@@ -0,0 +1,157 @@
+import concertAnalytics from 'modules/concertAnalyticsAdapter.js';
+import { expect } from 'chai';
+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;
+  let xhr;
+  let requests;
+  let clock;
+  let timestamp = 1896134400;
+  let auctionId = '9f894496-10fe-4652-863d-623462bf82b8';
+  let timeout = 1000;
+
+  before(function () {
+    sandbox = sinon.createSandbox();
+    xhr = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+
+    xhr.onCreate = function (request) {
+      requests.push(request);
+    };
+    clock = sandbox.useFakeTimers(1896134400);
+  });
+
+  after(function () {
+    sandbox.restore();
+  });
+
+  describe('track', function() {
+    beforeEach(function () {
+      sandbox.stub(events, 'getEvents').returns([]);
+
+      adapterManager.enableAnalytics({
+        provider: 'concert'
+      });
+    });
+
+    afterEach(function () {
+      events.getEvents.restore();
+      concertAnalytics.eventsStorage = [];
+      concertAnalytics.disableAnalytics();
+    });
+
+    it('should catch all events', function() {
+      sandbox.spy(concertAnalytics, 'track');
+
+      fireBidEvents(events);
+      sandbox.assert.callCount(concertAnalytics.track, 5);
+    });
+
+    it('should report data for BID_RESPONSE, BID_WON events', function() {
+      fireBidEvents(events);
+      clock.tick(3000 + 1000);
+
+      const eventsToReport = ['bidResponse', 'bidWon'];
+      for (var i = 0; i < concertAnalytics.eventsStorage.length; i++) {
+        expect(eventsToReport.indexOf(concertAnalytics.eventsStorage[i].event)).to.be.above(-1);
+      }
+
+      for (var i = 0; i < eventsToReport.length; i++) {
+        expect(concertAnalytics.eventsStorage.some(function(event) {
+          return event.event === eventsToReport[i]
+        })).to.equal(true);
+      }
+    });
+
+    it('should report data in the shape expected by analytics endpoint', function() {
+      fireBidEvents(events);
+      clock.tick(3000 + 1000);
+
+      const requiredFields = ['event', 'concert_rid', 'adId', 'auctionId', 'creativeId', 'position', 'url', 'cpm', 'width', 'height', 'timeToRespond'];
+
+      for (var i = 0; i < requiredFields.length; i++) {
+        expect(concertAnalytics.eventsStorage[0]).to.have.property(requiredFields[i]);
+      }
+    });
+  });
+
+  const adUnits = [{
+    code: 'desktop_leaderboard_variable',
+    sizes: [[1030, 590]],
+    mediaTypes: {
+      banner: {
+        sizes: [[1030, 590]]
+      }
+    },
+    bids: [
+      {
+        bidder: 'concert',
+        params: {
+          partnerId: 'test_partner'
+        }
+      }
+    ]
+  }];
+
+  const bidResponse = {
+    'bidderCode': 'concert',
+    'width': 1030,
+    'height': 590,
+    'statusMessage': 'Bid available',
+    'adId': '642f13fe18ab7dc',
+    'requestId': '4062fba2e039919',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 6,
+    'ad': '',
+    'ttl': 360,
+    'creativeId': '138308483085|62bac030-a5d3-11ea-b3be-55590c8153a5',
+    'netRevenue': false,
+    'currency': 'USD',
+    'originalCpm': 6,
+    'originalCurrency': 'USD',
+    'auctionId': '9f894496-10fe-4652-863d-623462bf82b8',
+    'responseTimestamp': 1591213790366,
+    'requestTimestamp': 1591213790017,
+    'bidder': 'concert',
+    'adUnitCode': 'desktop_leaderboard_variable',
+    'timeToRespond': 349,
+    'status': 'rendered',
+    'params': [
+      {
+        'partnerId': 'cst'
+      }
+    ]
+  }
+
+  const bidWon = {
+    'adId': '642f13fe18ab7dc',
+    'mediaType': 'banner',
+    'requestId': '4062fba2e039919',
+    'cpm': 6,
+    'creativeId': '138308483085|62bac030-a5d3-11ea-b3be-55590c8153a5',
+    'currency': 'USD',
+    'netRevenue': false,
+    'ttl': 360,
+    'auctionId': '9f894496-10fe-4652-863d-623462bf82b8',
+    'statusMessage': 'Bid available',
+    'responseTimestamp': 1591213790366,
+    'requestTimestamp': 1591213790017,
+    'bidder': 'concert',
+    'adUnitCode': 'desktop_leaderboard_variable',
+    'sizes': [[1030, 590]],
+    'size': [1030, 590]
+  }
+
+  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);
+  }
+});
diff --git a/test/spec/modules/concertBidAdapter_spec.js b/test/spec/modules/concertBidAdapter_spec.js
new file mode 100644
index 00000000000..1b869d51bde
--- /dev/null
+++ b/test/spec/modules/concertBidAdapter_spec.js
@@ -0,0 +1,219 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { spec } from 'modules/concertBidAdapter.js';
+import { getStorageManager } from '../../../src/storageManager.js'
+
+describe('ConcertAdapter', function () {
+  let bidRequests;
+  let bidRequest;
+  let bidResponse;
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'concert',
+        params: {
+          partnerId: 'foo',
+          slotType: 'fizz'
+        },
+        adUnitCode: 'desktop_leaderboard_variable',
+        bidId: 'foo',
+        transactionId: '',
+        sizes: [[1030, 590]]
+      }
+    ];
+
+    bidRequest = {
+      refererInfo: {
+        referer: 'https://www.google.com'
+      },
+      uspConsent: '1YYY',
+      gdprConsent: {}
+    };
+
+    bidResponse = {
+      body: {
+        bids: [
+          {
+            bidId: '16d2e73faea32d9',
+            cpm: '6',
+            width: '1030',
+            height: '590',
+            ad: '',
+            ttl: '360',
+            creativeId: '123349|a7d62700-a4bf-11ea-829f-ad3b0b7a9383',
+            netRevenue: false,
+            currency: 'USD'
+          }
+        ]
+      }
+    }
+  });
+
+  describe('spec.isBidRequestValid', function() {
+    it('should return when it recieved all the required params', function() {
+      const bid = bidRequests[0];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when partner id is missing', function() {
+      const bid = {
+        bidder: 'concert',
+        params: {}
+      }
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('spec.buildRequests', function() {
+    it('should build a payload object with the shape expected by server', function() {
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload).to.have.property('meta');
+      expect(payload).to.have.property('slots');
+
+      const metaRequiredFields = ['prebidVersion', 'pageUrl', 'screen', 'debug', 'uid', 'optedOut', 'adapterVersion', 'uspConsent', 'gdprConsent'];
+      const slotsRequiredFields = ['name', 'bidId', 'transactionId', 'sizes', 'partnerId', 'slotType'];
+
+      metaRequiredFields.forEach(function(field) {
+        expect(payload.meta).to.have.property(field);
+      });
+      slotsRequiredFields.forEach(function(field) {
+        expect(payload.slots[0]).to.have.property(field);
+      });
+    });
+
+    it('should not generate uid if the user has opted out', function() {
+      const storage = getStorageManager();
+      storage.setDataInLocalStorage('c_nap', 'true');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.equal(false);
+    });
+
+    it('should generate uid if the user has not opted out', function() {
+      const storage = getStorageManager();
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.not.equal(false);
+    });
+
+    it('should grab uid from local storage if it exists', function() {
+      const storage = getStorageManager();
+      storage.setDataInLocalStorage('c_uid', 'foo');
+      storage.removeDataFromLocalStorage('c_nap');
+      const request = spec.buildRequests(bidRequests, bidRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.meta.uid).to.equal('foo');
+    });
+  });
+
+  describe('spec.interpretResponse', function() {
+    it('should return bids in the shape expected by prebid', function() {
+      const bids = spec.interpretResponse(bidResponse, bidRequest);
+      const requiredFields = ['requestId', 'cpm', 'width', 'height', 'ad', 'ttl', 'meta', 'creativeId', 'netRevenue', 'currency'];
+
+      requiredFields.forEach(function(field) {
+        expect(bids[0]).to.have.property(field);
+      });
+    });
+
+    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);
+    });
+
+    it('should return empty bids if there are no bids from the server', function() {
+      const bids = spec.interpretResponse({ body: {bids: []} }, bidRequest);
+      expect(bids).to.have.lengthOf(0);
+    });
+  });
+
+  describe('spec.getUserSyncs', function() {
+    it('should not register syncs when iframe is not enabled', function() {
+      const opts = {
+        iframeEnabled: false
+      }
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync).to.have.lengthOf(0);
+    });
+
+    it('should not register syncs when the user has opted out', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      const storage = getStorageManager();
+      storage.setDataInLocalStorage('c_nap', 'true');
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync).to.have.lengthOf(0);
+    });
+
+    it('should set gdprApplies flag to 1 if the user is in area where GDPR applies', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      const storage = getStorageManager();
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: true
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_applies=1');
+    });
+
+    it('should set gdprApplies flag to 1 if the user is in area where GDPR applies', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      const storage = getStorageManager();
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_applies=0');
+    });
+
+    it('should set gdpr consent param with the user\'s choices on consent', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      const storage = getStorageManager();
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false,
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A=='
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('gdpr_consent=BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+    });
+
+    it('should set ccpa consent param with the user\'s choices on consent', function() {
+      const opts = {
+        iframeEnabled: true
+      };
+      const storage = getStorageManager();
+      storage.removeDataFromLocalStorage('c_nap');
+
+      bidRequest.gdprConsent = {
+        gdprApplies: false,
+        uspConsent: '1YYY'
+      };
+
+      const sync = spec.getUserSyncs(opts, [], bidRequest.gdprConsent, bidRequest.uspConsent);
+      expect(sync[0].url).to.have.string('usp_consent=1YY');
+    });
+  });
+});
diff --git a/test/spec/modules/connectadBidAdapter_spec.js b/test/spec/modules/connectadBidAdapter_spec.js
index 626018241c4..657bc432d06 100644
--- a/test/spec/modules/connectadBidAdapter_spec.js
+++ b/test/spec/modules/connectadBidAdapter_spec.js
@@ -14,7 +14,8 @@ describe('ConnectAd Adapter', function () {
         bidder: 'conntectad',
         params: {
           siteId: 123456,
-          networkId: 123456
+          networkId: 123456,
+          bidfloor: 0.50
         },
         adUnitCode: '/19968336/header-bid-tag-1',
         mediaTypes: {
@@ -46,8 +47,7 @@ describe('ConnectAd Adapter', function () {
       bidderRequestId: '1c56ad30b9b8ca8',
       transactionId: 'e76cbb58-f3e1-4ad9-9f4c-718c1919d0df',
       userId: {
-        tdid: '123456',
-        digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
+        tdid: '123456'
       }
     }];
 
@@ -84,7 +84,6 @@ describe('ConnectAd Adapter', function () {
           }
         };
         const isValid = spec.isBidRequestValid(validBid);
-
         expect(isValid).to.equal(true);
       });
 
@@ -154,6 +153,29 @@ describe('ConnectAd Adapter', function () {
         expect(requestparse.placements[0].networkId).to.equal(123456);
       });
 
+      it('should process floors module if available', function() {
+        const floorInfo = {
+          currency: 'USD',
+          floor: 5.20
+        };
+        bidRequests[0].getFloor = () => floorInfo;
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(5.20);
+      });
+
+      it('should be bidfloor if no floormodule is available', function() {
+        const request = spec.buildRequests(bidRequests, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(0.50);
+      });
+
+      it('should have 0 bidfloor value', function() {
+        const request = spec.buildRequests(bidRequestsUserIds, bidderRequest);
+        const requestparse = JSON.parse(request.data);
+        expect(requestparse.placements[0].bidfloor).to.equal(0);
+      });
+
       it('should contain gdpr info', function () {
         const request = spec.buildRequests(bidRequests, bidderRequest);
         const requestparse = JSON.parse(request.data);
@@ -227,7 +249,6 @@ describe('ConnectAd Adapter', function () {
         const requestparse = JSON.parse(request.data);
         expect(requestparse.user.ext.eids).to.be.an('array');
         expect(requestparse.user.ext.eids[0].uids[0].id).to.equal('123456');
-        expect(requestparse.user.ext.digitrust.id).to.equal('DTID');
       });
 
       it('should add referer info', function () {
@@ -282,7 +303,43 @@ describe('ConnectAd Adapter', function () {
     });
 
     describe('bid responses', function () {
-      it('should return complete bid response', function () {
+      it('should return complete bid response with adomain', function () {
+        const ADOMAINS = ['connectad.io'];
+
+        let serverResponse = {
+          body: {
+            decisions: {
+              '2f95c00074b931': {
+                adId: '0',
+                adomain: ['connectad.io'],
+                contents: [
+                  {
+                    body: '<<<---- Creative --->>>'
+                  }
+                ],
+                height: '250',
+                width: '300',
+                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);
+      });
+
+      it('should return complete bid response with empty adomain', function () {
+        const ADOMAINS = [];
+
         let serverResponse = {
           body: {
             decisions: {
@@ -310,6 +367,7 @@ describe('ConnectAd Adapter', function () {
         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);
       });
 
       it('should return empty bid response', function () {
diff --git a/test/spec/modules/consentManagementUsp_spec.js b/test/spec/modules/consentManagementUsp_spec.js
index 2e8d7db92b5..7d3cd48a8e4 100644
--- a/test/spec/modules/consentManagementUsp_spec.js
+++ b/test/spec/modules/consentManagementUsp_spec.js
@@ -64,6 +64,13 @@ describe('consentManagement', function () {
         sinon.assert.calledOnce(utils.logWarn);
         sinon.assert.notCalled(utils.logInfo);
       });
+
+      it('should exit consentManagementUsp module if config is "undefined"', function() {
+        setConsentConfig(undefined);
+        expect(consentAPI).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+        sinon.assert.notCalled(utils.logInfo);
+      });
     });
 
     describe('valid setConsentConfig value', function () {
@@ -185,7 +192,10 @@ describe('consentManagement', function () {
         resetConsentData();
       });
 
-      it('should bypass CMP and simply use previously stored consentData', function () {
+      // from prebid 4425 - "the USP (CCPA) api function __uspapi() always responds synchronously, whether or not privacy data is available, while the GDPR CMP may respond asynchronously
+      // Because the USP API does not wait for a user response, if it was not successfully obtained before the first auction, we should try again to retrieve privacy data before each subsequent auction.
+
+      it('should not bypass CMP and simply use previously stored consentData', function () {
         let testConsentData = {
           uspString: '1YY'
         };
@@ -208,7 +218,7 @@ describe('consentManagement', function () {
         let consent = uspDataHandler.getConsentData();
         expect(didHookReturn).to.be.true;
         expect(consent).to.equal(testConsentData.uspString);
-        sinon.assert.notCalled(uspStub);
+        sinon.assert.called(uspStub);
       });
     });
 
diff --git a/test/spec/modules/consentManagement_spec.js b/test/spec/modules/consentManagement_spec.js
index c4f6fe70dd1..5e9b0f07f46 100644
--- a/test/spec/modules/consentManagement_spec.js
+++ b/test/spec/modules/consentManagement_spec.js
@@ -24,9 +24,8 @@ describe('consentManagement', function () {
         setConsentConfig({});
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(10000);
-        expect(allowAuction).to.be.true;
         expect(gdprScope).to.be.equal(false);
-        sinon.assert.callCount(utils.logInfo, 4);
+        sinon.assert.callCount(utils.logInfo, 3);
       });
 
       it('should exit consent manager if config is not an object', function () {
@@ -40,6 +39,12 @@ describe('consentManagement', function () {
         expect(userCMP).to.be.undefined;
         sinon.assert.calledOnce(utils.logWarn);
       });
+
+      it('should exit consentManagement module if config is "undefined"', function() {
+        setConsentConfig(undefined);
+        expect(userCMP).to.be.undefined;
+        sinon.assert.calledOnce(utils.logWarn);
+      });
     });
 
     describe('valid setConsentConfig value', function () {
@@ -58,7 +63,10 @@ describe('consentManagement', function () {
         setConsentConfig(allConfig);
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(7500);
-        expect(allowAuction).to.be.false;
+        expect(allowAuction).to.deep.equal({
+          value: false,
+          definedInConfig: true
+        });
         expect(gdprScope).to.be.true;
       });
 
@@ -110,7 +118,10 @@ describe('consentManagement', function () {
 
         expect(userCMP).to.be.equal('iab');
         expect(consentTimeout).to.be.equal(3333);
-        expect(allowAuction).to.be.equal(false);
+        expect(allowAuction).to.deep.equal({
+          value: false,
+          definedInConfig: true
+        });
         expect(gdprScope).to.be.equal(false);
       });
     });
@@ -164,7 +175,10 @@ describe('consentManagement', function () {
         setConsentConfig(staticConfig);
         expect(userCMP).to.be.equal('static');
         expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
-        expect(allowAuction).to.be.false;
+        expect(allowAuction).to.deep.equal({
+          value: false,
+          definedInConfig: true
+        });
         expect(staticConsentData).to.be.equal(staticConfig.consentData);
       });
 
@@ -244,7 +258,10 @@ describe('consentManagement', function () {
         setConsentConfig(staticConfig);
         expect(userCMP).to.be.equal('static');
         expect(consentTimeout).to.be.equal(0); // should always return without a timeout when config is used
-        expect(allowAuction).to.be.false;
+        expect(allowAuction).to.deep.equal({
+          value: false,
+          definedInConfig: true
+        });
         expect(gdprScope).to.be.equal(false);
         expect(staticConsentData).to.be.equal(staticConfig.consentData);
       });
@@ -423,7 +440,6 @@ describe('consentManagement', function () {
           setConsentConfig(goodConfigWithAllowAuction);
           requestBidsHook(() => {
             let consent = gdprDataHandler.getConsentData();
-            sinon.assert.notCalled(utils.logWarn);
             sinon.assert.notCalled(utils.logError);
             expect(consent.consentString).to.equal(tarConsentString);
             expect(consent.gdprApplies).to.be.true;
@@ -521,6 +537,15 @@ describe('consentManagement', function () {
         // from CMP window postMessage listener.
         testIFramedPage('with/JSON response', false, 'encoded_consent_data_via_post_message', 1);
         testIFramedPage('with/String response', true, 'encoded_consent_data_via_post_message', 1);
+
+        it('should contain correct V1 CMP definition', (done) => {
+          setConsentConfig(goodConfigWithAllowAuction);
+          requestBidsHook(() => {
+            const nbArguments = window.__cmp.toString().split('\n')[0].split(', ').length;
+            expect(nbArguments).to.equal(3);
+            done();
+          }, {});
+        });
       });
 
       describe('v2 CMP workflow for iframe pages:', function () {
@@ -546,6 +571,15 @@ describe('consentManagement', function () {
 
         testIFramedPage('with/JSON response', false, 'abc12345234', 2);
         testIFramedPage('with/String response', true, 'abc12345234', 2);
+
+        it('should contain correct v2 CMP definition', (done) => {
+          setConsentConfig(goodConfigWithAllowAuction);
+          requestBidsHook(() => {
+            const nbArguments = window.__tcfapi.toString().split('\n')[0].split(', ').length;
+            expect(nbArguments).to.equal(4);
+            done();
+          }, {});
+        });
       });
     });
 
@@ -626,7 +660,6 @@ describe('consentManagement', function () {
             didHookReturn = true;
           }, {});
           let consent = gdprDataHandler.getConsentData();
-          sinon.assert.notCalled(utils.logWarn);
           sinon.assert.notCalled(utils.logError);
           expect(didHookReturn).to.be.true;
           expect(consent.consentString).to.equal(testConsentData.tcString);
@@ -634,7 +667,33 @@ describe('consentManagement', function () {
           expect(consent.apiVersion).to.equal(2);
         });
 
-        it('throws an error when processCmpData check failed while config had allowAuction set to false', function () {
+        it('performs lookup check and stores consentData for a valid existing user with additional consent', function () {
+          let testConsentData = {
+            tcString: 'abc12345234',
+            addtlConsent: 'superduperstring',
+            gdprApplies: true,
+            purposeOneTreatment: false,
+            eventStatus: 'tcloaded'
+          };
+          cmpStub = sinon.stub(window, '__tcfapi').callsFake((...args) => {
+            args[2](testConsentData, true);
+          });
+
+          setConsentConfig(goodConfigWithAllowAuction);
+
+          requestBidsHook(() => {
+            didHookReturn = true;
+          }, {});
+          let consent = gdprDataHandler.getConsentData();
+          sinon.assert.notCalled(utils.logError);
+          expect(didHookReturn).to.be.true;
+          expect(consent.consentString).to.equal(testConsentData.tcString);
+          expect(consent.addtlConsent).to.equal(testConsentData.addtlConsent);
+          expect(consent.gdprApplies).to.be.true;
+          expect(consent.apiVersion).to.equal(2);
+        });
+
+        it('throws an error when processCmpData check fails + does not call requestBids callbcack even when allowAuction is true', function () {
           let testConsentData = {};
           let bidsBackHandlerReturn = false;
 
@@ -642,7 +701,7 @@ describe('consentManagement', function () {
             args[2](testConsentData);
           });
 
-          setConsentConfig(goodConfigWithCancelAuction);
+          setConsentConfig(goodConfigWithAllowAuction);
 
           requestBidsHook(() => {
             didHookReturn = true;
@@ -650,6 +709,7 @@ describe('consentManagement', function () {
           let consent = gdprDataHandler.getConsentData();
 
           sinon.assert.calledOnce(utils.logError);
+          sinon.assert.notCalled(utils.logWarn);
           expect(didHookReturn).to.be.false;
           expect(bidsBackHandlerReturn).to.be.true;
           expect(consent).to.be.null;
@@ -676,34 +736,12 @@ describe('consentManagement', function () {
             didHookReturn = true;
           }, {});
           let consent = gdprDataHandler.getConsentData();
-          sinon.assert.notCalled(utils.logWarn);
           sinon.assert.notCalled(utils.logError);
           expect(didHookReturn).to.be.true;
           expect(consent.consentString).to.equal(testConsentData.tcString);
           expect(consent.gdprApplies).to.be.true;
           expect(consent.apiVersion).to.equal(2);
         });
-
-        it('throws a warning + stores consentData + calls callback when processCmpData check failed while config had allowAuction set to true', function () {
-          let testConsentData = {};
-
-          cmpStub = sinon.stub(window, '__tcfapi').callsFake((...args) => {
-            args[2](testConsentData);
-          });
-
-          setConsentConfig(goodConfigWithAllowAuction);
-
-          requestBidsHook(() => {
-            didHookReturn = true;
-          }, {});
-          let consent = gdprDataHandler.getConsentData();
-
-          sinon.assert.calledOnce(utils.logWarn);
-          expect(didHookReturn).to.be.true;
-          expect(consent.consentString).to.be.undefined;
-          expect(consent.gdprApplies).to.be.false;
-          expect(consent.apiVersion).to.equal(2);
-        });
       });
     });
   });
diff --git a/test/spec/modules/consumableBidAdapter_spec.js b/test/spec/modules/consumableBidAdapter_spec.js
index 44076194885..f0b02913f96 100644
--- a/test/spec/modules/consumableBidAdapter_spec.js
+++ b/test/spec/modules/consumableBidAdapter_spec.js
@@ -299,6 +299,7 @@ describe('Consumable BidAdapter', function () {
         expect(b).to.have.property('currency', 'USD');
         expect(b).to.have.property('creativeId');
         expect(b).to.have.property('ttl', 30);
+        expect(b.meta).to.have.property('advertiserDomains');
         expect(b).to.have.property('netRevenue', true);
         expect(b).to.have.property('referrer');
       });
diff --git a/test/spec/modules/conversantBidAdapter_spec.js b/test/spec/modules/conversantBidAdapter_spec.js
index d802cd288ef..96a7f419341 100644
--- a/test/spec/modules/conversantBidAdapter_spec.js
+++ b/test/spec/modules/conversantBidAdapter_spec.js
@@ -339,6 +339,7 @@ describe('Conversant adapter tests', function() {
     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);
@@ -483,7 +484,7 @@ describe('Conversant adapter tests', function() {
       const payload = spec.buildRequests(requests).data;
       expect(payload).to.have.deep.nested.property('user.ext.eids', [
         {source: 'adserver.org', uids: [{id: '223344', atype: 1, ext: {rtiPartner: 'TDID'}}]},
-        {source: 'liveramp.com', uids: [{id: '334455', atype: 1}]}
+        {source: 'liveramp.com', uids: [{id: '334455', atype: 3}]}
       ]);
     });
   });
@@ -587,4 +588,77 @@ describe('Conversant adapter tests', function() {
       expect(payload).to.have.deep.nested.property('user.ext.fpc', 'fghijk');
     });
   });
+
+  describe('price floor module', function() {
+    let bidRequest;
+    beforeEach(function() {
+      bidRequest = [utils.deepClone(bidRequests[0])];
+      delete bidRequest[0].params.bidfloor;
+    });
+
+    it('obtain floor from getFloor', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.21
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 3.21);
+    });
+
+    it('obtain floor from params', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 3.21
+        };
+      };
+      bidRequest[0].params.bidfloor = 0.6;
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0.6);
+    });
+
+    it('unsupported currency', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'EUR',
+          floor: 1.23
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('bad floor value', function() {
+      bidRequest[0].getFloor = () => {
+        return {
+          currency: 'USD',
+          floor: 'test'
+        };
+      };
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('empty floor object', function() {
+      bidRequest[0].getFloor = () => {
+        return {};
+      };
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+
+    it('undefined floor result', function() {
+      bidRequest[0].getFloor = () => {};
+
+      const payload = spec.buildRequests(bidRequest).data;
+      expect(payload.imp[0]).to.have.property('bidfloor', 0);
+    });
+  });
 });
diff --git a/test/spec/modules/cpmstarBidAdapter_spec.js b/test/spec/modules/cpmstarBidAdapter_spec.js
old mode 100755
new mode 100644
index 1993f28e5d5..285fca9690a
--- a/test/spec/modules/cpmstarBidAdapter_spec.js
+++ b/test/spec/modules/cpmstarBidAdapter_spec.js
@@ -3,6 +3,41 @@ import { spec } from 'modules/cpmstarBidAdapter.js';
 import { deepClone } from 'src/utils.js';
 import { config } from 'src/config.js';
 
+const valid_bid_requests = [{
+  'bidder': 'cpmstar',
+  'params': {
+    'placementId': '57'
+  },
+  'sizes': [[300, 250]],
+  'bidId': 'bidId'
+}];
+
+const bidderRequest = {
+  refererInfo: {
+    referer: 'referer',
+    reachedTop: false,
+  }
+};
+
+const serverResponse = {
+  body: [{
+    creatives: [{
+      cpm: 1,
+      width: 0,
+      height: 0,
+      currency: 'USD',
+      netRevenue: true,
+      ttl: 1,
+      creativeid: '1234',
+      requestid: '11123',
+      code: 'no idea',
+      media: 'banner',
+    }
+    ],
+    syncs: [{ type: 'image', url: 'https://server.cpmstar.com/pixel.aspx' }]
+  }]
+};
+
 describe('Cpmstar Bid Adapter', function () {
   describe('isBidRequestValid', function () {
     it('should return true since the bid is valid',
@@ -42,23 +77,6 @@ describe('Cpmstar Bid Adapter', function () {
   });
 
   describe('buildRequests', function () {
-    const valid_bid_requests = [{
-      'bidder': 'cpmstar',
-      'params': {
-        'placementId': '57'
-      },
-      'sizes': [[300, 250]],
-      'bidId': 'bidId'
-    }];
-
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'referer',
-        reachedTop: false,
-      }
-
-    };
-
     it('should produce a valid production request', function () {
       var requests = spec.buildRequests(valid_bid_requests, bidderRequest);
       expect(requests[0]).to.have.property('method');
@@ -109,7 +127,30 @@ describe('Cpmstar Bid Adapter', function () {
       expect(requests[0]).to.have.property('url');
       expect(requests[0].url).to.include('tfcd=1');
     });
-  })
+  });
+
+  it('should produce a request with support for OpenRTB SupplyChain', function () {
+    var reqs = deepClone(valid_bid_requests);
+    reqs[0].schain = {
+      'ver': '1.0',
+      'complete': 1,
+      'nodes': [
+        {
+          'asi': 'exchange1.com',
+          'sid': '1234',
+          'hp': 1
+        },
+        {
+          'asi': 'exchange2.com',
+          'sid': 'abcd',
+          'hp': 1
+        }
+      ]
+    };
+    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,,,');
+  });
 
   describe('interpretResponse', function () {
     const request = {
@@ -117,23 +158,6 @@ describe('Cpmstar Bid Adapter', function () {
         mediaType: 'BANNER'
       }
     };
-    const serverResponse = {
-      body: [{
-        creatives: [{
-          cpm: 1,
-          width: 0,
-          height: 0,
-          currency: 'USD',
-          netRevenue: true,
-          ttl: 1,
-          creativeid: '1234',
-          requestid: '11123',
-          code: 'no idea',
-          media: 'banner',
-        }
-        ],
-      }]
-    };
 
     it('should return a valid bidresponse array', function () {
       var r = spec.interpretResponse(serverResponse, request)
@@ -185,4 +209,23 @@ describe('Cpmstar Bid Adapter', function () {
       expect(spec.interpretResponse(dealServer, request)[0].dealId).to.equal('deal');
     });
   });
+
+  describe('getUserSyncs', function () {
+    var sres = [deepClone(serverResponse)];
+
+    it('should return a valid pixel sync', function () {
+      var syncs = spec.getUserSyncs({ pixelEnabled: true }, sres);
+      expect(syncs.length).equal(1);
+      expect(syncs[0].type).equal('image');
+      expect(syncs[0].url).equal('https://server.cpmstar.com/pixel.aspx');
+    });
+
+    it('should return a valid iframe sync', function () {
+      sres[0].body[0].syncs[0].type = 'iframe';
+      var syncs = spec.getUserSyncs({ iframeEnabled: true }, sres);
+      expect(syncs.length).equal(1);
+      expect(syncs[0].type).equal('iframe');
+      expect(syncs[0].url).equal('https://server.cpmstar.com/pixel.aspx');
+    });
+  });
 });
diff --git a/test/spec/modules/craftBidAdapter_spec.js b/test/spec/modules/craftBidAdapter_spec.js
index ef7dd7c3232..3f4bc977016 100644
--- a/test/spec/modules/craftBidAdapter_spec.js
+++ b/test/spec/modules/craftBidAdapter_spec.js
@@ -81,7 +81,7 @@ describe('craftAdapter', function () {
     it('sends bid request to ENDPOINT via POST', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.method).to.equal('POST');
-      expect(request.url).to.equal('https://gacraft.jp/prebid-v3');
+      expect(request.url).to.equal('https://gacraft.jp/prebid-v3/craft-prebid-example');
       let data = JSON.parse(request.data);
       expect(data.tags).to.deep.equals([{
         sitekey: 'craft-prebid-example',
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
index c5068d11d31..cad1e3f8114 100755
--- a/test/spec/modules/criteoBidAdapter_spec.js
+++ b/test/spec/modules/criteoBidAdapter_spec.js
@@ -820,14 +820,18 @@ describe('The Criteo bidding adapter', function () {
     it('should properly build a request with first party data', function () {
       const contextData = {
         keywords: ['power tools'],
-        data: {
-          pageType: 'article'
+        ext: {
+          data: {
+            pageType: 'article'
+          }
         }
       };
       const userData = {
         gender: 'M',
-        data: {
-          registered: true
+        ext: {
+          data: {
+            registered: true
+          }
         }
       };
       const bidRequests = [
@@ -842,8 +846,8 @@ describe('The Criteo bidding adapter', function () {
               bidfloor: 0.75
             }
           },
-          fpd: {
-            context: {
+          ortb2Imp: {
+            ext: {
               data: {
                 someContextAttribute: 'abc'
               }
@@ -854,8 +858,8 @@ describe('The Criteo bidding adapter', function () {
 
       sandbox.stub(config, 'getConfig').callsFake(key => {
         const config = {
-          fpd: {
-            context: contextData,
+          ortb2: {
+            site: contextData,
             user: userData
           }
         };
@@ -863,8 +867,8 @@ describe('The Criteo bidding adapter', function () {
       });
 
       const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.publisher.ext).to.deep.equal(contextData);
-      expect(request.data.user.ext).to.deep.equal(userData);
+      expect(request.data.publisher.ext).to.deep.equal({keywords: ['power tools'], data: {pageType: 'article'}});
+      expect(request.data.user.ext).to.deep.equal({gender: 'M', data: {registered: true}});
       expect(request.data.slots[0].ext).to.deep.equal({
         bidfloor: 0.75,
         data: {
@@ -992,6 +996,7 @@ describe('The Criteo bidding adapter', function () {
             zoneid: 123,
             native: {
               'products': [{
+                'sendTargetingKeys': false,
                 'title': 'Product title',
                 'description': 'Product desc',
                 'price': '100',
@@ -1027,7 +1032,6 @@ describe('The Criteo bidding adapter', function () {
           native: true,
         }]
       };
-      config.setConfig({'enableSendAllBids': false});
       const bids = spec.interpretResponse(response, request);
       expect(bids).to.have.lengthOf(1);
       expect(bids[0].requestId).to.equal('test-bidId');
@@ -1036,61 +1040,87 @@ describe('The Criteo bidding adapter', function () {
       expect(bids[0].mediaType).to.equal(NATIVE);
     });
 
-    it('should not parse bid response with native when enableSendAllBids is true', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
-        },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+    it('should warn only once if sendTargetingKeys set to true on required fields for native bidRequest', () => {
+      const bidderRequest = { };
+      const bidRequests = [
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-123',
+          transactionId: 'transaction-123',
+          sizes: [[728, 90]],
           params: {
             zoneId: 123,
+            publisherSubId: '123',
+            nativeCallback: function() {}
           },
-          native: true,
-        }]
-      };
-      config.setConfig({'enableSendAllBids': true});
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
-    });
-
-    it('should not parse bid response with native when enableSendAllBids is not set', function () {
-      const response = {
-        body: {
-          slots: [{
-            impid: 'test-requestId',
-            bidId: 'abc123',
-            cpm: 1.23,
-            width: 728,
-            height: 90,
-            zoneid: 123,
-            native: {}
-          }],
         },
-      };
-      const request = {
-        bidRequests: [{
-          adUnitCode: 'test-requestId',
-          bidId: 'test-bidId',
+        {
+          bidder: 'criteo',
+          adUnitCode: 'bid-456',
+          transactionId: 'transaction-456',
+          sizes: [[728, 90]],
           params: {
-            zoneId: 123,
+            zoneId: 456,
+            publisherSubId: '456',
+            nativeCallback: function() {}
           },
-          native: true,
-        }]
-      };
-      const bids = spec.interpretResponse(response, request);
-      expect(bids).to.have.lengthOf(0);
+        },
+      ];
+
+      const nativeParamsWithSendTargetingKeys = [
+        {
+          nativeParams: {
+            image: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            icon: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            clickUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            displayUrl: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          nativeParams: {
+            privacyLink: {
+              sendTargetingKeys: true
+            },
+          }
+        },
+        {
+          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 () {
diff --git a/test/spec/modules/criteoIdSystem_spec.js b/test/spec/modules/criteoIdSystem_spec.js
index aa5807da0da..65e5aaf741d 100644
--- a/test/spec/modules/criteoIdSystem_spec.js
+++ b/test/spec/modules/criteoIdSystem_spec.js
@@ -71,7 +71,6 @@ describe('CriteoId module', function () {
   });
 
   it('should call user sync url with the right params', function () {
-    getCookieStub.withArgs('cto_test_cookie').returns('1');
     getCookieStub.withArgs('cto_bundle').returns('bundle');
     window.criteo_pubtag = {}
 
@@ -80,7 +79,7 @@ describe('CriteoId module', function () {
     ajaxBuilderStub.callsFake(mockResponse(undefined, ajaxStub))
 
     criteoIdSubmodule.getId();
-    const expectedUrl = `https://gum.criteo.com/sid/json?origin=prebid&topUrl=https%3A%2F%2Ftestdev.com%2F&domain=testdev.com&bundle=bundle&cw=1&pbt=1`;
+    const expectedUrl = `https://gum.criteo.com/sid/json?origin=prebid&topUrl=https%3A%2F%2Ftestdev.com%2F&domain=testdev.com&bundle=bundle&cw=1&pbt=1&lsw=1`;
 
     expect(ajaxStub.calledWith(expectedUrl)).to.be.true;
 
diff --git a/test/spec/modules/decenteradsBidAdapter_spec.js b/test/spec/modules/decenteradsBidAdapter_spec.js
new file mode 100644
index 00000000000..257094cae3a
--- /dev/null
+++ b/test/spec/modules/decenteradsBidAdapter_spec.js
@@ -0,0 +1,207 @@
+import { expect } from 'chai'
+import { spec } from '../../../modules/decenteradsBidAdapter.js'
+import { deepStrictEqual, notEqual, ok, strictEqual } from 'assert'
+
+describe('DecenteradsAdapter', () => {
+  const bid = {
+    bidId: '9ec5b177515ee2e5',
+    bidder: 'decenterads',
+    params: {
+      placementId: 0,
+      traffic: 'banner'
+    }
+  }
+
+  describe('isBidRequestValid', () => {
+    it('Should return true if there are bidId, params and placementId parameters present', () => {
+      strictEqual(true, spec.isBidRequestValid(bid))
+    })
+
+    it('Should return false if at least one of parameters is not present', () => {
+      const b = { ...bid }
+      delete b.params.placementId
+      strictEqual(false, spec.isBidRequestValid(b))
+    })
+  })
+
+  describe('buildRequests', () => {
+    const serverRequest = spec.buildRequests([bid])
+
+    it('Creates a ServerRequest object with method, URL and data', () => {
+      ok(serverRequest)
+      ok(serverRequest.method)
+      ok(serverRequest.url)
+      ok(serverRequest.data)
+    })
+
+    it('Returns POST method', () => {
+      strictEqual('POST', serverRequest.method)
+    })
+
+    it('Returns valid URL', () => {
+      strictEqual('https://supply.decenterads.com/?c=o&m=multi', serverRequest.url)
+    })
+
+    it('Returns valid data if array of bids is valid', () => {
+      const { data } = serverRequest
+      strictEqual('object', typeof data)
+      deepStrictEqual(['deviceWidth', 'deviceHeight', 'language', 'secure', 'host', 'page', 'placements'], Object.keys(data))
+      strictEqual('number', typeof data.deviceWidth)
+      strictEqual('number', typeof data.deviceHeight)
+      strictEqual('string', typeof data.language)
+      strictEqual('string', typeof data.host)
+      strictEqual('string', typeof data.page)
+      notEqual(-1, [0, 1].indexOf(data.secure))
+
+      const placement = data.placements[0]
+      deepStrictEqual(['placementId', 'bidId', 'traffic'], Object.keys(placement))
+      strictEqual(0, placement.placementId)
+      strictEqual('9ec5b177515ee2e5', placement.bidId)
+      strictEqual('banner', placement.traffic)
+    })
+
+    it('Returns empty data if no valid requests are passed', () => {
+      const { placements } = spec.buildRequests([]).data
+
+      expect(spec.buildRequests([]).data.placements).to.be.an('array')
+      strictEqual(0, placements.length)
+    })
+  })
+
+  describe('interpretResponse', () => {
+    const validData = [
+      {
+        body: [{
+          mediaType: 'banner',
+          width: 300,
+          height: 250,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          vastUrl: 'decenterads.com',
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'decenterads.com',
+          title: 'Test',
+          image: 'decenterads.com',
+          creativeId: '2',
+          impressionTrackers: ['decenterads.com'],
+          ttl: 120,
+          cpm: 0.4,
+          requestId: '9ec5b177515ee2e5',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      }
+    ]
+
+    for (const obj of validData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should interpret ${mediaType} response`, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(1, response.length)
+
+        const copy = { ...obj.body[0] }
+        delete copy.mediaType
+        deepStrictEqual(copy, response[0])
+      })
+    }
+
+    const invalidData = [
+      {
+        body: [{
+          width: 300,
+          cpm: 0.4,
+          ad: 'Test',
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'video',
+          cpm: 0.5,
+          requestId: '9ec5b177515ee2e5',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      },
+      {
+        body: [{
+          mediaType: 'native',
+          clickUrl: 'decenterads.com',
+          title: 'Test',
+          impressionTrackers: ['decenterads.com'],
+          ttl: 120,
+          requestId: '9ec5b177515ee2e5',
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+        }]
+      }
+    ]
+
+    for (const obj of invalidData) {
+      const { mediaType } = obj.body[0]
+
+      it(`Should return an empty array if invalid ${mediaType} response is passed `, () => {
+        const response = spec.interpretResponse(obj)
+
+        expect(response).to.be.an('array')
+        strictEqual(0, response.length)
+      })
+    }
+
+    it('Should return an empty array if invalid response is passed', () => {
+      const response = spec.interpretResponse({
+        body: [{
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      })
+
+      expect(response).to.be.an('array')
+      strictEqual(0, response.length)
+    })
+  })
+
+  describe('getUserSyncs', () => {
+    it('Returns valid URL and type', () => {
+      const expectedResult = [{ type: 'image', url: 'https://supply.decenterads.com/?c=o&m=cookie' }]
+      deepStrictEqual(expectedResult, spec.getUserSyncs())
+    })
+  })
+})
diff --git a/test/spec/modules/deepintentBidAdapter_spec.js b/test/spec/modules/deepintentBidAdapter_spec.js
index 6d9b883e2bb..fcf7056fb3f 100644
--- a/test/spec/modules/deepintentBidAdapter_spec.js
+++ b/test/spec/modules/deepintentBidAdapter_spec.js
@@ -202,6 +202,7 @@ describe('Deepintent adapter', function () {
       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].meta.advertiserDomains).to.deep.equal(['deepintent.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);
diff --git a/test/spec/modules/deepintentDpesIdsystem_spec.js b/test/spec/modules/deepintentDpesIdsystem_spec.js
new file mode 100644
index 00000000000..7ea5553393c
--- /dev/null
+++ b/test/spec/modules/deepintentDpesIdsystem_spec.js
@@ -0,0 +1,76 @@
+import { expect } from 'chai';
+import find from 'core-js-pure/features/array/find.js';
+import { storage, deepintentDpesSubmodule } from 'modules/deepintentDpesIdSystem.js';
+import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { config } from 'src/config.js';
+
+const DI_COOKIE_NAME = '_dpes_id';
+const DI_COOKIE_STORED = '{"id":"2cf40748c4f7f60d343336e08f80dc99"}';
+const DI_COOKIE_OBJECT = {id: '2cf40748c4f7f60d343336e08f80dc99'};
+
+const cookieConfig = {
+  name: 'deepintentId',
+  storage: {
+    type: 'cookie',
+    name: '_dpes_id',
+    expires: 28
+  }
+};
+
+const html5Config = {
+  name: 'deepintentId',
+  storage: {
+    type: 'html5',
+    name: '_dpes_id',
+    expires: 28
+  }
+}
+
+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('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);
+    });
+  });
+
+  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'}});
+    });
+  });
+});
diff --git a/test/spec/modules/dfpAdServerVideo_spec.js b/test/spec/modules/dfpAdServerVideo_spec.js
index cd412530d2b..02f01bfd574 100644
--- a/test/spec/modules/dfpAdServerVideo_spec.js
+++ b/test/spec/modules/dfpAdServerVideo_spec.js
@@ -7,6 +7,7 @@ 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';
 
@@ -38,7 +39,7 @@ describe('The DFP video support module', function () {
     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('output', 'vast');
     expect(queryParams).to.have.property('sz', '640x480');
     expect(queryParams).to.have.property('unviewed_position_start', '1');
     expect(queryParams).to.have.property('url');
@@ -115,6 +116,116 @@ describe('The DFP video support module', function () {
     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({
+      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);
+    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);
+    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({
+      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);
+    expect(queryObject.gdpr).to.equal('1');
+    expect(queryObject.gdpr_consent).to.equal('consent');
+    expect(queryObject.addtl_consent).to.equal(undefined);
+    gdprDataHandlerStub.restore();
+  });
+
   describe('special targeting unit test', function () {
     const allTargetingData = {
       'hb_format': 'video',
@@ -180,11 +291,11 @@ describe('The DFP video support module', function () {
       const queryObject = utils.parseQS(url.query);
       const customParams = utils.parseQS('?' + decodeURIComponent(queryObject.cust_params));
 
-      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);
-      expect(customParams).to.have.property('hb_bidder_appnexus', 'appnexus');
-      expect(customParams).to.have.property('hb_bidder_testBidder2', 'testBidder2');
+      // 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);
+      // expect(customParams).to.have.property('hb_bidder_appnexus', 'appnexus');
+      // expect(customParams).to.have.property('hb_bidder_testBidder2', 'testBidder2');
     });
   });
 
@@ -274,8 +385,8 @@ describe('The DFP video support module', function () {
     const queryObject = utils.parseQS(url.query);
     const customParams = utils.parseQS('?' + decodeURIComponent(queryObject.cust_params));
 
-    expect(customParams).to.have.property('hb_uuid', bid.videoCacheKey);
-    expect(customParams).to.have.property('hb_cache_id', bid.videoCacheKey);
+    // expect(customParams).to.have.property('hb_uuid', bid.videoCacheKey);
+    // expect(customParams).to.have.property('hb_cache_id', bid.videoCacheKey);
   });
 
   it('should include hb_uuid and hb_cache_id in cust params from overwritten standard bidderSettings', function () {
@@ -350,6 +461,14 @@ describe('The DFP video support module', function () {
 
     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',
@@ -375,15 +494,21 @@ describe('The DFP video support module', function () {
         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('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();
       }
     });
 
diff --git a/test/spec/modules/dgkeywordRtdProvider_spec.js b/test/spec/modules/dgkeywordRtdProvider_spec.js
new file mode 100644
index 00000000000..a145f429557
--- /dev/null
+++ b/test/spec/modules/dgkeywordRtdProvider_spec.js
@@ -0,0 +1,351 @@
+import * as dgRtd from 'modules/dgkeywordRtdProvider.js';
+import { cloneDeep } from 'lodash';
+import { server } from 'test/mocks/xhr.js';
+import { config } from 'src/config.js';
+
+const DG_GET_KEYWORDS_TIMEOUT = 1950;
+const IGNORE_SET_ORTB2 = true;
+const DEF_CONFIG = {
+  name: 'dgkeyword',
+  waitForIt: true,
+  params: {
+    timeout: DG_GET_KEYWORDS_TIMEOUT,
+  },
+};
+const DUMMY_RESPONSE_HEADER = { 'Content-Type': 'application/json' };
+const DUMMY_RESPONSE = { s: ['s1', 's2'], t: ['t1', 't2'] };
+const SUCCESS_RESULT = { opeaud: ['s1', 's2'], opectx: ['t1', 't2'] };
+const SUCCESS_ORTB2 = {
+  ortb2: {
+    site: { keywords: SUCCESS_RESULT },
+    user: { keywords: SUCCESS_RESULT },
+  },
+};
+
+describe('Digital Garage Keyword Module', function () {
+  it('should init and return always true', function () {
+    expect(dgRtd.dgkeywordSubmodule.init()).to.equal(true);
+  });
+
+  describe('dgkeyword target test', function () {
+    it('should have no target', function () {
+      const adUnits_no_target = [
+        {
+          code: 'code1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999999,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999998,
+                dgkeyword: false,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999997,
+              },
+            },
+          ],
+        },
+        {
+          code: 'code2',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999996,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999995,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999994,
+              },
+            },
+          ],
+        },
+      ];
+      expect(dgRtd.getTargetBidderOfDgKeywords(adUnits_no_target)).an('array')
+        .that.is.empty;
+    });
+    it('should have targets', function () {
+      const adUnits_targets = [
+        {
+          code: 'code1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999999,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999998,
+                dgkeyword: true,
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999997,
+                dgkeyword: false,
+              },
+            },
+          ],
+        },
+        {
+          code: 'code2',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          bids: [
+            {
+              bidder: 'dg',
+              params: {
+                placementId: 99999996,
+                dgkeyword: true,
+              },
+            },
+            {
+              bidder: 'dg2',
+              params: {
+                placementId: 99999995,
+                dgkeyword: 'aa',
+              },
+            },
+            {
+              bidder: 'dg3',
+              params: {
+                placementId: 99999994,
+                dgkeyword: true,
+              },
+            },
+          ],
+        },
+      ];
+      const targets = dgRtd.getTargetBidderOfDgKeywords(adUnits_targets);
+      expect(targets[0].bidder).to.be.equal('dg2');
+      expect(targets[0].params.placementId).to.be.equal(99999998);
+      expect(targets[0].params.dgkeyword).to.be.an('undefined');
+      expect(targets[1].bidder).to.be.equal('dg');
+      expect(targets[1].params.placementId).to.be.equal(99999996);
+      expect(targets[1].params.dgkeyword).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');
+    });
+  });
+
+  describe('get profile.', function () {
+    const AD_UNITS = [
+      {
+        code: 'code1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bids: [
+          {
+            bidder: 'dg',
+            params: {
+              placementId: 99999999,
+            },
+          },
+          {
+            bidder: 'dg2',
+            params: {
+              placementId: 99999998,
+              dgkeyword: true,
+            },
+          },
+          {
+            bidder: 'dg3',
+            params: {
+              placementId: 99999997,
+              dgkeyword: false,
+            },
+          },
+        ],
+      },
+      {
+        code: 'code2',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bids: [
+          {
+            bidder: 'dg',
+            params: {
+              placementId: 99999996,
+              dgkeyword: true,
+            },
+          },
+          {
+            bidder: 'dg2',
+            params: {
+              placementId: 99999995,
+              dgkeyword: 'aa',
+            },
+          },
+          {
+            bidder: 'dg3',
+            params: {
+              placementId: 99999994,
+            },
+          },
+        ],
+      },
+    ];
+    it('should get profiles error(404).', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          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');
+          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[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(pbjs.getBidderConfig()).to.be.deep.equal({});
+
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(404);
+    });
+    it('should get profiles timeout.', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      moduleConfig.params.timeout = 10;
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          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');
+          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[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(pbjs.getBidderConfig()).to.be.deep.equal({});
+
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      setTimeout(() => {
+        const request = server.requests[0];
+        if (request) {
+          request.respond(
+            200,
+            DUMMY_RESPONSE_HEADER,
+            JSON.stringify(DUMMY_RESPONSE)
+          );
+        }
+      }, 1000);
+    });
+    it('should get profiles ok(200).', function (done) {
+      let pbjs = cloneDeep(config);
+      pbjs.adUnits = cloneDeep(AD_UNITS);
+      if (IGNORE_SET_ORTB2) {
+        pbjs._ignoreSetOrtb2 = true;
+      }
+      let moduleConfig = cloneDeep(DEF_CONFIG);
+      dgRtd.getDgKeywordsAndSet(
+        pbjs,
+        () => {
+          let targets = pbjs.adUnits[0].bids;
+          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);
+          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[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');
+
+          if (!IGNORE_SET_ORTB2) {
+            expect(pbjs.getBidderConfig()).to.be.deep.equal({
+              dg2: SUCCESS_ORTB2,
+              dg: SUCCESS_ORTB2,
+            });
+          }
+          done();
+        },
+        moduleConfig,
+        null
+      );
+      const request = server.requests[0];
+      request.respond(
+        200,
+        DUMMY_RESPONSE_HEADER,
+        JSON.stringify(DUMMY_RESPONSE)
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/digitrustIdSystem_spec.js b/test/spec/modules/digitrustIdSystem_spec.js
deleted file mode 100644
index befd6eb75b6..00000000000
--- a/test/spec/modules/digitrustIdSystem_spec.js
+++ /dev/null
@@ -1,131 +0,0 @@
-import {
-  digiTrustIdSubmodule,
-  surfaceTestHook
-} from 'modules/digiTrustIdSystem.js';
-
-let assert = require('chai').assert;
-let expect = require('chai').expect;
-var testHook = null;
-
-/**
-* A mock implementation of IAB Consent Provider
-*/
-function mockCmp(command, version, callback, parameter) {
-  var resultVal;
-  if (command == 'ping') {
-    resultVal = {
-      gdprAppliesGlobally: mockCmp.stubSettings.isGlobal
-    };
-    callback(resultVal);
-  } else if (command == 'getVendorConsents') {
-    let cbResult = {
-      vendorConsents: []
-    }
-    cbResult.vendorConsents[version] = mockCmp.stubSettings.consents;
-    callback(cbResult);
-  }
-}
-
-mockCmp.stubSettings = {
-  isGlobal: false,
-  consents: true
-};
-
-function setupCmpMock(isGlobal, consents) {
-  window.__cmp = mockCmp;
-  mockCmp.stubSettings.isGlobal = isGlobal;
-  mockCmp.stubSettings.consents = consents;
-}
-
-describe('DigiTrust Id System', function () {
-  it('Should create the test hook', function (done) {
-    testHook = surfaceTestHook();
-    assert.isNotNull(testHook, 'The test hook failed to surface');
-    var conf = {
-      init: {
-        member: 'unit_test',
-        site: 'foo'
-      },
-      callback: function (result) {
-      }
-    };
-    testHook.initDigitrustFacade(conf);
-    window.DigiTrust.getUser(conf);
-    expect(window.DigiTrust).to.exist;
-    expect(window.DigiTrust.isMock).to.be.true;
-    done();
-  });
-
-  it('Should report as client', function (done) {
-    delete window.DigiTrust;
-    testHook = surfaceTestHook();
-
-    var conf = {
-      init: {
-        member: 'unit_test',
-        site: 'foo'
-      },
-      callback: function (result) {
-        expect(window.DigiTrust).to.exist;
-        expect(result).to.exist;
-        expect(window.DigiTrust.isMock).to.be.true;
-      }
-    };
-    testHook.initDigitrustFacade(conf);
-    expect(window.DigiTrust).to.exist;
-    expect(window.DigiTrust.isClient).to.be.true;
-    done();
-  });
-
-  it('Should allow consent when given', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(true, true);
-    var handler = function(result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-
-  it('Should consent if does not apply', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(false, true);
-    var handler = function (result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-
-  it('Should not allow consent when not given', function (done) {
-    testHook = surfaceTestHook();
-    setupCmpMock(true, false);
-    var handler = function (result) {
-      expect(result).to.be.false;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-  it('Should deny consent if timeout', function (done) {
-    window.__cmp = function () { };
-    var handler = function (result) {
-      expect(result).to.be.false;
-      done();
-    }
-
-    testHook.gdpr.hasConsent({ consentTimeout: 1 }, handler);
-  });
-  it('Should pass consent test if cmp not present', function (done) {
-    delete window.__cmp
-    testHook = surfaceTestHook();
-    var handler = function (result) {
-      expect(result).to.be.true;
-      done();
-    }
-
-    testHook.gdpr.hasConsent(null, handler);
-  });
-});
diff --git a/test/spec/modules/districtmDmxBidAdapter_spec.js b/test/spec/modules/districtmDmxBidAdapter_spec.js
index d8f0beb9a36..90c18c6a84f 100644
--- a/test/spec/modules/districtmDmxBidAdapter_spec.js
+++ b/test/spec/modules/districtmDmxBidAdapter_spec.js
@@ -1,6 +1,60 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import * as _ from 'lodash';
-import {spec, matchRequest, checkDeepArray, defaultSize, upto5, cleanSizes, shuffle} from '../../../modules/districtmDMXBidAdapter.js';
+import { spec, matchRequest, checkDeepArray, defaultSize, upto5, cleanSizes, shuffle, getApi, bindUserId, getPlaybackmethod, getProtocols, cleanVast } from '../../../modules/districtmDMXBidAdapter.js';
+
+const sample_vast = `
+    
+        
+            
+            
+            
+            
+                
+                    
+                        00:00:15
+                        
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                            
+                        
+                        
+                            
+                            
+                            
+                        
+                        
+                        
+                    
+                
+                
+            
+            
+        
+    
+
+
+`
 
 const supportedSize = [
   {
@@ -42,6 +96,30 @@ const bidRequest = [{
     'dmxid': 100001,
     'memberid': 100003,
   },
+  'userId': {
+    idl_env: {},
+    digitrustid: {
+      data: {
+        id: {}
+      }
+    },
+    id5id: {
+      uid: ''
+    },
+    pubcid: {},
+    tdid: {},
+    criteoId: {},
+    britepoolid: {},
+    intentiqid: {},
+    lotamePanoramaId: {},
+    parrableId: {},
+    netId: {},
+    sharedid: {},
+    lipb: {
+      lipbid: {}
+    },
+
+  },
   'adUnitCode': 'div-gpt-ad-12345678-1',
   'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
   'sizes': [
@@ -53,6 +131,35 @@ const bidRequest = [{
   'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
 }];
 
+const bidRequestVideo = [{
+  'bidder': 'districtmDMX',
+  'params': {
+    'dmxid': 100001,
+    'memberid': 100003,
+    'video': {
+      id: 123,
+      skipppable: true,
+      playback_method: ['auto_play_sound_off', 'viewport_sound_off'],
+      mimes: ['application/javascript',
+        'video/mp4'],
+    }
+  },
+  'mediaTypes': {
+    video: {
+      context: 'instream', // or 'outstream'
+      playerSize: [[640, 480]]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-12345678-1',
+  'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
+  'sizes': [
+    [300, 250],
+    [300, 600]
+  ],
+  'bidId': '29a28a1bbc8a8d',
+  'bidderRequestId': '124b579a136515',
+  'auctionId': '3d62f2d3-56a2-4991-888e-f7754619ddcf'
+}];
 const bidRequestNoCoppa = [{
   'bidder': 'districtmDMX',
   'params': {
@@ -499,12 +606,57 @@ const emptyResponseSeatBid = { body: { seatbid: [] } };
 
 describe('DistrictM Adaptor', function () {
   const districtm = spec;
-  describe('verification of upto5', function() {
-    it('upto5 function should always break 12 imps into 3 request same for 15', function() {
+  describe('verification of upto5', function () {
+    it('upto5 function should always break 12 imps into 3 request same for 15', function () {
       expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
       expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
     })
   })
+
+  describe('test vast tag', function () {
+    it('img tag should not be present', function () {
+      expect(cleanVast(sample_vast).indexOf('img') !== -1).to.be.equal(false)
+    })
+  })
+  describe('Test getApi function', function () {
+    const data = {
+      api: [1]
+    }
+    it('Will return 1 for vpaid version 1', function () {
+      expect(getApi(data)[0]).to.be.equal(1)
+    })
+    it('Will return 2 for vpaid default', function () {
+      expect(getApi({})[0]).to.be.equal(2)
+    })
+  })
+
+  describe('Test cleanSizes function', function () {
+    it('sequence will be respected', function () {
+      expect(cleanSizes(bidderRequest.bids[0].sizes).toString()).to.be.equal('300,250,300,600')
+    })
+    it('sequence will be respected', function () {
+      expect(cleanSizes([[728, 90], [970, 90], [300, 600], [320, 50]]).toString()).to.be.equal('728,90,320,50,300,600,970,90')
+    })
+  })
+
+  describe('Test getPlaybackmethod function', function () {
+    it('getPlaybackmethod will return 2', function () {
+      expect(getPlaybackmethod([])[0]).to.be.equal(2)
+    })
+    it('getPlaybackmethod will return 6', function () {
+      expect(getPlaybackmethod(['viewport_sound_off'])[0]).to.be.equal(6)
+    })
+  })
+
+  describe('Test getProtocols function', function () {
+    it('getProtocols will return 3', function () {
+      expect(getProtocols({ protocols: [3] })[0]).to.be.equal(3)
+    })
+    it('getProtocols will return 6', function () {
+      expect(_.isEqual(getProtocols({}), [2, 3, 5, 6, 7, 8])).to.be.equal(true)
+    })
+  })
+
   describe('All needed functions are available', function () {
     it(`isBidRequestValid is present and type function`, function () {
       expect(districtm.isBidRequestValid).to.exist.and.to.be.a('function')
@@ -535,17 +687,16 @@ describe('DistrictM Adaptor', function () {
 
   describe(`isBidRequestValid test response`, function () {
     let params = {
-      dmxid: 10001,
+      dmxid: 10001, // optional
       memberid: 10003,
     };
     it(`function should return true`, function () {
-      expect(districtm.isBidRequestValid({params})).to.be.equal(true);
+      expect(districtm.isBidRequestValid({ params })).to.be.equal(true);
     });
     it(`function should return false`, function () {
-      expect(districtm.isBidRequestValid({ params: { memberid: 12345 } })).to.be.equal(false);
+      expect(districtm.isBidRequestValid({ params: {} })).to.be.equal(false);
     });
-    it(`expect to have two property available dmxid and memberid`, function () {
-      expect(params).to.have.property('dmxid');
+    it(`expect to have memberid`, function () {
       expect(params).to.have.property('memberid');
     });
   });
@@ -568,19 +719,19 @@ describe('DistrictM Adaptor', function () {
     it(`the function should return an array`, function () {
       expect(buildRequestResults).to.be.an('object');
     });
-    it(`contain gdpr consent & ccpa`, function() {
+    it(`contain gdpr consent & ccpa`, function () {
       const bidr = JSON.parse(buildRequestResults.data)
       expect(bidr.regs.ext.gdpr).to.be.equal(1);
       expect(bidr.regs.ext.us_privacy).to.be.equal('1NY');
       expect(bidr.user.ext.consent).to.be.an('string');
     });
-    it(`test contain COPPA`, function() {
+    it(`test contain COPPA`, function () {
       const bidr = JSON.parse(buildRequestResults.data)
       bidr.regs = bidr.regs || {};
       bidr.regs.coppa = 1;
       expect(bidr.regs.coppa).to.be.equal(1)
     })
-    it(`test should not contain COPPA`, function() {
+    it(`test should not contain COPPA`, function () {
       const bidr = JSON.parse(buildRequestResultsNoCoppa.data)
       expect(bidr.regs.coppa).to.be.equal(0)
     })
@@ -589,11 +740,17 @@ describe('DistrictM Adaptor', function () {
     });
   });
 
+  describe('bidRequest Video testing', function () {
+    const request = districtm.buildRequests(bidRequestVideo, bidRequestVideo);
+    const data = JSON.parse(request.data)
+    expect(data instanceof Object).to.be.equal(true)
+  })
+
   describe(`interpretResponse test usage`, function () {
-    const responseResults = districtm.interpretResponse(responses, {bidderRequest});
-    const emptyResponseResults = districtm.interpretResponse(emptyResponse, {bidderRequest});
-    const emptyResponseResultsNegation = districtm.interpretResponse(responsesNegative, {bidderRequest});
-    const emptyResponseResultsEmptySeat = districtm.interpretResponse(emptyResponseSeatBid, {bidderRequest});
+    const responseResults = districtm.interpretResponse(responses, { bidderRequest });
+    const emptyResponseResults = districtm.interpretResponse(emptyResponse, { bidderRequest });
+    const emptyResponseResultsNegation = districtm.interpretResponse(responsesNegative, { bidderRequest });
+    const emptyResponseResultsEmptySeat = districtm.interpretResponse(emptyResponseSeatBid, { bidderRequest });
     it(`the function should return an array`, function () {
       expect(responseResults).to.be.an('array');
     });
@@ -613,10 +770,10 @@ describe('DistrictM Adaptor', function () {
   });
 
   describe(`check validation for id sync gdpr ccpa`, () => {
-    let allin = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, bidderRequest.uspConsent)[0]
-    let noCCPA = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, null)[0]
-    let noGDPR = spec.getUserSyncs({iframeEnabled: true}, {}, null, bidderRequest.uspConsent)[0]
-    let nothing = spec.getUserSyncs({iframeEnabled: true}, {}, null, null)[0]
+    let allin = spec.getUserSyncs({ iframeEnabled: true }, {}, bidderRequest.gdprConsent, bidderRequest.uspConsent)[0]
+    let noCCPA = spec.getUserSyncs({ iframeEnabled: true }, {}, bidderRequest.gdprConsent, null)[0]
+    let noGDPR = spec.getUserSyncs({ iframeEnabled: true }, {}, null, bidderRequest.uspConsent)[0]
+    let nothing = spec.getUserSyncs({ iframeEnabled: true }, {}, null, null)[0]
 
     /*
 
@@ -639,10 +796,10 @@ describe('DistrictM Adaptor', function () {
   })
 
   describe(`Helper function testing`, function () {
-    const bid = matchRequest('29a28a1bbc8a8d', {bidderRequest});
-    const {width, height} = defaultSize(bid);
+    const bid = matchRequest('29a28a1bbc8a8d', { bidderRequest });
+    const { width, height } = defaultSize(bid);
     it(`test matchRequest`, function () {
-      expect(matchRequest('29a28a1bbc8a8d', {bidderRequest})).to.be.an('object');
+      expect(matchRequest('29a28a1bbc8a8d', { bidderRequest })).to.be.an('object');
     });
     it(`test checkDeepArray`, function () {
       expect(_.isEqual(checkDeepArray([728, 90]), [728, 90])).to.be.equal(true);
diff --git a/test/spec/modules/dmdIdSystem_spec.js b/test/spec/modules/dmdIdSystem_spec.js
new file mode 100644
index 00000000000..9c603eebbd5
--- /dev/null
+++ b/test/spec/modules/dmdIdSystem_spec.js
@@ -0,0 +1,48 @@
+import * as utils from '../../../src/utils.js';
+
+import {dmdIdSubmodule} from 'modules/dmdIdSystem.js';
+
+describe('Dmd ID System', function() {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if no configParams were passed into getId', function () {
+    dmdIdSubmodule.getId();
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should log an error if configParams doesnot have api_key passed to getId', function () {
+    dmdIdSubmodule.getId({params: {}});
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should log an error if configParams has invalid api_key passed into getId', function () {
+    dmdIdSubmodule.getId({params: {api_key: 123}});
+    expect(logErrorStub.calledOnce).to.be.true;
+  });
+
+  it('should not log an error if configParams has valid api_key passed into getId', function () {
+    dmdIdSubmodule.getId({params: {api_key: '3fdbe297-3690-4f5c-9e11-ee9186a6d77c'}});
+    expect(logErrorStub.calledOnce).to.be.false;
+  });
+
+  it('should return undefined if empty value passed into decode', function () {
+    expect(dmdIdSubmodule.decode()).to.be.undefined;
+  });
+
+  it('should return undefined if invalid dmd-dgid passed into decode', function () {
+    expect(dmdIdSubmodule.decode(123)).to.be.undefined;
+  });
+
+  it('should return dmdId if valid dmd-dgid passed into decode', function () {
+    let data = { 'dmdId': 'U12345' };
+    expect(dmdIdSubmodule.decode('U12345')).to.deep.equal(data);
+  });
+});
diff --git a/test/spec/modules/docereeBidAdapter_spec.js b/test/spec/modules/docereeBidAdapter_spec.js
new file mode 100644
index 00000000000..efff2efa319
--- /dev/null
+++ b/test/spec/modules/docereeBidAdapter_spec.js
@@ -0,0 +1,97 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/docereeBidAdapter.js';
+import { config } from '../../../src/config.js';
+
+describe('BidlabBidAdapter', function () {
+  config.setConfig({
+    doceree: {
+      context: {
+        data: {
+          token: 'testing-token', // required
+        }
+      },
+      user: {
+        data: {
+          gender: '',
+          email: '',
+          hashedEmail: '',
+          firstName: '',
+          lastName: '',
+          npi: '',
+          hashedNPI: '',
+          city: '',
+          zipCode: '',
+          specialization: '',
+        }
+      }
+    }
+  });
+  let bid = {
+    bidId: 'testing',
+    bidder: 'doceree',
+    params: {
+      placementId: 'DOC_7jm9j5eqkl0xvc5w',
+    }
+  };
+
+  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('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;
+    });
+    it('Returns GET method', function () {
+      expect(serverRequest.method).to.equal('GET');
+    });
+    it('Returns valid URL', function () {
+      expect(serverRequest.url).to.equal('https://bidder.doceree.com/v1/adrequest?id=DOC_7jm9j5eqkl0xvc5w&pubRequestedURL=undefined&loggedInUser=JTdCJTIyZ2VuZGVyJTIyJTNBJTIyJTIyJTJDJTIyZW1haWwlMjIlM0ElMjIlMjIlMkMlMjJoYXNoZWRFbWFpbCUyMiUzQSUyMiUyMiUyQyUyMmZpcnN0TmFtZSUyMiUzQSUyMiUyMiUyQyUyMmxhc3ROYW1lJTIyJTNBJTIyJTIyJTJDJTIybnBpJTIyJTNBJTIyJTIyJTJDJTIyaGFzaGVkTlBJJTIyJTNBJTIyJTIyJTJDJTIyY2l0eSUyMiUzQSUyMiUyMiUyQyUyMnppcENvZGUlMjIlM0ElMjIlMjIlMkMlMjJzcGVjaWFsaXphdGlvbiUyMiUzQSUyMiUyMiU3RA%3D%3D&prebidjs=true&requestId=testing&');
+    });
+  });
+  describe('interpretResponse', function () {
+    it('Should interpret banner response', function () {
+      const banner = {
+        body: {
+          DIVID: 'DOC_7jm9j5eqkl0xvc5w',
+          creativeType: 'banner',
+          guid: 'G125fzC5NKl3FHeOT8yvL98ILfQS9TVUgk6Q',
+          currency: 'USD',
+          cpmBid: 2,
+          height: '250',
+          width: '300',
+          ctaLink: 'https://doceree.com/',
+          sourceURL: '',
+          sourceHTML: '
test
',
+          advertiserDomain: 'doceree.com',
+        }
+      };
+      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('G125fzC5NKl3FHeOT8yvL98ILfQS9TVUgk6Q');
+      expect(dataItem.cpm).to.equal(2);
+      expect(dataItem.width).to.equal(300);
+      expect(dataItem.height).to.equal(250);
+      expect(dataItem.ad).to.equal('
test
');
+      expect(dataItem.ttl).to.equal(30);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+      expect(dataItem.creativeId).to.equal('DOC_7jm9j5eqkl0xvc5w');
+      expect(dataItem.meta.advertiserDomains).to.be.an('array').that.is.not.empty;
+      expect(dataItem.meta.advertiserDomains[0]).to.equal('doceree.com')
+    });
+  })
+});
diff --git a/test/spec/modules/dspxBidAdapter_spec.js b/test/spec/modules/dspxBidAdapter_spec.js
index cf36c3f62c4..a4abf46e90f 100644
--- a/test/spec/modules/dspxBidAdapter_spec.js
+++ b/test/spec/modules/dspxBidAdapter_spec.js
@@ -61,7 +61,11 @@ describe('dspxAdapter', function () {
       ],
       'bidId': '30b31c1838de1e1',
       'bidderRequestId': '22edbae2733bf61',
-      'auctionId': '1d1a030790a475'
+      'auctionId': '1d1a030790a475',
+      'userId': {
+        'netId': '123',
+        'uid2': '456'
+      }
     },
     {
       'bidder': 'dspx',
@@ -102,9 +106,18 @@ describe('dspxAdapter', function () {
         'placement': '101',
         'devMode': true
       },
-      'sizes': [
-        [300, 250]
-      ],
+      'mediaTypes': {
+        'video': {
+          'playerSize': [640, 480],
+          'context': 'instream'
+        },
+        'banner': {
+          'sizes': [
+            [300, 250]
+          ]
+        }
+      },
+
       'bidId': '30b31c1838de1e4',
       'bidderRequestId': '22edbae2733bf67',
       'auctionId': '1d1a030790a478'
@@ -145,7 +158,7 @@ describe('dspxAdapter', 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');
-      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&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');
+      expect(data).to.equal('_f=html&alternative=prebid_js&inventory_item_id=6682&srw=300&srh=250&idt=100&bid_id=30b31c1838de1e1&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_uid2=456');
     });
 
     var request2 = spec.buildRequests([bidRequests[1]], bidderRequest)[0];
@@ -199,7 +212,8 @@ describe('dspxAdapter', function () {
         'currency': 'EUR',
         'ttl': 60,
         'netRevenue': true,
-        'zone': '6682'
+        'zone': '6682',
+        'adomain': ['bdomain']
       }
     };
     let serverVideoResponse = {
@@ -229,7 +243,8 @@ describe('dspxAdapter', function () {
       netRevenue: true,
       ttl: 300,
       type: 'sspHTML',
-      ad: ''
+      ad: '',
+      meta: {advertiserDomains: ['bdomain']}
     }, {
       requestId: '23beaa6af6cdde',
       cpm: 0.5,
@@ -242,7 +257,8 @@ describe('dspxAdapter', function () {
       ttl: 300,
       type: 'vast2',
       vastXml: '{"reason":7001,"status":"accepted"}',
-      mediaType: 'video'
+      mediaType: 'video',
+      meta: {advertiserDomains: []}
     }];
 
     it('should get the correct bid response by display ad', function () {
@@ -255,6 +271,8 @@ describe('dspxAdapter', function () {
       }];
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.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]);
     });
 
     it('should get the correct dspx video bid response by display ad', function () {
@@ -273,6 +291,7 @@ describe('dspxAdapter', function () {
       }];
       let result = spec.interpretResponse(serverVideoResponse, bidRequest[0]);
       expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[1]));
+      expect(result[0].meta.advertiserDomains.length).to.equal(0);
     });
 
     it('handles empty bid response', function () {
@@ -283,4 +302,60 @@ describe('dspxAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe(`getUserSyncs test usage`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          requestId: '23beaa6af6cdde',
+          cpm: 0.5,
+          width: 0,
+          height: 0,
+          creativeId: 100500,
+          dealId: '',
+          currency: 'EUR',
+          netRevenue: true,
+          ttl: 300,
+          type: 'sspHTML',
+          ad: '',
+          userSync: {
+            iframeUrl: ['anyIframeUrl?a=1'],
+            imageUrl: ['anyImageUrl', 'anyImageUrl2']
+          }
+        }
+      }];
+    });
+
+    it(`return value should be an array`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+    });
+    it(`array should have only one object and it should have a property type = 'iframe'`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(1);
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses);
+      expect(userSync).to.have.property('type');
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for iframe`, function () {
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses, {consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyIframeUrl?a=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for image`, function () {
+      let [userSync] = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('image');
+    });
+    it(`we have valid sync url for image and iframe`, function () {
+      let userSync = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.length).to.be.equal(3);
+      expect(userSync[0].url).to.be.equal('anyIframeUrl?a=1&gdpr=1&gdpr_consent=anyString')
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[1].url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[1].type).to.be.equal('image');
+      expect(userSync[2].url).to.be.equal('anyImageUrl2?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[2].type).to.be.equal('image');
+    });
+  });
 });
diff --git a/test/spec/modules/eids_spec.js b/test/spec/modules/eids_spec.js
index 1cbc2911ef5..1ccaab2b302 100644
--- a/test/spec/modules/eids_spec.js
+++ b/test/spec/modules/eids_spec.js
@@ -29,27 +29,73 @@ describe('eids array generation for known sub-modules', function() {
     });
   });
 
-  it('id5Id', function() {
+  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 = {
-      id5id: 'some-random-id-value'
+      parrableId: {
+        eid: 'some-random-id-value'
+      }
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'id5-sync.com',
+      source: 'parrable.com',
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
 
-  it('parrableId', function() {
+  it('merkleId', function() {
     const userId = {
-      parrableid: 'some-random-id-value'
+      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: 'parrable.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      source: 'merkleinc.com',
+      uids: [{id: 'some-random-id-value',
+        atype: 3,
+        ext: { keyID: 1
+        }}]
     });
   });
 
@@ -61,7 +107,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveramp.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -76,7 +122,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 1}],
+      uids: [{id: 'some-random-id-value', atype: 3}],
       ext: {segments: ['s1', 's2']}
     });
   });
@@ -91,7 +137,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'liveintent.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -103,7 +149,7 @@ describe('eids array generation for known sub-modules', function() {
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
       source: 'britepool.com',
-      uids: [{id: 'some-random-id-value', atype: 1}]
+      uids: [{id: 'some-random-id-value', atype: 3}]
     });
   });
 
@@ -119,34 +165,42 @@ describe('eids array generation for known sub-modules', function() {
     });
   });
 
-  it('DigiTrust; getValue call', function() {
+  it('criteo', function() {
     const userId = {
-      digitrustid: {
-        data: {
-          id: 'some-random-id-value'
-        }
-      }
+      criteoId: 'some-random-id-value'
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'digitru.st',
+      source: 'criteo.com',
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
 
-  it('criteo', function() {
+  it('tapadId', function() {
     const userId = {
-      criteoId: 'some-random-id-value'
+      tapadId: 'some-random-id-value'
     };
     const newEids = createEidsArray(userId);
     expect(newEids.length).to.equal(1);
     expect(newEids[0]).to.deep.equal({
-      source: 'criteo.com',
+      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'
@@ -158,6 +212,18 @@ describe('eids array generation for known sub-modules', function() {
       uids: [{id: 'some-random-id-value', atype: 1}]
     });
   });
+
+  it('NextRollId', function() {
+    const userId = {
+      nextrollId: 'some-random-id-value'
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(1);
+    expect(newEids[0]).to.deep.equal({
+      source: 'nextroll.com',
+      uids: [{id: 'some-random-id-value', atype: 1}]
+    });
+  });
   it('Sharedid', function() {
     const userId = {
       sharedid: {
@@ -194,8 +260,101 @@ describe('eids array generation for known sub-modules', function() {
       }]
     });
   });
-});
 
+  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('haloId', function() {
+    const userId = {
+      haloId: '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('pubProvidedId', function() {
+    const userId = {
+      pubProvidedId: [{
+        source: 'example.com',
+        uids: [{
+          id: 'value read from cookie or local storage',
+          ext: {
+            stype: 'ppuid'
+          }
+        }]
+      }, {
+        source: 'id-partner.com',
+        uids: [{
+          id: 'value read from cookie or local storage'
+        }]
+      }]
+    };
+    const newEids = createEidsArray(userId);
+    expect(newEids.length).to.equal(2);
+    expect(newEids[0]).to.deep.equal({
+      source: 'example.com',
+      uids: [{
+        id: 'value read from cookie or local storage',
+        ext: {
+          stype: 'ppuid'
+        }
+      }]
+    });
+    expect(newEids[1]).to.deep.equal({
+      source: 'id-partner.com',
+      uids: [{
+        id: 'value read from cookie or local storage'
+      }]
+    });
+  });
+});
 describe('Negative case', function() {
   it('eids array generation for UN-known sub-module', function() {
     // UnknownCommonId
diff --git a/test/spec/modules/emx_digitalBidAdapter_spec.js b/test/spec/modules/emx_digitalBidAdapter_spec.js
index 7be8a2ce5ac..0f82122b9c1 100644
--- a/test/spec/modules/emx_digitalBidAdapter_spec.js
+++ b/test/spec/modules/emx_digitalBidAdapter_spec.js
@@ -253,12 +253,38 @@ describe('emx_digital Adapter', function () {
       expect(queryParams[1]).to.match(new RegExp('^ts=\d*', 'g'));
     });
 
-    it('builds with bid floor', function () {
-      const bidRequestWithBidFloor = utils.deepClone(bidderRequest.bids);
-      bidRequestWithBidFloor[0].params.bidfloor = 1;
-      const requestWithFloor = spec.buildRequests(bidRequestWithBidFloor, bidderRequest);
+    it('builds bidfloor value from bid param when getFloor function does not exist', function () {
+      const bidRequestWithFloor = utils.deepClone(bidderRequest.bids);
+      bidRequestWithFloor[0].params.bidfloor = 1;
+      const requestWithFloor = spec.buildRequests(bidRequestWithFloor, bidderRequest);
       const data = JSON.parse(requestWithFloor.data);
-      expect(data.imp[0].bidfloor).to.equal(bidRequestWithBidFloor[0].params.bidfloor);
+      expect(data.imp[0].bidfloor).to.equal(bidRequestWithFloor[0].params.bidfloor);
+    });
+
+    it('builds bidfloor value from getFloor function when it exists', function () {
+      const floorResponse = { currency: 'USD', floor: 3 };
+      const bidRequestWithGetFloor = utils.deepClone(bidderRequest.bids);
+      bidRequestWithGetFloor[0].getFloor = () => floorResponse;
+      const requestWithGetFloor = spec.buildRequests(bidRequestWithGetFloor, bidderRequest);
+      const data = JSON.parse(requestWithGetFloor.data);
+      expect(data.imp[0].bidfloor).to.equal(3);
+    });
+
+    it('builds bidfloor value from getFloor when both floor and getFloor function exists', function () {
+      const floorResponse = { currency: 'USD', floor: 3 };
+      const bidRequestWithBothFloors = utils.deepClone(bidderRequest.bids);
+      bidRequestWithBothFloors[0].params.bidfloor = 1;
+      bidRequestWithBothFloors[0].getFloor = () => floorResponse;
+      const requestWithBothFloors = spec.buildRequests(bidRequestWithBothFloors, bidderRequest);
+      const data = JSON.parse(requestWithBothFloors.data);
+      expect(data.imp[0].bidfloor).to.equal(3);
+    });
+
+    it('empty bidfloor value when floor and getFloor is not defined', function () {
+      const bidRequestWithoutFloor = utils.deepClone(bidderRequest.bids);
+      const requestWithoutFloor = spec.buildRequests(bidRequestWithoutFloor, bidderRequest);
+      const data = JSON.parse(requestWithoutFloor.data);
+      expect(data.imp[0].bidfloor).to.not.exist;
     });
 
     it('builds request properly', function () {
@@ -367,6 +393,27 @@ describe('emx_digital Adapter', function () {
       expect(request.us_privacy).to.exist;
       expect(request.us_privacy).to.exist.and.to.equal(consentString);
     });
+
+    it('should add schain object to request', function() {
+      const schainBidderRequest = utils.deepClone(bidderRequest);
+      schainBidderRequest.bids[0].schain = {
+        'complete': 1,
+        'ver': '1.0',
+        'nodes': [
+          {
+            'asi': 'testing.com',
+            'sid': 'abc',
+            'hp': 1
+          }
+        ]
+      };
+      let request = spec.buildRequests(schainBidderRequest.bids, schainBidderRequest);
+      request = JSON.parse(request.data);
+      expect(request.source.ext.schain).to.exist;
+      expect(request.source.ext.schain).to.have.property('complete', 1);
+      expect(request.source.ext.schain).to.have.property('ver', '1.0');
+      expect(request.source.ext.schain.nodes[0].asi).to.equal(schainBidderRequest.bids[0].schain.nodes[0].asi);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -449,7 +496,8 @@ describe('emx_digital Adapter', function () {
           'id': '987654321cba',
           'price': 0.5,
           'ttl': 300,
-          'w': 300
+          'w': 300,
+          'adomain': ['example.com']
         }],
         'seat': '1356'
       }, {
@@ -477,7 +525,10 @@ describe('emx_digital Adapter', function () {
       'netRevneue': true,
       'mediaType': 'banner',
       'ad': '',
-      'ttl': 300
+      'ttl': 300,
+      'meta': {
+        'advertiserDomains': ['example.com']
+      }
     }, {
       'requestId': '12819a18-56e1-4256-b836-b69a10202668',
       'cpm': 0.7,
@@ -609,15 +660,34 @@ describe('emx_digital Adapter', function () {
         body: badAdmServerResponse
       }));
     });
+
+    it('returns valid advertiser domain', function () {
+      const bidResponse = utils.deepClone(serverResponse);
+      let result = spec.interpretResponse({body: bidResponse});
+      expect(result[0].meta.advertiserDomains).to.deep.equal(expectedResponse[0].meta.advertiserDomains);
+      // case where adomains are not in request
+      expect(result[1].meta).to.not.exist;
+    });
   });
 
   describe('getUserSyncs', function () {
-    let syncOptionsIframe = { iframeEnabled: true };
-    let syncOptionsPixel = { pixelEnabled: true };
-    it('Should push the correct sync type depending on the config', function () {
-      let iframeSync = spec.getUserSyncs(syncOptionsIframe);
-      expect(iframeSync.length).to.equal(1);
-      expect(iframeSync[0].type).to.equal('iframe');
+    it('should register the iframe sync url', function () {
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      });
+      expect(syncs).to.not.be.an('undefined');
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+    });
+
+    it('should pass gdpr params', function () {
+      let syncs = spec.getUserSyncs({ iframeEnabled: true }, {}, {
+        gdprApplies: false, consentString: 'test'
+      });
+      expect(syncs).to.not.be.an('undefined');
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.contains('gdpr=0');
     });
   });
 });
diff --git a/test/spec/modules/engageyaBidAdapter_spec.js b/test/spec/modules/engageyaBidAdapter_spec.js
new file mode 100644
index 00000000000..ad411fc9350
--- /dev/null
+++ b/test/spec/modules/engageyaBidAdapter_spec.js
@@ -0,0 +1,161 @@
+import {expect} from 'chai';
+import {spec} from 'modules/engageyaBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const ENDPOINT_URL = 'https://recs.engageya.com/rec-api/getrecs.json';
+
+export const _getUrlVars = function(url) {
+  var hash;
+  var myJson = {};
+  var hashes = url.slice(url.indexOf('?') + 1).split('&');
+  for (var i = 0; i < hashes.length; i++) {
+    hash = hashes[i].split('=');
+    myJson[hash[0]] = hash[1];
+  }
+  return myJson;
+}
+
+describe('engageya adapter', function() {
+  let bidRequests;
+  let nativeBidRequests;
+
+  beforeEach(function() {
+    bidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+    ]
+
+    nativeBidRequests = [
+      {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        },
+        nativeParams: {
+          title: {
+            required: true,
+            len: 80
+          },
+          image: {
+            required: true,
+            sizes: [150, 50]
+          },
+          sponsoredBy: {
+            required: true
+          }
+        }
+      }
+    ]
+  })
+  describe('isBidRequestValid', function () {
+    it('valid bid case', function () {
+      let validBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: 85610,
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid case: widgetId and websiteId is not passed', function() {
+      let validBid = {
+        bidder: 'engageya',
+        params: {
+        }
+      }
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    })
+
+    it('invalid bid case: widget id must be number', function() {
+      let invalidBid = {
+        bidder: 'engageya',
+        params: {
+          widgetId: '157746a',
+          websiteId: 91140,
+          pageUrl: '[PAGE_URL]'
+        }
+      }
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    })
+  })
+
+  describe('buildRequests', function () {
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.include(ENDPOINT_URL);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('buildRequests function should not modify original bidRequests object', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let request = spec.buildRequests(bidRequests);
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('buildRequests function should not modify original nativeBidRequests object', function () {
+      let originalBidRequests = utils.deepClone(nativeBidRequests);
+      let request = spec.buildRequests(nativeBidRequests);
+      expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+    });
+
+    it('Request params check', function() {
+      let request = spec.buildRequests(bidRequests)[0];
+      const data = _getUrlVars(request.url)
+      expect(parseInt(data.wid)).to.exist.and.to.equal(bidRequests[0].params.widgetId);
+      expect(parseInt(data.webid)).to.exist.and.to.equal(bidRequests[0].params.websiteId);
+    })
+  })
+
+  describe('interpretResponse', function () {
+    let response = {recs: [
+      {
+        'ecpm': 0.0920,
+        'postId': '',
+        'ad': '',
+        'thumbnail_path': 'https://engageya.live/wp-content/uploads/2019/05/images.png'
+      }
+    ],
+    imageWidth: 300,
+    imageHeight: 250,
+    ireqId: '1d236f7890b',
+    pbtypeId: 2};
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          'requestId': '1d236f7890b',
+          'cpm': 0.0920,
+          'width': 300,
+          'height': 250,
+          'netRevenue': false,
+          'currency': 'USD',
+          'creativeId': '',
+          'ttl': 700,
+          'ad': ''
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({body: response}, request);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].cpm).to.not.equal(null);
+      expect(result[0].creativeId).to.not.equal(null);
+      expect(result[0].ad).to.not.equal(null);
+      expect(result[0].currency).to.equal('USD');
+      expect(result[0].netRevenue).to.equal(false);
+    });
+  })
+})
diff --git a/test/spec/modules/enrichmentFpdModule_spec.js b/test/spec/modules/enrichmentFpdModule_spec.js
new file mode 100644
index 00000000000..e5271143f2c
--- /dev/null
+++ b/test/spec/modules/enrichmentFpdModule_spec.js
@@ -0,0 +1,97 @@
+import { expect } from 'chai';
+import * as utils from 'src/utils.js';
+import { getRefererInfo } from 'src/refererDetection.js';
+import { initSubmodule } from 'modules/enrichmentFpdModule.js';
+
+describe('the first party data enrichment module', function() {
+  let width;
+  let widthStub;
+  let height;
+  let heightStub;
+  let querySelectorStub;
+  let canonical;
+  let keywords;
+
+  before(function() {
+    canonical = document.createElement('link');
+    canonical.rel = 'canonical';
+    keywords = document.createElement('meta');
+    keywords.name = 'keywords';
+  });
+
+  beforeEach(function() {
+    querySelectorStub = sinon.stub(window.top.document, 'querySelector');
+    querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
+    querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
+    widthStub = sinon.stub(window.top, 'innerWidth').get(function() {
+      return width;
+    });
+    heightStub = sinon.stub(window.top, 'innerHeight').get(function() {
+      return height;
+    });
+  });
+
+  afterEach(function() {
+    widthStub.restore();
+    heightStub.restore();
+    querySelectorStub.restore();
+    canonical = document.createElement('link');
+    canonical.rel = 'canonical';
+    keywords = document.createElement('meta');
+    keywords.name = 'keywords';
+  });
+
+  it('adds ref and device values', function() {
+    width = 800;
+    height = 500;
+
+    let validated = initSubmodule({}, {});
+
+    expect(validated.site.ref).to.equal(getRefererInfo().referer);
+    expect(validated.site.page).to.be.undefined;
+    expect(validated.site.domain).to.be.undefined;
+    expect(validated.device).to.deep.equal({ w: 800, h: 500 });
+    expect(validated.site.keywords).to.be.undefined;
+  });
+
+  it('adds page and domain values if canonical url exists', function() {
+    width = 800;
+    height = 500;
+    canonical.href = 'https://www.domain.com/path?query=12345';
+
+    let validated = initSubmodule({}, {});
+
+    expect(validated.site.ref).to.equal(getRefererInfo().referer);
+    expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
+    expect(validated.site.domain).to.equal('domain.com');
+    expect(validated.device).to.deep.equal({ w: 800, h: 500 });
+    expect(validated.site.keywords).to.be.undefined;
+  });
+
+  it('adds keyword value if keyword meta content exists', function() {
+    width = 800;
+    height = 500;
+    keywords.content = 'value1,value2,value3';
+
+    let validated = initSubmodule({}, {});
+
+    expect(validated.site.ref).to.equal(getRefererInfo().referer);
+    expect(validated.site.page).to.be.undefined;
+    expect(validated.site.domain).to.be.undefined;
+    expect(validated.device).to.deep.equal({ w: 800, h: 500 });
+    expect(validated.site.keywords).to.equal('value1,value2,value3');
+  });
+
+  it('does not overwrite existing data from getConfig ortb2', function() {
+    width = 800;
+    height = 500;
+
+    let validated = initSubmodule({}, {device: {w: 1200, h: 700}, site: {ref: 'https://someUrl.com', page: 'test.com'}});
+
+    expect(validated.site.ref).to.equal('https://someUrl.com');
+    expect(validated.site.page).to.equal('test.com');
+    expect(validated.site.domain).to.be.undefined;
+    expect(validated.device).to.deep.equal({ w: 1200, h: 700 });
+    expect(validated.site.keywords).to.be.undefined;
+  });
+});
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index f267680b46b..6aa191f29a5 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -1,6 +1,9 @@
 import { expect } from 'chai';
 import { spec, storage } from 'modules/eplanningBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { init } from 'modules/userId/index.js';
+import * as utils from 'src/utils.js';
 
 describe('E-Planning Adapter', function () {
   const adapter = newBidder('spec');
@@ -23,6 +26,7 @@ describe('E-Planning Adapter', function () {
   const I_ID = '7854abc56248f873';
   const CRID = '1234567890';
   const TEST_ISV = 'leles.e-planning.net';
+  const ADOMAIN = 'adomain.com';
   const validBid = {
     'bidder': 'eplanning',
     'bidId': BID_ID,
@@ -32,6 +36,15 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBid2 = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID2,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE2,
+    'sizes': [[300, 250], [300, 600]],
+  };
   const ML = '1';
   const validBidMappingLinear = {
     'bidder': 'eplanning',
@@ -43,13 +56,14 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': ADUNIT_CODE,
     'sizes': [[300, 250], [300, 600]],
   };
-  const validBid2 = {
+  const SN = 'spaceName';
+  const validBidSpaceName = {
     'bidder': 'eplanning',
-    'bidId': BID_ID2,
+    'bidId': BID_ID,
     'params': {
       'ci': CI,
+      'sn': SN,
     },
-    'adUnitCode': ADUNIT_CODE2,
     'sizes': [[300, 250], [300, 600]],
   };
   const validBidView = {
@@ -95,6 +109,39 @@ describe('E-Planning Adapter', function () {
     'adUnitCode': 'adunit-code',
     'sizes': [[300, 250], [300, 600]],
   };
+  const validBidExistingSizesInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [320, 50], [300, 50]],
+  };
+  const validBidSizesNotExistingInPriorityListForMobile = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 70], [160, 600]],
+  };
+  const validBidExistingSizesInPriorityListForDesktop = {
+    'bidder': 'eplanning',
+    'bidId': BID_ID,
+    'params': {
+      'ci': CI,
+    },
+    'adUnitCode': ADUNIT_CODE,
+    'sizes': [[970, 250], [300, 600], [300, 250]],
+    'ext': {
+      'screen': {
+        'w': 1025,
+        'h': 1025
+      }
+    }
+  };
   const response = {
     body: {
       'sI': {
@@ -191,6 +238,39 @@ describe('E-Planning Adapter', function () {
       ]
     }
   };
+  const responseWithAdomain = {
+    body: {
+      'sI': {
+        'k': '12345'
+      },
+      'sec': {
+        'k': 'ROS'
+      },
+      'sp': [{
+        'k': CLEAN_ADUNIT_CODE,
+        'a': [{
+          'adm': ADM,
+          'id': '7854abc56248f874',
+          'i': I_ID,
+          'fi': '7854abc56248f872',
+          'ip': '45621afd87462104',
+          'w': W,
+          'h': H,
+          'crid': CRID,
+          'pr': CPM,
+          'adom': ADOMAIN
+        }],
+      }],
+      'cs': [
+        'http://a-sync-url.com/',
+        {
+          'u': 'http://another-sync-url.com/test.php?&partner=123456&endpoint=us-east',
+          'ifr': true
+        }
+      ]
+    }
+  };
+
   const responseWithNoSpace = {
     body: {
       'sI': {
@@ -247,9 +327,30 @@ describe('E-Planning Adapter', function () {
 
   describe('buildRequests', function () {
     let bidRequests = [validBid];
+    let sandbox;
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+    });
+
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    const createWindow = () => {
+      const win = {};
+      win.self = win;
+      win.innerWidth = 1025;
+      return win;
+    };
+
+    function setupSingleWindow(sandBox) {
+      const win = createWindow();
+      sandBox.stub(utils, 'getWindowSelf').returns(win);
+    }
+
     it('should create the url correctly', function () {
       const url = spec.buildRequests(bidRequests, bidderRequest).url;
-      expect(url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(url).to.equal('https://ads.us.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
     });
 
     it('should return GET method', function () {
@@ -257,11 +358,6 @@ describe('E-Planning Adapter', function () {
       expect(method).to.equal('GET');
     });
 
-    it('should return r parameter with value pbjs', function () {
-      const r = spec.buildRequests(bidRequests, bidderRequest).data.r;
-      expect(r).to.equal('pbjs');
-    });
-
     it('should return pbv parameter with value prebid version', function () {
       const pbv = spec.buildRequests(bidRequests, bidderRequest).data.pbv;
       expect(pbv).to.equal('$prebid.version$');
@@ -278,6 +374,12 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600');
     });
 
+    it('should return e parameter with space name attribute with value according to the adunit sizes', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600');
+    });
+
     it('should return correct e parameter with more than one adunit', function () {
       const NEW_CODE = ADUNIT_CODE + '2';
       const CLEAN_NEW_CODE = CLEAN_ADUNIT_CODE + '2';
@@ -314,6 +416,23 @@ describe('E-Planning Adapter', function () {
       expect(e).to.equal(CLEAN_ADUNIT_CODE_ML + ':300x250,300x600+' + CLEAN_NEW_CODE + ':100x100');
     });
 
+    it('should return correct e parameter with space name attribute with more than one adunit', function () {
+      let bidRequestsSN = [validBidSpaceName];
+      const NEW_SN = 'anotherNameSpace';
+      const anotherBid = {
+        'bidder': 'eplanning',
+        'params': {
+          'ci': CI,
+          'sn': NEW_SN,
+        },
+        'sizes': [[100, 100]],
+      };
+      bidRequestsSN.push(anotherBid);
+
+      const e = spec.buildRequests(bidRequestsSN, bidderRequest).data.e;
+      expect(e).to.equal(SN + ':300x250,300x600+' + NEW_SN + ':100x100');
+    });
+
     it('should return correct e parameter when the adunit has no size', function () {
       const noSizeBid = {
         'bidder': 'eplanning',
@@ -388,6 +507,25 @@ describe('E-Planning Adapter', function () {
       const dataRequest = request.data;
       expect(dataRequest.ccpa).to.equal('consentCcpa');
     });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the mobile priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('320x50_0:320x50,300x50,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order corresponding to the desktop priority list of the ad units', function () {
+      let bidRequestsPrioritySizes = [validBidExistingSizesInPriorityListForDesktop];
+      setupSingleWindow(sandbox);
+      const e = spec.buildRequests(bidRequestsPrioritySizes, bidderRequest).data.e;
+      expect(e).to.equal('300x250_0:300x250,300x600,970x250');
+    });
+
+    it('should return the e parameter with a value according to the sizes in order as they are sent from the ad units', function () {
+      let bidRequestsPrioritySizes2 = [validBidSizesNotExistingInPriorityListForMobile];
+      const e = spec.buildRequests(bidRequestsPrioritySizes2, bidderRequest).data.e;
+      expect(e).to.equal('970x250_0:970x250,300x70,160x600');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -416,6 +554,25 @@ describe('E-Planning Adapter', function () {
       };
       expect(bidResponse).to.deep.equal(expectedResponse);
     });
+
+    it('should pass advertiserDomains when present', function () {
+      const bidResponse = spec.interpretResponse(responseWithAdomain, { adUnitToBidId: { [CLEAN_ADUNIT_CODE]: BID_ID } })[0];
+      const expectedResponse = {
+        requestId: BID_ID,
+        cpm: CPM,
+        width: W,
+        height: H,
+        ad: ADM,
+        ttl: 120,
+        creativeId: CRID,
+        netRevenue: true,
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ADOMAIN
+        }
+      };
+      expect(bidResponse).to.deep.equal(expectedResponse);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -583,7 +740,7 @@ describe('E-Planning Adapter', function () {
       hasLocalStorageStub.returns(false);
       const response = spec.buildRequests(bidRequests, bidderRequest);
 
-      expect(response.url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(response.url).to.equal('https://ads.us.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
       expect(response.data.vs).to.equal('F');
 
       sinon.assert.notCalled(getLocalStorageSpy);
@@ -593,7 +750,7 @@ describe('E-Planning Adapter', function () {
     it('should create the url correctly with LocalStorage', function() {
       createElementVisible();
       const response = spec.buildRequests(bidRequests, bidderRequest);
-      expect(response.url).to.equal('https://ads.us.e-planning.net/hb/1/' + CI + '/1/localhost/ROS');
+      expect(response.url).to.equal('https://ads.us.e-planning.net/pbjs/1/' + CI + '/1/localhost/ROS');
 
       expect(response.data.vs).to.equal('F');
 
@@ -796,4 +953,26 @@ describe('E-Planning Adapter', function () {
       });
     });
   });
+  describe('Send eids', function() {
+    it('should add eids to the request', function() {
+      init(config);
+      config.setConfig({
+        userSync: {
+          userIds: [
+            { name: 'id5Id', value: { 'id5id': { uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } } } },
+            { name: 'pubCommonId', value: {'pubcid': 'c29cb2ae-769d-42f6-891a-f53cadee823d'} },
+            { name: 'unifiedId', value: {'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3'} }
+          ]
+        }
+      });
+      let bidRequests = [validBidView];
+      const expected_id5id = encodeURIComponent(JSON.stringify({ uid: 'ID5-ZHMOL_IfFSt7_lVYX8rBZc6GH3XMWyPQOBUfr4bm0g!', ext: { linkType: 1 } }));
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const dataRequest = request.data;
+
+      expect('D6885E90-2A7A-4E0F-87CB-7734ED1B99A3').to.equal(dataRequest.e_tdid);
+      expect('c29cb2ae-769d-42f6-891a-f53cadee823d').to.equal(dataRequest.e_pubcid);
+      expect(expected_id5id).to.equal(dataRequest.e_id5id);
+    });
+  });
 });
diff --git a/test/spec/modules/etargetBidAdapter_spec.js b/test/spec/modules/etargetBidAdapter_spec.js
index 4f5e0c224ec..e2310aee1fb 100644
--- a/test/spec/modules/etargetBidAdapter_spec.js
+++ b/test/spec/modules/etargetBidAdapter_spec.js
@@ -26,6 +26,11 @@ describe('etarget adapter', function () {
       assert.lengthOf(parsedUrl.items, 7);
     });
 
+    it('should be an object', function () {
+      let request = spec.buildRequests(bids);
+      assert.isNotNull(request.metaData);
+    });
+
     it('should handle global request parameters', function () {
       let parsedUrl = parseUrl(spec.buildRequests([bids[0]]).url);
       assert.equal(parsedUrl.path, 'https://sk.search.etargetnet.com/hb');
@@ -154,6 +159,7 @@ describe('etarget adapter', function () {
       assert.equal(result.height, 250);
       assert.equal(result.currency, 'EUR');
       assert.equal(result.netRevenue, true);
+      assert.isNotNull(result.reason);
       assert.equal(result.ttl, 360);
       assert.equal(result.ad, '');
       assert.equal(result.transactionId, '5f33781f-9552-4ca1');
diff --git a/test/spec/modules/fabrickIdSystem_spec.js b/test/spec/modules/fabrickIdSystem_spec.js
new file mode 100644
index 00000000000..c250c8e5e8b
--- /dev/null
+++ b/test/spec/modules/fabrickIdSystem_spec.js
@@ -0,0 +1,134 @@
+import * as utils from '../../../src/utils.js';
+import {server} from '../../mocks/xhr.js';
+
+import {fabrickIdSubmodule, appendUrl} from 'modules/fabrickIdSystem.js';
+
+const defaultConfigParams = {
+  apiKey: '123',
+  e: 'abc',
+  p: ['def', 'hij'],
+  url: 'http://localhost:9999/test/mocks/fabrickId.json?'
+};
+const responseHeader = {'Content-Type': 'application/json'}
+
+describe('Fabrick ID System', function() {
+  let logErrorStub;
+
+  beforeEach(function () {
+  });
+
+  afterEach(function () {
+  });
+
+  it('should log an error if no configParams were passed into getId', function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+    fabrickIdSubmodule.getId();
+    expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
+  });
+
+  it('should error on json parsing', function() {
+    logErrorStub = sinon.stub(utils, 'logError');
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: defaultConfigParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    request.respond(
+      200,
+      responseHeader,
+      '] this is not json {'
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(logErrorStub.calledOnce).to.be.true;
+    logErrorStub.restore();
+  });
+
+  it('should truncate the params', function() {
+    let r = '';
+    for (let i = 0; i < 1500; i++) {
+      r += 'r';
+    }
+    let configParams = Object.assign({}, defaultConfigParams, {
+      refererInfo: {
+        referer: r,
+        stack: ['s-0'],
+        canonicalUrl: 'cu-0'
+      }
+    });
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: configParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    r = '';
+    for (let i = 0; i < 1000 - 3; i++) {
+      r += 'r';
+    }
+    expect(request.url).to.match(new RegExp(`r=${r}&r=`));
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should complete successfully', function() {
+    let configParams = Object.assign({}, defaultConfigParams, {
+      refererInfo: {
+        referer: 'r-0',
+        stack: ['s-0'],
+        canonicalUrl: 'cu-0'
+      }
+    });
+    let submoduleCallback = fabrickIdSubmodule.getId({
+      name: 'fabrickId',
+      params: configParams
+    }).callback;
+    let callBackSpy = sinon.spy();
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.match(/r=r-0&r=s-0&r=cu-0&r=http/);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should truncate 2', function() {
+    let configParams = {
+      maxUrlLen: 10,
+      maxRefLen: 5,
+      maxSpaceAvailable: 2
+    };
+
+    let url = appendUrl('', 'r', '123', configParams);
+    expect(url).to.equal('&r=12');
+
+    url = appendUrl('12345', 'r', '678', configParams);
+    expect(url).to.equal('12345&r=67');
+
+    url = appendUrl('12345678', 'r', '9', configParams);
+    expect(url).to.equal('12345678');
+
+    configParams.maxRefLen = 8;
+    url = appendUrl('', 'r', '1234&', configParams);
+    expect(url).to.equal('&r=1234');
+
+    url = appendUrl('', 'r', '123&', configParams);
+    expect(url).to.equal('&r=123');
+
+    url = appendUrl('', 'r', '12&', configParams);
+    expect(url).to.equal('&r=12%26');
+
+    url = appendUrl('', 'r', '1&&', configParams);
+    expect(url).to.equal('&r=1%26');
+  });
+});
diff --git a/test/spec/modules/feedadBidAdapter_spec.js b/test/spec/modules/feedadBidAdapter_spec.js
index 066ab6b21f6..6b75af0d55d 100644
--- a/test/spec/modules/feedadBidAdapter_spec.js
+++ b/test/spec/modules/feedadBidAdapter_spec.js
@@ -13,7 +13,7 @@ describe('FeedAdAdapter', function () {
     it('should only support video and banner ads', function () {
       expect(spec.supportedMediaTypes).to.be.a('array');
       expect(spec.supportedMediaTypes).to.include(BANNER);
-      expect(spec.supportedMediaTypes).to.include(VIDEO);
+      expect(spec.supportedMediaTypes).not.to.include(VIDEO);
       expect(spec.supportedMediaTypes).not.to.include(NATIVE);
     });
     it('should export the BidderSpec functions', function () {
@@ -23,6 +23,9 @@ describe('FeedAdAdapter', function () {
       expect(spec.onTimeout).to.be.a('function');
       expect(spec.onBidWon).to.be.a('function');
     });
+    it('should export the TCF vendor ID', function () {
+      expect(spec.gvlid).to.equal(781);
+    })
   });
 
   describe('isBidRequestValid', function () {
@@ -248,6 +251,40 @@ describe('FeedAdAdapter', function () {
       let result = spec.buildRequests([bid, bid, bid]);
       expect(result).to.be.empty;
     });
+    it('should not include GDPR data if the bidder request has none available', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let result = spec.buildRequests([bid], bidderRequest);
+      expect(result.data.gdprApplies).to.be.undefined;
+      expect(result.data.consentIabTcf).to.be.undefined;
+    });
+    it('should include GDPR data if the bidder requests contains it', function () {
+      let bid = {
+        code: 'feedad',
+        mediaTypes: {
+          banner: {
+            sizes: [[320, 250]]
+          }
+        },
+        params: {clientToken: 'clientToken', placementId: 'placement-id'}
+      };
+      let request = Object.assign({}, bidderRequest, {
+        gdprConsent: {
+          consentString: 'the consent string',
+          gdprApplies: true
+        }
+      });
+      let result = spec.buildRequests([bid], request);
+      expect(result.data.gdprApplies).to.equal(request.gdprConsent.gdprApplies);
+      expect(result.data.consentIabTcf).to.equal(request.gdprConsent.consentString);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -404,7 +441,7 @@ describe('FeedAdAdapter', function () {
             prebid_bid_id: bidId,
             prebid_transaction_id: transactionId,
             referer,
-            sdk_version: '1.0.0'
+            sdk_version: '1.0.2'
           };
           subject(data);
           expect(server.requests.length).to.equal(1);
diff --git a/test/spec/modules/fintezaAnalyticsAdapter_spec.js b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
index 29136c85241..2625343de9b 100644
--- a/test/spec/modules/fintezaAnalyticsAdapter_spec.js
+++ b/test/spec/modules/fintezaAnalyticsAdapter_spec.js
@@ -12,7 +12,7 @@ function setCookie(name, value, expires) {
   document.cookie = name + '=' + value +
     '; path=/' +
     (expires ? ('; expires=' + expires.toUTCString()) : '') +
-    '; SameSite=None';
+    '; SameSite=Lax';
 }
 
 describe('finteza analytics adapter', function () {
@@ -51,7 +51,7 @@ describe('finteza analytics adapter', function () {
 
   describe('track', () => {
     describe('bid request', () => {
-      it('builds and sends data', function () {
+      xit('builds and sends data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -95,7 +95,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid response', () => {
-      it('builds and sends data', function () {
+      xit('builds and sends data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -154,7 +154,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid won', () => {
-      it('builds and sends data', function () {
+      xit('builds and sends data', function () {
         const bidderCode = 'Bidder789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
@@ -194,7 +194,7 @@ describe('finteza analytics adapter', function () {
     });
 
     describe('bid timeout', () => {
-      it('builds and sends data', function () {
+      xit('builds and sends data', function () {
         const bidderCode = 'biDDer789';
         const pauctionId = '5018eb39-f900-4370-b71e-3bb5b48d324f';
 
diff --git a/test/spec/modules/fpdModule_spec.js b/test/spec/modules/fpdModule_spec.js
new file mode 100644
index 00000000000..c2a6c41835e
--- /dev/null
+++ b/test/spec/modules/fpdModule_spec.js
@@ -0,0 +1,464 @@
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {config} from 'src/config.js';
+import {getRefererInfo} from 'src/refererDetection.js';
+import {init, registerSubmodules} from 'modules/fpdModule/index.js';
+import * as enrichmentModule from 'modules/enrichmentFpdModule.js';
+import * as validationModule from 'modules/validationFpdModule/index.js';
+
+let enrichments = {
+  name: 'enrichments',
+  queue: 2,
+  init: enrichmentModule.initSubmodule
+};
+let validations = {
+  name: 'validations',
+  queue: 1,
+  init: validationModule.initSubmodule
+};
+
+describe('the first party data module', function () {
+  let ortb2 = {
+    device: {
+      h: 911,
+      w: 1733
+    },
+    user: {
+      data: [{
+        segment: [{
+          id: 'foo'
+        }],
+        name: 'bar',
+        ext: 'string'
+      }]
+    },
+    site: {
+      content: {
+        data: [{
+          segment: [{
+            id: 'test'
+          }],
+          name: 'content',
+          ext: {
+            foo: 'bar'
+          }
+        }]
+      }
+    }
+  };
+
+  let conf = {
+    device: {
+      h: 500,
+      w: 750
+    },
+    user: {
+      keywords: 'test1, test2',
+      gender: 'f',
+      data: [{
+        segment: [{
+          id: 'test'
+        }],
+        name: 'alt'
+      }]
+    },
+    site: {
+      ref: 'domain.com',
+      page: 'www.domain.com/test',
+      ext: {
+        data: {
+          inventory: ['first']
+        }
+      }
+    }
+  };
+
+  afterEach(function () {
+    config.resetConfig();
+  });
+
+  describe('first party data intitializing', function () {
+    let width;
+    let widthStub;
+    let height;
+    let heightStub;
+    let querySelectorStub;
+    let canonical;
+    let keywords;
+
+    before(function() {
+      canonical = document.createElement('link');
+      canonical.rel = 'canonical';
+      keywords = document.createElement('meta');
+      keywords.name = 'keywords';
+    });
+
+    beforeEach(function() {
+      querySelectorStub = sinon.stub(window.top.document, 'querySelector');
+      querySelectorStub.withArgs("link[rel='canonical']").returns(canonical);
+      querySelectorStub.withArgs("meta[name='keywords']").returns(keywords);
+      widthStub = sinon.stub(window.top, 'innerWidth').get(function () {
+        return width;
+      });
+      heightStub = sinon.stub(window.top, 'innerHeight').get(function () {
+        return height;
+      });
+    });
+
+    afterEach(function() {
+      widthStub.restore();
+      heightStub.restore();
+      querySelectorStub.restore();
+      canonical = document.createElement('link');
+      canonical.rel = 'canonical';
+      keywords = document.createElement('meta');
+      keywords.name = 'keywords';
+    });
+
+    it('sets default referer and dimension values to ortb2 data', function () {
+      registerSubmodules(enrichments);
+      registerSubmodules(validations);
+
+      let validated;
+
+      width = 1120;
+      height = 750;
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal(getRefererInfo().referer);
+      expect(validated.site.page).to.be.undefined;
+      expect(validated.site.domain).to.be.undefined;
+      expect(validated.device).to.deep.equal({w: 1120, h: 750});
+      expect(validated.site.keywords).to.be.undefined;
+    });
+
+    it('sets page and domain values to ortb2 data if canonical link exists', function () {
+      let validated;
+
+      canonical.href = 'https://www.domain.com/path?query=12345';
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal(getRefererInfo().referer);
+      expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
+      expect(validated.site.domain).to.equal('domain.com');
+      expect(validated.device).to.deep.to.equal({w: 1120, h: 750});
+      expect(validated.site.keywords).to.be.undefined;
+    });
+
+    it('sets keyword values to ortb2 data if keywords meta exists', function () {
+      let validated;
+
+      keywords.content = 'value1,value2,value3';
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal(getRefererInfo().referer);
+      expect(validated.site.page).to.be.undefined;
+      expect(validated.site.domain).to.be.undefined;
+      expect(validated.device).to.deep.to.equal({w: 1120, h: 750});
+      expect(validated.site.keywords).to.equal('value1,value2,value3');
+    });
+
+    it('only sets values that do not exist in ortb2 config', function () {
+      let validated;
+
+      config.setConfig({ortb2: {site: {ref: 'https://testpage.com', domain: 'newDomain.com'}}});
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal('https://testpage.com');
+      expect(validated.site.page).to.be.undefined;
+      expect(validated.site.domain).to.equal('newDomain.com');
+      expect(validated.device).to.deep.to.equal({w: 1120, h: 750});
+      expect(validated.site.keywords).to.be.undefined;
+    });
+
+    it('filters ortb2 data that is set', function () {
+      let validated;
+      let conf = {
+        ortb2: {
+          user: {
+            data: {},
+            gender: 'f',
+            age: 45
+          },
+          site: {
+            content: {
+              data: [{
+                segment: {
+                  test: 1
+                },
+                name: 'foo'
+              }, {
+                segment: [{
+                  id: 'test'
+                }, {
+                  id: 3
+                }],
+                name: 'bar'
+              }]
+            }
+          },
+          device: {
+            w: 1,
+            h: 1
+          }
+        }
+      };
+
+      config.setConfig(conf);
+      canonical.href = 'https://www.domain.com/path?query=12345';
+      width = 1120;
+      height = 750;
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal(getRefererInfo().referer);
+      expect(validated.site.page).to.equal('https://www.domain.com/path?query=12345');
+      expect(validated.site.domain).to.equal('domain.com');
+      expect(validated.site.content.data).to.deep.equal([{segment: [{id: 'test'}], name: 'bar'}]);
+      expect(validated.user.data).to.be.undefined;
+      expect(validated.device).to.deep.to.equal({w: 1, h: 1});
+      expect(validated.site.keywords).to.be.undefined;
+    });
+
+    it('should not overwrite existing data with default settings', function () {
+      let validated;
+      let conf = {
+        ortb2: {
+          site: {
+            ref: 'https://referer.com'
+          }
+        }
+      };
+
+      config.setConfig(conf);
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal('https://referer.com');
+    });
+
+    it('should allow overwrite default data with setConfig', function () {
+      let validated;
+      let conf = {
+        ortb2: {
+          site: {
+            ref: 'https://referer.com'
+          }
+        }
+      };
+
+      config.setConfig(conf);
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal('https://referer.com');
+    });
+
+    it('should filter all data', function () {
+      let validated;
+      let conf = {
+        imp: [],
+        site: {
+          name: 123,
+          domain: 456,
+          page: 789,
+          ref: 987,
+          keywords: ['keywords'],
+          search: 654,
+          cat: 'cat',
+          sectioncat: 'sectioncat',
+          pagecat: 'pagecat',
+          content: {
+            data: [{
+              name: 1,
+              segment: []
+            }]
+          }
+        },
+        user: {
+          yob: 'twenty',
+          gender: 0,
+          keywords: ['foobar'],
+          data: ['test']
+        },
+        device: [800, 450],
+        cur: {
+          adServerCurrency: 'USD'
+        }
+      };
+
+      config.setConfig({'firstPartyData': {skipEnrichments: true}});
+
+      config.setConfig({ortb2: conf});
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated).to.deep.equal({});
+    });
+
+    it('should add enrichments but not alter any arbitrary ortb2 data', function () {
+      let validated;
+      let conf = {
+        site: {
+          ext: {
+            data: {
+              inventory: ['value1']
+            }
+          }
+        },
+        user: {
+          ext: {
+            data: {
+              visitor: ['value2']
+            }
+          }
+        },
+        cur: ['USD']
+      };
+
+      config.setConfig({ortb2: conf});
+
+      init();
+
+      validated = config.getConfig('ortb2');
+      expect(validated.site.ref).to.equal(getRefererInfo().referer);
+      expect(validated.site.ext.data).to.deep.equal({inventory: ['value1']});
+      expect(validated.user.ext.data).to.deep.equal({visitor: ['value2']});
+      expect(validated.cur).to.deep.equal(['USD']);
+    });
+
+    it('should filter bidderConfig data', function () {
+      let validated;
+      let conf = {
+        bidders: ['bidderA', 'bidderB'],
+        config: {
+          ortb2: {
+            site: {
+              keywords: 'other',
+              ref: 'https://domain.com'
+            },
+            user: {
+              keywords: 'test',
+              data: [{
+                segment: [{id: 4}],
+                name: 't'
+              }]
+            }
+          }
+        }
+      };
+
+      config.setBidderConfig(conf);
+
+      init();
+
+      validated = config.getBidderConfig();
+      expect(validated.bidderA.ortb2).to.not.be.undefined;
+      expect(validated.bidderA.ortb2.user.data).to.be.undefined;
+      expect(validated.bidderA.ortb2.user.keywords).to.equal('test');
+      expect(validated.bidderA.ortb2.site.keywords).to.equal('other');
+      expect(validated.bidderA.ortb2.site.ref).to.equal('https://domain.com');
+    });
+
+    it('should not filter bidderConfig data as it is valid', function () {
+      let validated;
+      let conf = {
+        bidders: ['bidderA', 'bidderB'],
+        config: {
+          ortb2: {
+            site: {
+              keywords: 'other',
+              ref: 'https://domain.com'
+            },
+            user: {
+              keywords: 'test',
+              data: [{
+                segment: [{id: 'data1_id'}],
+                name: 'data1'
+              }]
+            }
+          }
+        }
+      };
+
+      config.setBidderConfig(conf);
+
+      init();
+
+      validated = config.getBidderConfig();
+      expect(validated.bidderA.ortb2).to.not.be.undefined;
+      expect(validated.bidderA.ortb2.user.data).to.deep.equal([{segment: [{id: 'data1_id'}], name: 'data1'}]);
+      expect(validated.bidderA.ortb2.user.keywords).to.equal('test');
+      expect(validated.bidderA.ortb2.site.keywords).to.equal('other');
+      expect(validated.bidderA.ortb2.site.ref).to.equal('https://domain.com');
+    });
+
+    it('should not set default values if skipEnrichments is turned on', function () {
+      let validated;
+      config.setConfig({'firstPartyData': {skipEnrichments: true}});
+
+      let conf = {
+        site: {
+          keywords: 'other'
+        },
+        user: {
+          keywords: 'test',
+          data: [{
+            segment: [{id: 'data1_id'}],
+            name: 'data1'
+          }]
+        }
+      }
+      ;
+
+      config.setConfig({ortb2: conf});
+
+      init();
+
+      validated = config.getConfig();
+      expect(validated.ortb2).to.not.be.undefined;
+      expect(validated.ortb2.device).to.be.undefined;
+      expect(validated.ortb2.site.ref).to.be.undefined;
+      expect(validated.ortb2.site.page).to.be.undefined;
+      expect(validated.ortb2.site.domain).to.be.undefined;
+    });
+
+    it('should not validate ortb2 data if skipValidations is turned on', function () {
+      let validated;
+      config.setConfig({'firstPartyData': {skipValidations: true}});
+
+      let conf = {
+        site: {
+          keywords: 'other'
+        },
+        user: {
+          keywords: 'test',
+          data: [{
+            segment: [{id: 'nonfiltered'}]
+          }]
+        }
+      }
+      ;
+
+      config.setConfig({ortb2: conf});
+
+      init();
+
+      validated = config.getConfig();
+      expect(validated.ortb2).to.not.be.undefined;
+      expect(validated.ortb2.user.data).to.deep.equal([{segment: [{id: 'nonfiltered'}]}]);
+    });
+  });
+});
diff --git a/test/spec/modules/freewheel-sspBidAdapter_spec.js b/test/spec/modules/freewheel-sspBidAdapter_spec.js
index 3047b635d13..a5b4bd2a03f 100644
--- a/test/spec/modules/freewheel-sspBidAdapter_spec.js
+++ b/test/spec/modules/freewheel-sspBidAdapter_spec.js
@@ -152,6 +152,19 @@ 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);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 
@@ -226,6 +239,19 @@ 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);
+
+      let gdprConsent = {
+        'gdprApplies': true,
+        'consentString': gdprConsentString
+      }
+      let syncOptions = {
+        'pixelEnabled': true
+      }
+      const userSyncs = spec.getUserSyncs(syncOptions, null, gdprConsent, null);
+      expect(userSyncs).to.deep.equal([{
+        type: 'image',
+        url: 'https://ads.stickyadstv.com/auto-user-sync?gdpr=1&gdpr_consent=1FW-SSP-gdprConsent-'
+      }]);
     });
   })
 
@@ -297,7 +323,10 @@ describe('freewheelSSP BidAdapter Test', () => {
     '  ' +
     '   Adswizz' +
     '   ' +
-    '   https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008' +
+    '   https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-12008' +
+    '   ' +
+    '   ' +
+    '   ' +
     '   ' +
     '    ' +
     '     ' +
@@ -332,13 +361,17 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: ad
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -355,13 +388,17 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           ad: formattedAd
         }
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {
@@ -372,6 +409,7 @@ describe('freewheelSSP BidAdapter Test', () => {
       expect(result.length).to.equal(0);
     });
   });
+
   describe('interpretResponseForVideo', () => {
     let bidRequests = [
       {
@@ -435,6 +473,12 @@ describe('freewheelSSP BidAdapter Test', () => {
     '   Adswizz' +
     '   ' +
     '   https://ads.stickyadstv.com/auto-user-sync?dealId=NRJ-PRO-00008' +
+    '   ' +
+    '   ' +
+    '   ' +
+    '   ' +
+    '   ' +
+    '   ' +
     '   ' +
     '    ' +
     '     ' +
@@ -469,6 +513,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
           ad: ad
@@ -476,8 +522,10 @@ describe('freewheelSSP BidAdapter Test', () => {
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('should get correct bid response with formated ad', () => {
@@ -494,6 +542,8 @@ describe('freewheelSSP BidAdapter Test', () => {
           netRevenue: true,
           ttl: 360,
           dealId: 'NRJ-PRO-00008',
+          campaignId: 'SMF-WOW-55555',
+          bannerId: '12345',
           vastXml: response,
           mediaType: 'video',
           ad: formattedAd
@@ -501,8 +551,10 @@ describe('freewheelSSP BidAdapter Test', () => {
       ];
 
       let result = spec.interpretResponse(response, request[0]);
-      expect(Object.keys(result[0])).to.deep.equal(Object.keys(expectedResponse[0]));
+      expect(result[0].meta.advertiserDomains).to.deep.equal([]);
       expect(result[0].dealId).to.equal('NRJ-PRO-00008');
+      expect(result[0].campaignId).to.equal('SMF-WOW-55555');
+      expect(result[0].bannerId).to.equal('12345');
     });
 
     it('handles nobid responses', () => {
diff --git a/test/spec/modules/gamoshiBidAdapter_spec.js b/test/spec/modules/gamoshiBidAdapter_spec.js
index 79f58470cb3..8d63a32ef4d 100644
--- a/test/spec/modules/gamoshiBidAdapter_spec.js
+++ b/test/spec/modules/gamoshiBidAdapter_spec.js
@@ -2,6 +2,7 @@ import {expect} from 'chai';
 import {spec, helper} from 'modules/gamoshiBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {newBidder} from '../../../src/adapters/bidderFactory.js';
+import {deepClone} from 'src/utils';
 
 const supplyPartnerId = '123';
 const adapter = newBidder(spec);
@@ -240,6 +241,40 @@ describe('GamoshiAdapter', () => {
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123'}})).to.equal(true); // bidfloor has a default
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123', bidfloor: '123'}})).to.equal(false);
       expect(spec.isBidRequestValid({params: {supplyPartnerId: '123', bidfloor: 0.1}})).to.equal(true);
+
+      const getFloorResponse = {currency: 'USD', floor: 5};
+      let testBidRequest = deepClone(bidRequest);
+      let request = spec.buildRequests([testBidRequest], bidRequest)[0];
+
+      // 1. getBidFloor not exist AND bidfloor not exist - return 0
+      let payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.equal(0);
+
+      // 2. getBidFloor not exist AND bidfloor exist - use bidfloor property
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.params = {
+        'bidfloor': 0.3
+      };
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(0.3)
+
+      // 3. getBidFloor exist AND bidfloor not exist - use getFloor method
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(5)
+
+      // 4. getBidFloor exist AND bidfloor exist -> use getFloor method
+      testBidRequest = deepClone(bidRequest);
+      testBidRequest.getFloor = () => getFloorResponse;
+      testBidRequest.params = {
+        'bidfloor': 0.3
+      };
+      request = spec.buildRequests([testBidRequest], bidRequest)[0];
+      payload = request.data;
+      expect(payload.imp[0].bidfloor).to.exist.and.to.equal(5)
     });
 
     it('should validate adpos', () => {
@@ -339,19 +374,42 @@ describe('GamoshiAdapter', () => {
     it('builds request video object correctly', () => {
       let response;
       const bidRequestWithVideo = utils.deepClone(bidRequest);
+
+      bidRequestWithVideo.params.video = {
+        placement: 1,
+        minduration: 1,
+      }
+
       bidRequestWithVideo.mediaTypes = {
         video: {
-          playerSize: [[302, 252]]
+          playerSize: [[302, 252]],
+          mimes: ['video/mpeg'],
+          playbackmethod: 1,
+          startdelay: 1,
         }
       };
       response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
       expect(response.data.imp[0].video.w).to.equal(bidRequestWithVideo.mediaTypes.video.playerSize[0][0]);
       expect(response.data.imp[0].video.h).to.equal(bidRequestWithVideo.mediaTypes.video.playerSize[0][1]);
       expect(response.data.imp[0].video.pos).to.equal(0);
+
+      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.minduration).to.equal(1);
+      expect(response.data.imp[0].video.playbackmethod).to.equal(1);
+      expect(response.data.imp[0].video.startdelay).to.equal(1);
+
       bidRequestWithVideo.mediaTypes = {
         video: {
-          playerSize: [302, 252]
-        }
+          playerSize: [302, 252],
+          mimes: ['video/mpeg'],
+          skip: 1,
+          placement: 1,
+          minduration: 1,
+          playbackmethod: 1,
+          startdelay: 1,
+        },
       };
 
       const bidRequestWithPosEquals1 = utils.deepClone(bidRequestWithVideo);
@@ -367,7 +425,13 @@ describe('GamoshiAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
       bidRequestWithVideo.mediaTypes = {
         video: {
-          context: 'instream'
+          context: 'instream',
+          mimes: ['video/mpeg'],
+          skip: 1,
+          placement: 1,
+          minduration: 1,
+          playbackmethod: 1,
+          startdelay: 1,
         }
       };
       let response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
@@ -390,7 +454,13 @@ describe('GamoshiAdapter', () => {
       const bidRequestWithVideo = utils.deepClone(bidRequest);
       bidRequestWithVideo.mediaTypes.video = {
         playerSize: [[304, 254], [305, 255]],
-        context: 'instream'
+        context: 'instream',
+        mimes: ['video/mpeg'],
+        skip: 1,
+        placement: 1,
+        minduration: 1,
+        playbackmethod: 1,
+        startdelay: 1,
       };
 
       response = spec.buildRequests([bidRequestWithVideo], bidRequest)[0];
@@ -423,7 +493,7 @@ describe('GamoshiAdapter', () => {
     it('build request with ID5 Id', () => {
       const bidRequestClone = utils.deepClone(bidRequest);
       bidRequestClone.userId = {};
-      bidRequestClone.userId.id5id = 'id5-user-id';
+      bidRequestClone.userId.id5id = { uid: 'id5-user-id' };
       let request = spec.buildRequests([bidRequestClone], bidRequestClone)[0];
       expect(request.data.user.ext.eids).to.deep.equal([{
         'source': 'id5-sync.com',
@@ -480,6 +550,7 @@ describe('GamoshiAdapter', () => {
       expect(ad0.ad).to.equal(rtbResponse.seatbid[1].bid[0].adm);
       expect(ad0.vastXml).to.be.an('undefined');
       expect(ad0.vastUrl).to.be.an('undefined');
+      expect(ad0.meta.advertiserDomains).to.be.equal(rtbResponse.seatbid[1].bid[0].adomain);
     });
 
     it('aggregates video bids from all seat bids', () => {
diff --git a/test/spec/modules/gdprEnforcement_spec.js b/test/spec/modules/gdprEnforcement_spec.js
index 7f4828267a9..82cb70f42be 100644
--- a/test/spec/modules/gdprEnforcement_spec.js
+++ b/test/spec/modules/gdprEnforcement_spec.js
@@ -1,11 +1,24 @@
-import { deviceAccessHook, setEnforcementConfig, userSyncHook, userIdHook } from 'modules/gdprEnforcement.js';
+import {
+  deviceAccessHook,
+  setEnforcementConfig,
+  userSyncHook,
+  userIdHook,
+  makeBidRequestsHook,
+  validateRules,
+  enforcementRules,
+  purpose1Rule,
+  purpose2Rule,
+  enableAnalyticsHook,
+  getGvlid,
+  internal
+} from 'modules/gdprEnforcement.js';
 import { config } from 'src/config.js';
 import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
 import * as utils from 'src/utils.js';
 import { validateStorageEnforcement } from 'src/storageManager.js';
-import { executeStorageCallbacks } from 'src/prebid.js';
+import events from 'src/events.js';
 
-describe('gdpr enforcement', function() {
+describe('gdpr enforcement', function () {
   let nextFnSpy;
   let logWarnSpy;
   let gdprDataHandlerStub;
@@ -34,11 +47,12 @@ describe('gdpr enforcement', function() {
           'consents': {
             '1': true,
             '2': true,
-            '3': true
+            '3': true,
+            '7': true
           },
           'legitimateInterests': {
             '1': false,
-            '2': false,
+            '2': true,
             '3': false
           }
         },
@@ -46,7 +60,9 @@ describe('gdpr enforcement', function() {
           'consents': {
             '1': true,
             '2': true,
-            '3': false
+            '3': false,
+            '4': true,
+            '5': false
           },
           'legitimateInterests': {
             '1': false,
@@ -81,23 +97,38 @@ describe('gdpr enforcement', function() {
     }
   };
 
-  after(function() {
-    validateStorageEnforcement.getHooks({hook: deviceAccessHook}).remove();
-    $$PREBID_GLOBAL$$.requestBids.getHooks({hook: executeStorageCallbacks}).remove();
+  after(function () {
+    validateStorageEnforcement.getHooks({ hook: deviceAccessHook }).remove();
+    $$PREBID_GLOBAL$$.requestBids.getHooks().remove();
+    adapterManager.makeBidRequests.getHooks({ hook: makeBidRequestsHook }).remove();
   })
 
-  describe('deviceAccessHook', function() {
-    beforeEach(function() {
+  describe('deviceAccessHook', function () {
+    let adapterManagerStub;
+
+    function getBidderSpec(gvlid) {
+      return {
+        getSpec: () => {
+          return {
+            gvlid
+          }
+        }
+      }
+    }
+
+    beforeEach(function () {
       nextFnSpy = sinon.spy();
       gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
       logWarnSpy = sinon.spy(utils, 'logWarn');
+      adapterManagerStub = sinon.stub(adapterManager, 'getBidAdapter');
     });
-    afterEach(function() {
+    afterEach(function () {
       config.resetConfig();
       gdprDataHandler.getConsentData.restore();
       logWarnSpy.restore();
+      adapterManagerStub.restore();
     });
-    it('should not allow device access when device access flag is set to false', function() {
+    it('should not allow device access when device access flag is set to false', function () {
       config.setConfig({
         deviceAccess: false,
         consentManagement: {
@@ -118,10 +149,12 @@ describe('gdpr enforcement', function() {
         hasEnforcementHook: true,
         valid: false
       }
-      expect(nextFnSpy.calledWith(undefined, result));
+      sinon.assert.calledWith(nextFnSpy, undefined, undefined, result);
     });
 
-    it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function() {
+    it('should only check for consent for vendor exceptions when enforcePurpose and enforceVendor are false', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
+      adapterManagerStub.withArgs('rubicon').returns(getBidderSpec(5));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -143,7 +176,9 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(0);
     });
 
-    it('should check consent for all vendors when enforcePurpose and enforceVendor are true', function() {
+    it('should check consent for all vendors when enforcePurpose and enforceVendor are true', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
+      adapterManagerStub.withArgs('rubicon').returns(getBidderSpec(3));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -164,7 +199,8 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
-    it('should allow device access when gdprApplies is false and hasDeviceAccess flag is true', function() {
+    it('should allow device access when gdprApplies is false and hasDeviceAccess flag is true', function () {
+      adapterManagerStub.withArgs('appnexus').returns(getBidderSpec(1));
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -187,15 +223,83 @@ describe('gdpr enforcement', function() {
         hasEnforcementHook: true,
         valid: true
       }
-      expect(nextFnSpy.calledWith(undefined, result));
+      sinon.assert.calledWith(nextFnSpy, 1, 'appnexus', result);
+    });
+
+    it('should use gvlMapping set by publisher', function() {
+      config.setConfig({
+        'gvlMapping': {
+          'appnexus': 4
+        }
+      });
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: []
+          }]
+        }
+      });
+      let consentData = {}
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.gdprApplies = true;
+      consentData.apiVersion = 2;
+      gdprDataHandlerStub.returns(consentData);
+
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      let result = {
+        hasEnforcementHook: true,
+        valid: true
+      }
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      config.resetConfig();
+    });
+
+    it('should use gvl id of alias and not of parent', function() {
+      let curBidderStub = sinon.stub(config, 'getCurrentBidder');
+      curBidderStub.returns('appnexus-alias');
+      adapterManager.aliasBidAdapter('appnexus', 'appnexus-alias');
+      config.setConfig({
+        'gvlMapping': {
+          'appnexus-alias': 4
+        }
+      });
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: []
+          }]
+        }
+      });
+      let consentData = {}
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.gdprApplies = true;
+      consentData.apiVersion = 2;
+      gdprDataHandlerStub.returns(consentData);
+
+      deviceAccessHook(nextFnSpy, 1, 'appnexus');
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      let result = {
+        hasEnforcementHook: true,
+        valid: true
+      }
+      sinon.assert.calledWith(nextFnSpy, 4, 'appnexus', result);
+      config.resetConfig();
+      curBidderStub.restore();
     });
   });
 
-  describe('userSyncHook', function() {
+  describe('userSyncHook', function () {
     let curBidderStub;
     let adapterManagerStub;
 
-    beforeEach(function() {
+    beforeEach(function () {
       gdprDataHandlerStub = sinon.stub(gdprDataHandler, 'getConsentData');
       logWarnSpy = sinon.spy(utils, 'logWarn');
       curBidderStub = sinon.stub(config, 'getCurrentBidder');
@@ -203,7 +307,7 @@ describe('gdpr enforcement', function() {
       nextFnSpy = sinon.spy();
     });
 
-    afterEach(function() {
+    afterEach(function () {
       config.getCurrentBidder.restore();
       config.resetConfig();
       gdprDataHandler.getConsentData.restore();
@@ -211,7 +315,7 @@ describe('gdpr enforcement', function() {
       logWarnSpy.restore();
     });
 
-    it('should allow bidder to do user sync if consent is true', function() {
+    it('should allow bidder to do user sync if consent is true', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -230,7 +334,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -240,7 +344,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -250,7 +354,7 @@ describe('gdpr enforcement', function() {
       expect(nextFnSpy.calledTwice).to.equal(true);
     });
 
-    it('should not allow bidder to do user sync if user has denied consent', function() {
+    it('should not allow bidder to do user sync if user has denied consent', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -269,7 +373,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -279,7 +383,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -290,7 +394,7 @@ describe('gdpr enforcement', function() {
       expect(logWarnSpy.callCount).to.equal(1);
     });
 
-    it('should not check vendor consent when enforceVendor is false', function() {
+    it('should not check vendor consent when enforceVendor is false', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -309,7 +413,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder1');
       adapterManagerStub.withArgs('sampleBidder1').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 1
           }
@@ -319,7 +423,7 @@ describe('gdpr enforcement', function() {
 
       curBidderStub.returns('sampleBidder2');
       adapterManagerStub.withArgs('sampleBidder2').returns({
-        getSpec: function() {
+        getSpec: function () {
           return {
             'gvlid': 3
           }
@@ -331,16 +435,16 @@ describe('gdpr enforcement', function() {
     });
   });
 
-  describe('userIdHook', function() {
-    beforeEach(function() {
+  describe('userIdHook', function () {
+    beforeEach(function () {
       logWarnSpy = sinon.spy(utils, 'logWarn');
       nextFnSpy = sinon.spy();
     });
-    afterEach(function() {
+    afterEach(function () {
       config.resetConfig();
       logWarnSpy.restore();
     });
-    it('should allow user id module if consent is given', function() {
+    it('should allow user id module if consent is given', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -366,9 +470,10 @@ describe('gdpr enforcement', function() {
       const args = nextFnSpy.getCalls()[0].args;
       expect(args[1].hasValidated).to.be.true;
       expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, submodules, { ...consentData, hasValidated: true });
     });
 
-    it('should allow userId module if gdpr not in scope', function() {
+    it('should allow userId module if gdpr not in scope', function () {
       let submodules = [{
         submodule: {
           gvlid: 1,
@@ -381,10 +486,10 @@ describe('gdpr enforcement', function() {
       const args = nextFnSpy.getCalls()[0].args;
       expect(args[1]).to.be.null;
       expect(nextFnSpy.calledOnce).to.equal(true);
-      expect(nextFnSpy.calledWith(undefined, submodules, consentData));
+      sinon.assert.calledWith(nextFnSpy, submodules, consentData);
     });
 
-    it('should not enforce if not apiVersion 2', function() {
+    it('should not allow user id module if user denied consent', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
@@ -397,57 +502,624 @@ describe('gdpr enforcement', function() {
       });
       let consentData = {}
       consentData.vendorData = staticConfig.consentData.getTCData;
-      consentData.apiVersion = 1;
+      consentData.apiVersion = 2;
       consentData.gdprApplies = true;
+
       let submodules = [{
         submodule: {
           gvlid: 1,
           name: 'sampleUserId'
         }
+      }, {
+        submodule: {
+          gvlid: 3,
+          name: 'sampleUserId1'
+        }
       }]
       userIdHook(nextFnSpy, submodules, consentData);
-      // Should not pass back hasValidated flag since version 1
-      const args = nextFnSpy.getCalls()[0].args;
-      expect(args[1].hasValidated).to.be.undefined;
-      expect(args[0]).to.deep.equal(submodules);
-      expect(nextFnSpy.calledOnce).to.equal(true);
+      expect(logWarnSpy.callCount).to.equal(1);
+      let expectedSubmodules = [{
+        submodule: {
+          gvlid: 1,
+          name: 'sampleUserId'
+        }
+      }]
+      sinon.assert.calledWith(nextFnSpy, expectedSubmodules, { ...consentData, hasValidated: true });
     });
+  });
+
+  describe('makeBidRequestsHook', function () {
+    let sandbox;
+    let adapterManagerStub;
+    let emitEventSpy;
+
+    const MOCK_AD_UNITS = [{
+      code: 'ad-unit-1',
+      mediaTypes: {},
+      bids: [{
+        bidder: 'bidder_1' // has consent
+      }, {
+        bidder: 'bidder_2' // doesn't have consent, but liTransparency is true. Bidder remains active.
+      }]
+    }, {
+      code: 'ad-unit-2',
+      mediaTypes: {},
+      bids: [{
+        bidder: 'bidder_2'
+      }, {
+        bidder: 'bidder_3'
+      }]
+    }];
 
-    it('should not allow user id module if user denied consent', function() {
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      gdprDataHandlerStub = sandbox.stub(gdprDataHandler, 'getConsentData');
+      adapterManagerStub = sandbox.stub(adapterManager, 'getBidAdapter');
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+      nextFnSpy = sandbox.spy();
+      emitEventSpy = sandbox.spy(events, 'emit');
+    });
+    afterEach(function () {
+      config.resetConfig();
+      sandbox.restore();
+    });
+
+    it('should block bidder which does not have consent and allow bidder which has consent (liTransparency is established)', function () {
       setEnforcementConfig({
         gdpr: {
           rules: [{
-            purpose: 'storage',
-            enforcePurpose: false,
+            purpose: 'basicAds',
+            enforcePurpose: true,
             enforceVendor: true,
             vendorExceptions: []
           }]
         }
       });
-      let consentData = {}
+      const consentData = {};
       consentData.vendorData = staticConfig.consentData.getTCData;
       consentData.apiVersion = 2;
       consentData.gdprApplies = true;
-      let submodules = [{
-        submodule: {
-          gvlid: 1,
-          name: 'sampleUserId'
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('bidder_1').returns({
+        getSpec: function () {
+          return { 'gvlid': 4 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_2').returns({
+        getSpec: function () {
+          return { 'gvlid': 5 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_3').returns({
+        getSpec: function () {
+          return { 'gvlid': undefined }
         }
+      });
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        code: 'ad-unit-1',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_1' }),
+          sinon.match({ bidder: 'bidder_2' })
+        ]
       }, {
-        submodule: {
-          gvlid: 3,
-          name: 'sampleUserId1'
+        code: 'ad-unit-2',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_2' }),
+          sinon.match({ bidder: 'bidder_3' }) // should be allowed even though it's doesn't have a gvlId because liTransparency is established.
+        ]
+      }], []);
+    });
+
+    it('should block bidder which does not have consent and allow bidder which has consent (liTransparency is NOT established)', function() {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'basicAds',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: ['bidder_3']
+          }]
         }
-      }]
-      userIdHook(nextFnSpy, submodules, consentData);
-      expect(logWarnSpy.callCount).to.equal(1);
-      let expectedSubmodules = [{
-        submodule: {
-          gvlid: 1,
-          name: 'sampleUserId'
+      });
+      const consentData = {};
+
+      // set li for purpose 2 to false
+      const newConsentData = utils.deepClone(staticConfig);
+      newConsentData.consentData.getTCData.purpose.legitimateInterests['2'] = false;
+
+      consentData.vendorData = newConsentData.consentData.getTCData;
+      consentData.apiVersion = 2;
+      consentData.gdprApplies = true;
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('bidder_1').returns({
+        getSpec: function () {
+          return { 'gvlid': 4 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_2').returns({
+        getSpec: function () {
+          return { 'gvlid': 5 }
+        }
+      });
+      adapterManagerStub.withArgs('bidder_3').returns({
+        getSpec: function () {
+          return { 'gvlid': undefined }
         }
+      });
+
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        code: 'ad-unit-1',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_1' }), // 'bidder_2' is not present because it doesn't have vendorConsent
+        ]
+      }, {
+        code: 'ad-unit-2',
+        mediaTypes: {},
+        bids: [
+          sinon.match({ bidder: 'bidder_3' }), // 'bidder_3' is allowed despite gvlId being undefined because it's part of vendorExceptions
+        ]
+      }], []);
+
+      expect(logWarnSpy.calledOnce).to.equal(true);
+    });
+
+    it('should skip validation checks if GDPR version is not equal to "2"', function () {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'storage',
+            enforePurpose: false,
+            enforceVendor: false,
+            vendorExceptions: []
+          }]
+        }
+      });
+
+      const consentData = {};
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.apiVersion = 1;
+      consentData.gdprApplies = true;
+      gdprDataHandlerStub.returns(consentData);
+
+      makeBidRequestsHook(nextFnSpy, MOCK_AD_UNITS, []);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, sinon.match.array.deepEquals(MOCK_AD_UNITS), []);
+      expect(emitEventSpy.notCalled).to.equal(true);
+      expect(logWarnSpy.notCalled).to.equal(true);
+    });
+  });
+
+  describe('enableAnalyticsHook', function () {
+    let sandbox;
+    let adapterManagerStub;
+
+    const MOCK_ANALYTICS_ADAPTER_CONFIG = [{
+      provider: 'analyticsAdapter_A',
+      options: {}
+    }, {
+      provider: 'analyticsAdapter_B',
+      options: {}
+    }, {
+      provider: 'analyticsAdapter_C',
+      options: {}
+    }];
+
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      gdprDataHandlerStub = sandbox.stub(gdprDataHandler, 'getConsentData');
+      adapterManagerStub = sandbox.stub(adapterManager, 'getAnalyticsAdapter');
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+      nextFnSpy = sandbox.spy();
+    });
+
+    afterEach(function() {
+      config.resetConfig();
+      sandbox.restore();
+    });
+
+    it('should block analytics adapter which does not have consent and allow the one(s) which have consent', function() {
+      setEnforcementConfig({
+        gdpr: {
+          rules: [{
+            purpose: 'measurement',
+            enforcePurpose: true,
+            enforceVendor: true,
+            vendorExceptions: ['analyticsAdapter_B']
+          }]
+        }
+      });
+
+      const consentData = {};
+      consentData.vendorData = staticConfig.consentData.getTCData;
+      consentData.apiVersion = 2;
+      consentData.gdprApplies = true;
+
+      gdprDataHandlerStub.returns(consentData);
+      adapterManagerStub.withArgs('analyticsAdapter_A').returns({ gvlid: 3 });
+      adapterManagerStub.withArgs('analyticsAdapter_B').returns({ gvlid: 5 });
+      adapterManagerStub.withArgs('analyticsAdapter_C').returns({ gvlid: 1 });
+
+      enableAnalyticsHook(nextFnSpy, MOCK_ANALYTICS_ADAPTER_CONFIG);
+
+      // Assertions
+      expect(nextFnSpy.calledOnce).to.equal(true);
+      sinon.assert.calledWith(nextFnSpy, [{
+        provider: 'analyticsAdapter_B',
+        options: {}
+      }, {
+        provider: 'analyticsAdapter_C',
+        options: {}
+      }]);
+      expect(logWarnSpy.calledOnce).to.equal(true);
+    });
+  });
+
+  describe('validateRules', function () {
+    const createGdprRule = (purposeName = 'storage', enforcePurpose = true, enforceVendor = true, vendorExceptions = []) => ({
+      purpose: purposeName,
+      enforcePurpose: enforcePurpose,
+      enforceVendor: enforceVendor,
+      vendorExceptions: vendorExceptions
+    });
+
+    const consentData = {
+      vendorData: staticConfig.consentData.getTCData,
+      apiVersion: 2,
+      gdprApplies: true
+    };
+
+    // Bidder - 'bidderA' has vendorConsent
+    const vendorAllowedModule = 'bidderA';
+    const vendorAllowedGvlId = 1;
+
+    // Bidder = 'bidderB' doesn't have vendorConsent
+    const vendorBlockedModule = 'bidderB';
+    const vendorBlockedGvlId = 3;
+
+    const consentDataWithPurposeConsentFalse = utils.deepClone(consentData);
+    consentDataWithPurposeConsentFalse.vendorData.purpose.consents['1'] = false;
+
+    it('should return true when enforcePurpose=true AND purposeConsent[p]==true AND enforceVendor[p,v]==true AND vendorConsent[v]==true', function () {
+      // 'enforcePurpose' and 'enforceVendor' both are 'true'
+      const gdprRule = createGdprRule('storage', true, true, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 3 - Purpose consent is 'false' but vendor consent is 'true'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false'
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=true AND purposeConsent[p]==true AND enforceVendor[p,v]==false', function () {
+      // 'enforcePurpose' is 'true' and 'enforceVendor' is 'false'
+      const gdprRule = createGdprRule('storage', true, false, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'true' because vendorConsent doens't matter
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 3 - Purpose consent is 'false' but vendor consent is 'true'. validateRules must return 'false' because vendorConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false' and vendorConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=false AND enforceVendor[p,v]==true AND vendorConsent[v]==true', function () {
+      // 'enforcePurpose' is 'false' and 'enforceVendor' is 'true'
+      const gdprRule = createGdprRule('storage', false, true, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true'
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'false' because purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+
+      // case 3 - urpose consent is 'false' but vendor consent is 'true'. validateRules must return 'true' because purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'false' and purposeConsent doesn't matter
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(false);
+    });
+
+    it('should return true when enforcePurpose=false AND enforceVendor[p,v]==false', function () {
+      // 'enforcePurpose' is 'false' and 'enforceVendor' is 'false'
+      const gdprRule = createGdprRule('storage', false, false, []);
+
+      // case 1 - Both purpose consent and vendor consent is 'true'. validateRules must return 'true', both the consents do not matter.
+      let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 2 - Purpose consent is 'true' but vendor consent is 'false'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 3 - urpose consent is 'false' but vendor consent is 'true'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+      expect(isAllowed).to.equal(true);
+
+      // case 4 - Both purpose consent and vendor consent is 'false'. validateRules must return 'true', both the consents do not matter.
+      isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+    });
+
+    it('should return true when "vendorExceptions" contains the name of the vendor under test', function () {
+      // 'vendorExceptions' contains 'bidderB' which doesn't have vendor consent.
+      const gdprRule = createGdprRule('storage', false, true, [vendorBlockedModule]);
+
+      /* 'bidderB' gets a free pass since it's included in the 'vendorExceptions' array. validateRules must disregard
+      user's choice for purpose and vendor consent and return 'true' for this bidder(s) */
+      const isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+      expect(isAllowed).to.equal(true);
+    });
+
+    describe('Purpose 2 special case', function () {
+      const consentDataWithLIFalse = utils.deepClone(consentData);
+      consentDataWithLIFalse.vendorData.purpose.legitimateInterests['2'] = false;
+
+      const consentDataWithPurposeConsentFalse = utils.deepClone(consentData);
+      consentDataWithPurposeConsentFalse.vendorData.purpose.consents['2'] = false;
+
+      const consentDataWithPurposeConsentFalseAndLIFalse = utils.deepClone(consentData);
+      consentDataWithPurposeConsentFalseAndLIFalse.vendorData.purpose.legitimateInterests['2'] = false;
+      consentDataWithPurposeConsentFalseAndLIFalse.vendorData.purpose.consents['2'] = false;
+
+      it('should return true when (enforcePurpose=true AND purposeConsent[p]===true AND enforceVendor[p.v]===true AND vendorConsent[v]===true) OR (purposesLITransparency[p]===true)', function () {
+        // both 'enforcePurpose' and 'enforceVendor' is 'true'
+        const gdprRule = createGdprRule('basicAds', true, true, []);
+
+        // case 1 - Both purpose consent and vendor consent is 'true', but legitimateInterests for purpose 2 is 'false'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Purpose consent is 'true' but vendor consent is 'false', but legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Purpose consent is 'true' and vendor consent is 'true', as well as legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 4 - Purpose consent is 'true' and vendor consent is 'false', and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+
+      it('should return true when (enforcePurpose=true AND purposeConsent[p]===true AND enforceVendor[p.v]===false) OR (purposesLITransparency[p]===true)', function () {
+        // 'enforcePurpose' is 'true' and 'enforceVendor' is 'false'
+        const gdprRule = createGdprRule('basicAds', true, false, []);
+
+        // case 1 - Purpose consent is 'true', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Purpose consent is 'false', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Purpose consent is 'false', vendor consent doesn't matter and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithPurposeConsentFalseAndLIFalse, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+
+      it('should return true when (enforcePurpose=false AND enforceVendor[p,v]===true AND vendorConsent[v]===true) OR (purposesLITransparency[p]===true)', function () {
+        // 'enforcePurpose' is 'false' and 'enforceVendor' is 'true'
+        const gdprRule = createGdprRule('basicAds', false, true, []);
+
+        // case - 1 Vendor consent is 'true', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        let isAllowed = validateRules(gdprRule, consentData, vendorAllowedModule, vendorAllowedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 2 - Vendor consent is 'false', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'true'. validateRules must return 'true'.
+        isAllowed = validateRules(gdprRule, consentData, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(true);
+
+        // case 3 - Vendor consent is 'false', purpose consent doesn't matter and legitimateInterests for purpose 2 is 'false'. validateRules must return 'false'.
+        isAllowed = validateRules(gdprRule, consentDataWithLIFalse, vendorBlockedModule, vendorBlockedGvlId);
+        expect(isAllowed).to.equal(false);
+      });
+    });
+  })
+
+  describe('setEnforcementConfig', function () {
+    let sandbox;
+    const DEFAULT_RULES = [{
+      purpose: 'storage',
+      enforcePurpose: true,
+      enforceVendor: true,
+      vendorExceptions: []
+    }, {
+      purpose: 'basicAds',
+      enforcePurpose: true,
+      enforceVendor: true,
+      vendorExceptions: []
+    }];
+    beforeEach(function () {
+      sandbox = sinon.createSandbox();
+      logWarnSpy = sandbox.spy(utils, 'logWarn');
+    });
+    afterEach(function () {
+      config.resetConfig();
+      sandbox.restore();
+    });
+
+    it('should enforce TCF2 Purpose1 and Purpose 2 if no "rules" found in the config', function () {
+      setEnforcementConfig({
+        gdpr: {
+          cmpApi: 'iab',
+          allowAuctionWithoutConsent: true,
+          timeout: 5000
+        }
+      });
+
+      expect(logWarnSpy.calledOnce).to.equal(true);
+      expect(enforcementRules).to.deep.equal(DEFAULT_RULES);
+    });
+
+    it('should enforce TCF2 Purpose 2 also if only Purpose 1 is defined in "rules"', function () {
+      const purpose1RuleDefinedInConfig = {
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: true,
+        vendorExceptions: ['bidderA']
+      }
+      setEnforcementConfig({
+        gdpr: {
+          rules: [purpose1RuleDefinedInConfig]
+        }
+      });
+
+      expect(purpose1Rule).to.deep.equal(purpose1RuleDefinedInConfig);
+      expect(purpose2Rule).to.deep.equal(DEFAULT_RULES[1]);
+    });
+
+    it('should enforce TCF2 Purpose 1 also if only Purpose 2 is defined in "rules"', function () {
+      const purpose2RuleDefinedInConfig = {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: true,
+        vendorExceptions: ['bidderA']
+      }
+      setEnforcementConfig({
+        gdpr: {
+          rules: [purpose2RuleDefinedInConfig]
+        }
+      });
+
+      expect(purpose1Rule).to.deep.equal(DEFAULT_RULES[0]);
+      expect(purpose2Rule).to.deep.equal(purpose2RuleDefinedInConfig);
+    });
+
+    it('should use the "rules" defined in config if a definition found', function() {
+      const rules = [{
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: false
+      }, {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: false
+      }]
+      setEnforcementConfig({gdpr: { rules }});
+
+      expect(enforcementRules).to.deep.equal(rules);
+    });
+  });
+
+  describe('TCF2FinalResults', function() {
+    let sandbox;
+    beforeEach(function() {
+      sandbox = sinon.createSandbox();
+      sandbox.spy(events, 'emit');
+    });
+    afterEach(function() {
+      config.resetConfig();
+      sandbox.restore();
+    });
+    it('should emit TCF2 enforcement data on auction end', function() {
+      const rules = [{
+        purpose: 'storage',
+        enforcePurpose: false,
+        enforceVendor: false
+      }, {
+        purpose: 'basicAds',
+        enforcePurpose: false,
+        enforceVendor: false
       }]
-      expect(nextFnSpy.calledWith(undefined, expectedSubmodules, consentData));
+      setEnforcementConfig({gdpr: { rules }});
+
+      events.emit('auctionEnd', {})
+
+      // Assertions
+      sinon.assert.calledWith(events.emit.getCall(1), 'tcf2Enforcement', sinon.match.object);
+    })
+  });
+
+  describe('getGvlid', function() {
+    let sandbox;
+    let getGvlidForBidAdapterStub;
+    let getGvlidForUserIdModuleStub;
+    let getGvlidForAnalyticsAdapterStub;
+    beforeEach(function() {
+      sandbox = sinon.createSandbox();
+      getGvlidForBidAdapterStub = sandbox.stub(internal, 'getGvlidForBidAdapter');
+      getGvlidForUserIdModuleStub = sandbox.stub(internal, 'getGvlidForUserIdModule');
+      getGvlidForAnalyticsAdapterStub = sandbox.stub(internal, 'getGvlidForAnalyticsAdapter');
+    });
+    afterEach(function() {
+      sandbox.restore();
+      config.resetConfig();
+    });
+
+    it('should return "null" if called without passing any argument', function() {
+      const gvlid = getGvlid();
+      expect(gvlid).to.equal(null);
+    });
+
+    it('should return "null" if GVL ID is not defined for any of these modules: Bid adapter, UserId submodule and Analytics adapter', function() {
+      getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+      getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+      getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(null);
+
+      const gvlid = getGvlid('moduleA');
+      expect(gvlid).to.equal(null);
+    });
+
+    it('should return the GVL ID from gvlMapping if it is defined in setConfig', function() {
+      config.setConfig({
+        gvlMapping: {
+          moduleA: 1
+        }
+      });
+
+      // Actual GVL ID for moduleA is 2, as defined on its the bidAdapter.js file.
+      getGvlidForBidAdapterStub.withArgs('moduleA').returns(2);
+
+      const gvlid = getGvlid('moduleA');
+      expect(gvlid).to.equal(1);
+    });
+
+    it('should return the GVL ID by calling getGvlidForBidAdapter -> getGvlidForUserIdModule -> getGvlidForAnalyticsAdapter in sequence', function() {
+      getGvlidForBidAdapterStub.withArgs('moduleA').returns(null);
+      getGvlidForUserIdModuleStub.withArgs('moduleA').returns(null);
+      getGvlidForAnalyticsAdapterStub.withArgs('moduleA').returns(7);
+
+      expect(getGvlid('moduleA')).to.equal(7);
     });
   });
 });
diff --git a/test/spec/modules/geoedgeRtdProvider_spec.js b/test/spec/modules/geoedgeRtdProvider_spec.js
new file mode 100644
index 00000000000..cf4e0b53fde
--- /dev/null
+++ b/test/spec/modules/geoedgeRtdProvider_spec.js
@@ -0,0 +1,111 @@
+import * as utils from '../../../src/utils.js';
+import * as hook from '../../../src/hook.js'
+import { beforeInit, geoedgeSubmodule, setWrapper, wrapper, htmlPlaceholder, WRAPPER_URL, getClientUrl } from '../../../modules/geoedgeRtdProvider.js';
+import { server } from '../../../test/mocks/xhr.js';
+
+let key = '123123123';
+function makeConfig() {
+  return {
+    name: 'geoedge',
+    params: {
+      wap: false,
+      key: key,
+      bidders: {
+        bidderA: true,
+        bidderB: false
+      }
+    }
+  };
+}
+
+function mockBid(bidderCode) {
+  return {
+    'ad': '',
+    'cpm': '1.00',
+    'width': 300,
+    'height': 250,
+    'bidderCode': bidderCode,
+    'requestId': utils.getUniqueIdentifierStr(),
+    'creativeId': 'id',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 360
+  };
+}
+
+let mockWrapper = `${htmlPlaceholder}`;
+
+describe('Geoedge RTD module', function () {
+  describe('beforeInit', function () {
+    let submoduleStub;
+
+    before(function () {
+      submoduleStub = sinon.stub(hook, 'submodule');
+    });
+    after(function () {
+      submoduleStub.restore();
+    });
+    it('should fetch the wrapper', function () {
+      beforeInit();
+      let request = server.requests[0];
+      let isWrapperRequest = request && request.url && request.url && request.url === WRAPPER_URL;
+      expect(isWrapperRequest).to.equal(true);
+    });
+    it('should register RTD submodule provider', function () {
+      expect(submoduleStub.calledWith('realTimeData', geoedgeSubmodule)).to.equal(true);
+    });
+  });
+  describe('setWrapper', function () {
+    it('should set the wrapper', function () {
+      setWrapper(mockWrapper);
+      expect(wrapper).to.equal(mockWrapper);
+    });
+  });
+  describe('submodule', function () {
+    describe('name', function () {
+      it('should be geoedge', function () {
+        expect(geoedgeSubmodule.name).to.equal('geoedge');
+      });
+    });
+    describe('init', function () {
+      let insertElementStub;
+
+      before(function () {
+        insertElementStub = sinon.stub(utils, 'insertElement');
+      });
+      after(function () {
+        utils.insertElement.restore();
+      });
+      it('should return false when missing params or key', function () {
+        let missingParams = geoedgeSubmodule.init({});
+        let missingKey = geoedgeSubmodule.init({ params: {} });
+        expect(missingParams || missingKey).to.equal(false);
+      });
+      it('should return true when params are ok', function () {
+        expect(geoedgeSubmodule.init(makeConfig())).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);
+      });
+    });
+    describe('onBidResponseEvent', function () {
+      let bidFromA = mockBid('bidderA');
+      it('should wrap bid html when bidder is configured', function () {
+        geoedgeSubmodule.onBidResponseEvent(bidFromA, makeConfig());
+        expect(bidFromA.ad.indexOf('')).to.equal(0);
+      });
+      it('should not wrap bid html when bidder is not configured', function () {
+        let bidFromB = mockBid('bidderB');
+        geoedgeSubmodule.onBidResponseEvent(bidFromB, makeConfig());
+        expect(bidFromB.ad.indexOf('')).to.equal(-1);
+      });
+      it('should only muatate the bid ad porperty', function () {
+        let copy = Object.assign({}, bidFromA);
+        delete copy.ad;
+        let equalsOriginal = Object.keys(copy).every(key => copy[key] === bidFromA[key]);
+        expect(equalsOriginal).to.equal(true);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/gjirafaBidAdapter_spec.js b/test/spec/modules/gjirafaBidAdapter_spec.js
new file mode 100644
index 00000000000..96bf319dfd2
--- /dev/null
+++ b/test/spec/modules/gjirafaBidAdapter_spec.js
@@ -0,0 +1,185 @@
+import { expect } from 'chai';
+import { spec } from 'modules/gjirafaBidAdapter';
+
+describe('gjirafaAdapterTest', () => {
+  describe('bidRequestValidity', () => {
+    it('bidRequest with propertyId and placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          propertyId: '{propertyId}',
+          placementId: '{placementId}'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest without propertyId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          placementId: '{placementId}'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {
+          propertyId: '{propertyId}',
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without propertyId or placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'gjirafa',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', () => {
+    const bidRequests = [{
+      'bidder': 'gjirafa',
+      'params': {
+        'propertyId': '{propertyId}',
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
+      },
+      'adUnitCode': 'hb-leaderboard',
+      'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
+      'sizes': [[728, 90]],
+      'bidId': '10bdc36fe0b48c8',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': 'f9012acc-b6b7-4748-9098-97252914f9dc'
+    }];
+
+    it('bidRequest HTTP method', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url', () => {
+      const endpointUrl = 'https://central.gjirafa.com/bid';
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
+      });
+    });
+
+    it('bidRequest data', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data).to.exist;
+      });
+    });
+
+    it('bidRequest sizes', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data.placements).to.exist;
+        expect(requestItem.data.placements.length).to.equal(1);
+        expect(requestItem.data.placements[0].sizes).to.equal('728x90');
+      });
+    });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': 'https://central.gjirafa.com/bid',
+      'data': {
+        'sizes': '728x90',
+        'adUnitId': 'hb-leaderboard',
+        'placementId': '{placementId}',
+        'propertyId': '{propertyId}',
+        'pageViewGuid': '{pageViewGuid}',
+        'url': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'requestid': '26ee8fe87940da7',
+        'bidid': '2962dbedc4768bf'
+      }
+    };
+
+    const bidResponse = {
+      body: [{
+        'CPM': 1,
+        'Width': 728,
+        'Height': 90,
+        'Referrer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'Ad': '
Test ad
',
+        'CreativeId': '123abc',
+        'NetRevenue': false,
+        'Currency': 'EUR',
+        'TTL': 360,
+        'ADomain': ['somedomain.com']
+      }],
+      headers: {}
+    };
+
+    it('all keys present', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let keys = [
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'creativeId',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'referrer',
+        'ad',
+        'vastUrl',
+        'mediaType',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function (key) {
+        expect(keys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('all values correct', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(728);
+      expect(result[0].height).to.equal(90);
+      expect(result[0].creativeId).to.equal('123abc');
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(360);
+      expect(result[0].referrer).to.equal('http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true');
+      expect(result[0].ad).to.equal('
Test ad
');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['somedomain.com']);
+    })
+  });
+});
diff --git a/test/spec/modules/glimpseBidAdapter_spec.js b/test/spec/modules/glimpseBidAdapter_spec.js
index cc11efcb2af..336f606309e 100644
--- a/test/spec/modules/glimpseBidAdapter_spec.js
+++ b/test/spec/modules/glimpseBidAdapter_spec.js
@@ -61,7 +61,10 @@ const templateBidResponse = {
 };
 
 const copyBidResponse = () => ({ ...templateBidResponse });
-const copyBidderRequest = () => ({ ...templateBidderRequest, bids: copyBidRequests() });
+const copyBidderRequest = () => ({
+  ...templateBidderRequest,
+  bids: copyBidRequests(),
+});
 const copyBidRequest = () => ({ ...templateBidRequest });
 
 const copyBidRequests = () => [copyBidRequest()];
@@ -139,7 +142,9 @@ describe('GlimpseProtocolAdapter', function () {
       expect(payload.gdprConsent).to.exist;
       const { gdprConsent } = payload;
       expect(gdprConsent.gdprApplies).to.be.true;
-      expect(gdprConsent.consentString).to.equal(bidderRequest.gdprConsent.consentString);
+      expect(gdprConsent.consentString).to.equal(
+        bidderRequest.gdprConsent.consentString
+      );
     });
 
     it('should add referer info', function () {
@@ -147,7 +152,9 @@ describe('GlimpseProtocolAdapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
 
-      expect(payload.refererInfo.referer).to.equal(templateBidderRequest.refererInfo.referer);
+      expect(payload.refererInfo.referer).to.equal(
+        templateBidderRequest.refererInfo.referer
+      );
     });
   });
 
@@ -175,5 +182,26 @@ describe('GlimpseProtocolAdapter', function () {
       const bids = spec.interpretResponse(response);
       expect(bids).to.have.length(0);
     });
+
+    it('should include advertiserDomains field in the response', function () {
+      const response = copyBidResponses();
+
+      const bids = spec.interpretResponse(response);
+      expect(bids[0].meta.advertiserDomains).to.be.an('array').that.is.empty;
+    });
+
+    it('should reflect the value of the OpenRTB adomain field', function () {
+      const advertiserDomainsMock = ['http://example.com'];
+      let response = copyBidResponses();
+      response.body = response.body.map((bid) => {
+        return {
+          ...bid,
+          adomain: advertiserDomainsMock,
+        };
+      });
+
+      const bids = spec.interpretResponse(response);
+      expect(bids[0].meta.advertiserDomains).to.equal(advertiserDomainsMock);
+    });
   });
 });
diff --git a/test/spec/modules/glomexBidAdapter_spec.js b/test/spec/modules/glomexBidAdapter_spec.js
new file mode 100644
index 00000000000..6e5765c31f5
--- /dev/null
+++ b/test/spec/modules/glomexBidAdapter_spec.js
@@ -0,0 +1,135 @@
+import { expect } from 'chai'
+import { spec } from 'modules/glomexBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  bidder: 'glomex',
+  params: {
+    integrationId: 'abcdefg',
+    playlistId: 'defghjk'
+  },
+  bidderRequestId: '143346cf0f1732',
+  auctionId: '2e41f65424c87c',
+  adUnitCode: 'adunit-code',
+  bidId: '2d925f27f5079f',
+  sizes: [640, 360]
+}
+
+const BIDDER_REQUEST = {
+  auctionId: '2d921234f5079f',
+  refererInfo: {
+    isAmp: true,
+    numIframes: 0,
+    reachedTop: true,
+    referer: 'https://glomex.com'
+  },
+  gdprConsent: {
+    gdprApplies: true,
+    consentString: 'CO5asbJO5asbJE-AAAENAACAAAAAAAAAAAYgAAAAAAAA.IAAA'
+  }
+}
+
+const RESPONSE = {
+  bids: [
+    {
+      id: '2d925f27f5079f',
+      cpm: 3.5,
+      width: 640,
+      height: 360,
+      creativeId: 'creative-1j75x4ln1kk6m1ius',
+      dealId: 'deal-1j75x4ln1kk6m1iut',
+      currency: 'EUR',
+      netRevenue: true,
+      ttl: 300,
+      ad: '',
+      adomain: ['glomex.com']
+    }
+  ]
+}
+describe('glomexBidAdapter', 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 request = {
+        'params': {
+          'integrationId': 'abcdefg'
+        }
+      }
+      expect(spec.isBidRequestValid(request)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      expect(spec.isBidRequestValid({})).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    const bidRequests = [REQUEST]
+    const request = spec.buildRequests(bidRequests, BIDDER_REQUEST)
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(request.method).to.equal('POST')
+    })
+
+    it('returns a list of valid requests', function () {
+      expect(request.validBidRequests).to.eql([REQUEST])
+    })
+
+    it('sends params.integrationId', function () {
+      expect(request.validBidRequests[0].params.integrationId).to.eql(REQUEST.params.integrationId)
+    })
+
+    it('sends params.playlistId', function () {
+      expect(request.validBidRequests[0].params.playlistId).to.eql(REQUEST.params.playlistId)
+    })
+
+    it('sends refererInfo', function () {
+      expect(request.data.refererInfo).to.eql(BIDDER_REQUEST.refererInfo)
+    })
+
+    it('sends gdprConsent', function () {
+      expect(request.data.gdprConsent).to.eql(BIDDER_REQUEST.gdprConsent)
+    })
+
+    it('sends the auctionId', function () {
+      expect(request.data.auctionId).to.eql(BIDDER_REQUEST.auctionId)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
+    })
+
+    it('handles the server response', function () {
+      const result = spec.interpretResponse(
+        {
+          body: RESPONSE
+        },
+        {
+          validBidRequests: [REQUEST]
+        }
+      )
+
+      expect(result[0].requestId).to.equal('2d925f27f5079f')
+      expect(result[0].cpm).to.equal(3.5)
+      expect(result[0].width).to.equal(640)
+      expect(result[0].height).to.equal(360)
+      expect(result[0].creativeId).to.equal('creative-1j75x4ln1kk6m1ius')
+      expect(result[0].dealId).to.equal('deal-1j75x4ln1kk6m1iut')
+      expect(result[0].currency).to.equal('EUR')
+      expect(result[0].netRevenue).to.equal(true)
+      expect(result[0].ttl).to.equal(300)
+      expect(result[0].ad).to.equal('')
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['glomex.com'])
+    })
+  })
+})
diff --git a/test/spec/modules/gmosspBidAdapter_spec.js b/test/spec/modules/gmosspBidAdapter_spec.js
index 5de3db623c5..d29e27554c2 100644
--- a/test/spec/modules/gmosspBidAdapter_spec.js
+++ b/test/spec/modules/gmosspBidAdapter_spec.js
@@ -54,18 +54,30 @@ describe('GmosspAdapter', function () {
       }
     ];
 
-    const bidderRequest = {
-      refererInfo: {
-        referer: 'https://hoge.com'
-      }
-    };
-
     it('sends bid request to ENDPOINT via GET', function () {
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'https://hoge.com'
+        }
+      };
+
       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('tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&url=https%3A%2F%2Fhoge.com&cur=JPY&dnt=0&');
     });
+
+    it('should use fallback if refererInfo.referer in bid request is empty', function () {
+      const bidderRequest = {
+        refererInfo: {
+          referer: ''
+        }
+      };
+
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      const result = 'tid=791e9d84-af92-4903-94da-24c7426d9d0c&bid=2b84475b5b636e&ver=$prebid.version$&sid=123456&url=' + encodeURIComponent(window.top.location.href) + '&cur=JPY&dnt=0&';
+      expect(requests[0].data).to.equal(result);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -94,6 +106,9 @@ describe('GmosspAdapter', function () {
         price: 20,
         w: 300,
         h: 250,
+        adomains: [
+          'test.com'
+        ],
         ad: '
',
         creativeId: '985ec572b32be309.76973017',
         cur: 'JPY',
@@ -114,6 +129,11 @@ describe('GmosspAdapter', function () {
           currency: 'JPY',
           width: 300,
           height: 250,
+          meta: {
+            advertiserDomains: [
+              'test.com'
+            ]
+          },
           ad: '
',
           creativeId: '985ec572b32be309.76973017',
           netRevenue: true,
diff --git a/test/spec/modules/gnetBidAdapter_spec.js b/test/spec/modules/gnetBidAdapter_spec.js
new file mode 100644
index 00000000000..40f8ad50d78
--- /dev/null
+++ b/test/spec/modules/gnetBidAdapter_spec.js
@@ -0,0 +1,145 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/gnetBidAdapter.js';
+import {
+  newBidder
+} from 'src/adapters/bidderFactory.js';
+
+const ENDPOINT = 'https://adserver.gnetproject.com/prebid.php';
+
+describe('gnetAdapter', 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: 'gnet',
+      params: {
+        websiteId: '4',
+        externalId: '4d52cccf30309282256012cf30309282'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    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);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [{
+      bidder: 'gnet',
+      params: {
+        websiteId: '4',
+        externalId: '4d52cccf30309282256012cf30309282'
+      },
+      adUnitCode: '/150790500/4_ZONA_IAB_300x250_5',
+      sizes: [
+        [300, 250],
+      ],
+      bidId: '2a19afd5173318',
+      bidderRequestId: '1f4001782ac16c',
+      auctionId: 'aba03555-4802-4c45-9f15-05ffa8594cff',
+      transactionId: '894bdff6-61ec-4bec-a5a9-f36a5bfccef5'
+    }];
+
+    const bidderRequest = {
+      refererInfo: {
+        referer: 'https://gnetproject.com/'
+      }
+    };
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      expect(requests[0].url).to.equal(ENDPOINT);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].data).to.equal(JSON.stringify({
+        'referer': 'https://gnetproject.com/',
+        'adUnitCode': '/150790500/4_ZONA_IAB_300x250_5',
+        'bidId': '2a19afd5173318',
+        'transactionId': '894bdff6-61ec-4bec-a5a9-f36a5bfccef5',
+        'sizes': ['300x250'],
+        'params': {
+          'websiteId': '4',
+          'externalId': '4d52cccf30309282256012cf30309282'
+        }
+      }));
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const bidderRequests = [{
+      bidder: 'gnet',
+      params: {
+        clientId: '123456'
+      },
+      adUnitCode: '/150790500/4_ZONA_IAB_300x250_5',
+      sizes: [
+        [300, 250],
+      ],
+      bidId: '2a19afd5173318',
+      bidderRequestId: '1f4001782ac16c',
+      auctionId: 'aba03555-4802-4c45-9f15-05ffa8594cff',
+      transactionId: '894bdff6-61ec-4bec-a5a9-f36a5bfccef5'
+    }];
+
+    it('should get correct banner bid response', function () {
+      const response = {
+        bids: [
+          {
+            bidId: '2a19afd5173318',
+            cpm: 0.1,
+            currency: 'BRL',
+            width: 300,
+            height: 250,
+            ad: '
I am an ad
',
+            creativeId: '173560700',
+          }
+        ]
+      };
+
+      const expectedResponse = [
+        {
+          requestId: '2a19afd5173318',
+          cpm: 0.1,
+          currency: 'BRL',
+          width: 300,
+          height: 250,
+          ad: '
I am an ad
',
+          ttl: 300,
+          creativeId: '173560700',
+          netRevenue: true
+        }
+      ];
+
+      const result = spec.interpretResponse({
+        body: response
+      }, bidderRequests);
+      expect(result).to.have.lengthOf(1);
+      expect(result).to.deep.have.same.members(expectedResponse);
+    });
+
+    it('handles nobid responses', function () {
+      const response = '';
+
+      const result = spec.interpretResponse({
+        body: response
+      }, bidderRequests);
+      expect(result.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/gothamadsBidAdapter_spec.js b/test/spec/modules/gothamadsBidAdapter_spec.js
new file mode 100644
index 00000000000..f0a3ea253f3
--- /dev/null
+++ b/test/spec/modules/gothamadsBidAdapter_spec.js
@@ -0,0 +1,416 @@
+import { expect } from 'chai';
+import { spec } from 'modules/gothamadsBidAdapter.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: 'gothamads',
+  params: {
+    placementId: 'hash',
+    accountId: 'accountId'
+  },
+  timeout: 1000
+
+};
+
+const BANNER_BID_REQUEST = {
+  code: 'banner_example',
+  mediaTypes: {
+    banner: {
+      sizes: [
+        [300, 250],
+        [300, 600]
+      ]
+    }
+  },
+  bidder: 'gothamads',
+  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: 'gothamads',
+  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('GothamAdsAdapter', 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.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+
+    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('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('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.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  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.gothamads.com/bid?pass=accountId&integration=prebidjs');
+    });
+  });
+
+  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,
+        mediaType: 'banner',
+        meta: BANNER_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        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', 'mediaType', 'meta');
+      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.creativeId).to.equal(expectedBidResponse.creativeId);
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.meta).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      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',
+        meta: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        vastXml: VIDEO_BID_RESPONSE.seatbid[0].bid[0].adm,
+        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', 'mediaType', 'meta');
+      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).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      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,
+        meta: NATIVE_BID_RESPONSE.seatbid[0].bid[0].adomain,
+        mediaType: 'native',
+        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.native.clickUrl).to.equal(expectedBidResponse.native.clickUrl);
+      expect(dataItem.ttl).to.equal(expectedBidResponse.ttl);
+      expect(dataItem.meta).to.have.property('advertiserDomains', expectedBidResponse.meta);
+      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/gptPreAuction_spec.js b/test/spec/modules/gptPreAuction_spec.js
new file mode 100644
index 00000000000..c4a81c21d5c
--- /dev/null
+++ b/test/spec/modules/gptPreAuction_spec.js
@@ -0,0 +1,191 @@
+import {
+  appendGptSlots,
+  appendPbAdSlot,
+  _currentConfig,
+  makeBidRequestsHook
+} from 'modules/gptPreAuction.js';
+import { config } from 'src/config.js';
+import { makeSlot } from '../integration/faker/googletag.js';
+
+describe('GPT pre-auction module', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+    config.setConfig({ gptPreAuction: { enabled: false } });
+  });
+
+  const testSlots = [
+    makeSlot({ code: 'slotCode1', divId: 'div1' }),
+    makeSlot({ code: 'slotCode2', divId: 'div2' }),
+    makeSlot({ code: 'slotCode3', divId: 'div3' })
+  ];
+
+  describe('appendPbAdSlot', () => {
+    // sets up our document body to test the pbAdSlot dom actions against
+    document.body.innerHTML = '
test1
' +
+          '
test2
' +
+          '
test2
';
+
+    it('should be unchanged if already defined on adUnit', () => {
+      const adUnit = { ortb2Imp: { ext: { data: { pbadslot: '12345' } } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('12345');
+    });
+
+    it('should use adUnit.code if matching id exists', () => {
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('bar1');
+    });
+
+    it('should use the gptSlot.adUnitPath if the adUnit.code matches a div id but does not have a data-adslotid', () => {
+      const adUnit = { code: 'foo3', mediaTypes: { banner: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: { adserver: { name: 'gam', adslot: '/baz' } } } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('/baz');
+    });
+
+    it('should use the video adUnit.code (which *should* match the configured "adSlotName", but is not being tested) if there is no matching div with "data-adslotid" defined', () => {
+      const adUnit = { code: 'foo4', mediaTypes: { video: { sizes: [[250, 250]] } }, ortb2Imp: { ext: { data: {} } } };
+      adUnit.code = 'foo5';
+      appendPbAdSlot(adUnit, undefined);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo5');
+    });
+
+    it('should use the adUnit.code if all other sources failed', () => {
+      const adUnit = { code: 'foo4', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit, undefined);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('foo4');
+    });
+
+    it('should use the customPbAdSlot function if one is given', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customPbAdSlot: () => 'customPbAdSlotName'
+        }
+      });
+
+      const adUnit = { code: 'foo1', ortb2Imp: { ext: { data: {} } } };
+      appendPbAdSlot(adUnit);
+      expect(adUnit.ortb2Imp.ext.data.pbadslot).to.equal('customPbAdSlotName');
+    });
+  });
+
+  describe('appendGptSlots', () => {
+    it('should not add adServer object to context if no slots defined', () => {
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
+    });
+
+    it('should not add adServer object to context if no slot matches', () => {
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'adUnitCode', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.undefined;
+    });
+
+    it('should add adServer object to context if matching slot is found', () => {
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'slotCode2', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode2' });
+    });
+
+    it('should use the customGptSlotMatching function if one is given', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: slot =>
+            adUnitCode => adUnitCode.toUpperCase() === slot.getAdUnitPath().toUpperCase()
+        }
+      });
+
+      window.googletag.pubads().setSlots(testSlots);
+      const adUnit = { code: 'SlOtCoDe1', ortb2Imp: { ext: { data: {} } } };
+      appendGptSlots([adUnit]);
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.be.an('object');
+      expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: 'slotCode1' });
+    });
+  });
+
+  describe('handleSetGptConfig', () => {
+    it('should enable the module by default', () => {
+      config.setConfig({ gptPreAuction: {} });
+      expect(_currentConfig.enabled).to.equal(true);
+    });
+
+    it('should disable the module if told to in set config', () => {
+      config.setConfig({ gptPreAuction: { enabled: false } });
+      expect(_currentConfig).to.be.an('object').that.is.empty;
+    });
+
+    it('should accept custom functions in config', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: () => 'customGptSlot',
+          customPbAdSlot: () => 'customPbAdSlot'
+        }
+      });
+
+      expect(_currentConfig.enabled).to.equal(true);
+      expect(_currentConfig.customGptSlotMatching).to.a('function');
+      expect(_currentConfig.customPbAdSlot).to.a('function');
+      expect(_currentConfig.customGptSlotMatching()).to.equal('customGptSlot');
+      expect(_currentConfig.customPbAdSlot()).to.equal('customPbAdSlot');
+    });
+
+    it('should check that custom functions in config are type function', () => {
+      config.setConfig({
+        gptPreAuction: {
+          customGptSlotMatching: 12345,
+          customPbAdSlot: 'test'
+        }
+      });
+      expect(_currentConfig).to.deep.equal({
+        enabled: true,
+        customGptSlotMatching: false,
+        customPbAdSlot: false
+      });
+    });
+  });
+
+  describe('makeBidRequestsHook', () => {
+    let returnedAdUnits;
+    const runMakeBidRequests = adUnits => {
+      const next = adUnits => {
+        returnedAdUnits = adUnits;
+      };
+      makeBidRequestsHook(next, adUnits);
+    };
+
+    it('should append PB Ad Slot and GPT Slot info to first-party data in each ad unit', () => {
+      const testAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
+      }, {
+        code: 'slotCode1',
+        ortb2Imp: { ext: { data: { pbadslot: '67890' } } }
+      }, {
+        code: 'slotCode3',
+      }];
+
+      const expectedAdUnits = [{
+        code: 'adUnit1',
+        ortb2Imp: { ext: { data: { pbadslot: '12345' } } }
+      }, {
+        code: 'slotCode1',
+        ortb2Imp: { ext: { data: { pbadslot: '67890', adserver: { name: 'gam', adslot: 'slotCode1' } } } }
+      }, {
+        code: 'slotCode3',
+        ortb2Imp: { ext: { data: { pbadslot: 'slotCode3', adserver: { name: 'gam', adslot: 'slotCode3' } } } }
+      }];
+
+      window.googletag.pubads().setSlots(testSlots);
+      runMakeBidRequests(testAdUnits);
+      expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
+    });
+  });
+});
diff --git a/test/spec/modules/gridBidAdapter_spec.js b/test/spec/modules/gridBidAdapter_spec.js
index c8d04113aeb..d2ca4fa195a 100644
--- a/test/spec/modules/gridBidAdapter_spec.js
+++ b/test/spec/modules/gridBidAdapter_spec.js
@@ -40,65 +40,81 @@ describe('TheMediaGrid Adapter', function () {
   });
 
   describe('buildRequests', function () {
-    function parseRequest(url) {
-      const res = {};
-      url.split('&').forEach((it) => {
-        const couple = it.split('=');
-        res[couple[0]] = decodeURIComponent(couple[1]);
-      });
-      return res;
+    function parseRequest(data) {
+      return JSON.parse(data);
     }
-    const bidderRequest = {refererInfo: {referer: 'https://example.com'}};
-    const referrer = bidderRequest.refererInfo.referer;
+    const bidderRequest = {
+      refererInfo: {referer: 'https://example.com'},
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      timeout: 3000
+    };
+    const referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
     let bidRequests = [
       {
         'bidder': 'grid',
         'params': {
-          'uid': '1'
+          'uid': '1',
+          'bidFloor': 1.25
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '42dbe3a7168a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      },
+      {
+        'bidder': 'grid',
+        'params': {
+          'uid': '2'
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
         'bidId': '30b31c1838de1e',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
       },
       {
         'bidder': 'grid',
         'params': {
-          'uid': '1'
+          'uid': '11'
         },
         'adUnitCode': 'adunit-code-2',
         'sizes': [[728, 90]],
         'mediaTypes': {
           'video': {
-            'playerSize': [400, 600]
-          },
-          'banner': {
-            'sizes': [[728, 90]]
+            'playerSize': [[400, 600]],
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
           }
         },
         'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
       },
       {
         'bidder': 'grid',
         'params': {
-          'uid': '2'
+          'uid': '3'
         },
-        'adUnitCode': 'adunit-code-1',
-        'sizes': [[300, 250], [300, 600]],
+        'adUnitCode': 'adunit-code-2',
+        'sizes': [[728, 90]],
         'mediaTypes': {
           'video': {
-            'playerSize': [400, 600]
+            'playerSize': [[400, 600]],
+            'protocols': [1, 2, 3]
           },
           'banner': {
-            'sizes': [[300, 250], [300, 600]]
+            'sizes': [[728, 90]]
           }
         },
-        'bidId': '42dbe3a7168a6a',
+        'bidId': '3150ccb55da321',
         'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
       }
     ];
 
@@ -106,57 +122,190 @@ describe('TheMediaGrid Adapter', function () {
       const request = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1');
-      expect(payload).to.have.property('sizes', '300x250,300x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-      expect(payload).to.have.property('wrapperType', 'Prebid_js');
-      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
     });
 
-    it('sizes must be added from mediaTypes', function () {
+    it('make possible to process request without mediaTypes', function () {
       const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1,1');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90,400x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
-    });
-
-    it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data).to.be.an('string');
-      const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('auids', '1,1,2');
-      expect(payload).to.have.property('sizes', '300x250,300x600,728x90,400x600');
-      expect(payload).to.have.property('r', '22edbae2733bf6');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'bidfloor': 0,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
     });
 
-    it('if gdprConsent is present payload must have gdpr params', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: true}, refererInfo: bidderRequest.refererInfo});
+    it('should attach valid params to the video tag', function () {
+      const request = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('u', referrer);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'bidfloor': 0,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'bidfloor': 0,
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
+          }
+        }]
+      });
     });
 
-    it('if gdprApplies is false gdpr_applies must be 0', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA', gdprApplies: false}});
+    it('should support mixed mediaTypes', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '0');
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'bidfloor': 0,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'bidfloor': 0,
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg'],
+          }
+        }, {
+          'id': bidRequests[3].bidId,
+          'tagid': bidRequests[3].params.uid,
+          'ext': {'divid': bidRequests[3].adUnitCode},
+          'bidfloor': 0,
+          'banner': {
+            'w': 728,
+            'h': 90,
+            'format': [{'w': 728, 'h': 90}]
+          },
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3]
+          }
+        }]
+      });
     });
 
-    it('if gdprApplies is undefined gdpr_applies must be 1', function () {
-      const request = spec.buildRequests(bidRequests, {gdprConsent: {consentString: 'AAA'}});
+    it('if gdprConsent is present payload must have gdpr params', function () {
+      const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, gdprBidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('gdpr_consent', 'AAA');
-      expect(payload).to.have.property('gdpr_applies', '1');
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext).to.have.property('consent', 'AAA');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('gdpr', 1);
     });
 
     it('if usPrivacy is present payload must have us_privacy param', function () {
@@ -164,110 +313,222 @@ describe('TheMediaGrid Adapter', function () {
       const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload).to.have.property('us_privacy', '1YNN');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('us_privacy', '1YNN');
     });
 
-    it('should convert keyword params to proper form and attaches to request', function () {
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
+    it('if userId is present payload must have user.ext param with right keys', function () {
+      const eids = [
+        {
+          source: 'pubcid.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+          }]
+        },
         {
-          params: {
-            uid: '1',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              singleArrNum: [3],
-              multiValMixed: ['value1', 2, 'value3'],
-              singleValNum: 123,
-              emptyStr: '',
-              emptyArr: [''],
-              badValue: {'foo': 'bar'} // should be dropped
+          source: 'adserver.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
             }
-          }
+          }]
         }
-      );
+      ];
+      const bidRequestsWithUserIds = bidRequests.map((bid) => {
+        return Object.assign({
+          userIdAsEids: eids
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext.eids).to.deep.equal(eids);
+    });
 
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
+    it('if schain is present payload must have source.ext.schain param', function () {
+      const schain = {
+        complete: 1,
+        nodes: [
+          {
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }
+        ]
+      };
+      const bidRequestsWithSChain = bidRequests.map((bid) => {
+        return Object.assign({
+          schain: schain
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithSChain, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
+      expect(payload).to.have.property('source');
+      expect(payload.source).to.have.property('ext');
+      expect(payload.source.ext).to.have.property('schain');
+      expect(payload.source.ext.schain).to.deep.equal(schain);
+    });
 
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'singleArrNum',
-        'value': ['3']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'singleValNum',
-        'value': ['123']
-      }, {
-        'key': 'emptyStr'
-      }, {
-        'key': 'emptyArr'
+    it('if content and segment is present in jwTargeting, payload must have right params', function () {
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
+        return Object.assign({
+          rtd: {
+            jwplayer: {
+              targeting: {
+                segments: jsSegments,
+                content: jsContent
+              }
+            }
+          }
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user.data).to.deep.equal([{
+        name: 'iow_labs_pub_data',
+        segment: [
+          {name: 'jwpseg', value: jsSegments[0]},
+          {name: 'jwpseg', value: jsSegments[1]}
+        ]
       }]);
+      expect(payload).to.have.property('site');
+      expect(payload.site.content).to.deep.equal(jsContent);
     });
 
-    it('should mix keyword param with keywords from config', function () {
+    it('should contain the keyword values if it present in ortb2.(site/user)', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'fpd.user' ? {'keywords': ['a', 'b']} : arg === 'fpd.context' ? {'keywords': ['any words']} : null);
+        arg => arg === 'ortb2.user' ? {'keywords': 'foo'} : (arg === 'ortb2.site' ? {'keywords': 'bar'} : null));
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.ext.keywords).to.deep.equal([{'key': 'user', 'value': ['foo']}, {'key': 'context', 'value': ['bar']}]);
+      getConfigStub.restore();
+    });
 
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
-        {
-          params: {
-            uid: '1',
-            keywords: {
-              single: 'val',
-              singleArr: ['val'],
-              multiValMixed: ['value1', 2, 'value3']
-            }
+    it('shold be right tmax when timeout in config is less then timeout in bidderRequest', function() {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'bidderTimeout' ? 2000 : null);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.tmax).to.equal(2000);
+      getConfigStub.restore();
+    });
+    it('shold be right tmax when timeout in bidderRequest is less then timeout in config', function() {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'bidderTimeout' ? 5000 : null);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.tmax).to.equal(3000);
+      getConfigStub.restore();
+    });
+    it('should contain regs.coppa if coppa is true in config', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'coppa' ? true : null);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('coppa', 1);
+      getConfigStub.restore();
+    });
+    it('should contain imp[].ext.data.adserver if available', function() {
+      const ortb2Imp = [{
+        ext: {
+          data: {
+            adserver: {
+              name: 'ad_server_name',
+              adslot: '/111111/slot'
+            },
+            pbadslot: '/111111/slot'
           }
         }
-      );
-
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
+      }, {
+        ext: {
+          data: {
+            adserver: {
+              name: 'ad_server_name',
+              adslot: '/222222/slot'
+            },
+            pbadslot: '/222222/slot'
+          }
+        }
+      }];
+      const bidRequestsWithOrtb2Imp = bidRequests.slice(0, 3).map((bid, ind) => {
+        return Object.assign(ortb2Imp[ind] ? { ortb2Imp: ortb2Imp[ind] } : {}, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithOrtb2Imp, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload.keywords).to.be.an('string');
-      payload.keywords = JSON.parse(payload.keywords);
-
-      expect(payload.keywords).to.deep.equal([{
-        'key': 'single',
-        'value': ['val']
-      }, {
-        'key': 'singleArr',
-        'value': ['val']
-      }, {
-        'key': 'multiValMixed',
-        'value': ['value1', '2', 'value3']
-      }, {
-        'key': 'user',
-        'value': ['a', 'b']
-      }, {
-        'key': 'context',
-        'value': ['any words']
-      }]);
-
-      getConfigStub.restore();
+      expect(payload.imp[0].ext).to.deep.equal({
+        divid: bidRequests[0].adUnitCode,
+        data: ortb2Imp[0].ext.data,
+        gpid: ortb2Imp[0].ext.data.adserver.adslot
+      });
+      expect(payload.imp[1].ext).to.deep.equal({
+        divid: bidRequests[1].adUnitCode,
+        data: ortb2Imp[1].ext.data,
+        gpid: ortb2Imp[1].ext.data.adserver.adslot
+      });
+      expect(payload.imp[2].ext).to.deep.equal({
+        divid: bidRequests[2].adUnitCode
+      });
+    });
+    describe('floorModule', function () {
+      const floorTestData = {
+        'currency': 'USD',
+        'floor': 1.50
+      };
+      const bidRequest = Object.assign({
+        getFloor: (_) => {
+          return floorTestData;
+        }
+      }, bidRequests[1]);
+      it('should return the value from getFloor if present', function () {
+        const request = spec.buildRequests([bidRequest], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the getFloor.floor value if it is greater than bidfloor', function () {
+        const bidfloor = 0.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the bidfloor value if it is greater than getFloor.floor', function () {
+        const bidfloor = 1.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest);
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(bidfloor);
+      });
     });
   });
 
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 2, 'h': 600, 'w': 300}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
-      {'bid': [{'price': 0, 'auid': 3, 'h': 250, 'w': 300}], 'seat': '1'},
+      {'bid': [{'impid': '659423fff799cb', 'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, 'dealid': 11}], 'seat': '1'},
+      {'bid': [{'impid': '4dff80cc4ee346', 'price': 0.5, 'adm': '
test content 2
', 'auid': 2, 'h': 600, 'w': 300}], 'seat': '1'},
+      {'bid': [{'impid': '5703af74d0472a', 'price': 0.15, 'adm': '
test content 3
', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
+      {'bid': [{'impid': '2344da98f78b42', 'price': 0, 'auid': 3, 'h': 250, 'w': 300}], 'seat': '1'},
       {'bid': [{'price': 0, 'adm': '
test content 5
', 'h': 250, 'w': 300}], 'seat': '1'},
       undefined,
       {'bid': [], 'seat': '1'},
@@ -298,11 +559,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         }
       ];
 
@@ -319,7 +582,7 @@ describe('TheMediaGrid Adapter', function () {
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
+          'bidId': '659423fff799cb',
           'bidderRequestId': '2c2bb1972df9a',
           'auctionId': '1fa09aee5c8c99',
         },
@@ -349,18 +612,20 @@ describe('TheMediaGrid Adapter', function () {
       const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
-          'requestId': '300bfeb0d71a5b',
+          'requestId': '659423fff799cb',
           'cpm': 1.15,
           'creativeId': 1,
           'dealId': 11,
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '4dff80cc4ee346',
@@ -370,11 +635,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 2
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '5703af74d0472a',
@@ -384,11 +651,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '
test content 3
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         }
       ];
 
@@ -432,8 +701,8 @@ describe('TheMediaGrid Adapter', function () {
         }
       ];
       const response = [
-        {'bid': [{'price': 1.15, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 11, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
-        {'bid': [{'price': 1.00, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 12, content_type: 'video'}], 'seat': '2'}
+        {'bid': [{'impid': '659423fff799cb', 'price': 1.15, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 11, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
+        {'bid': [{'impid': '2bc598e42b6a', 'price': 1.00, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 12, content_type: 'video'}], 'seat': '2'}
       ];
       const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
@@ -444,15 +713,36 @@ describe('TheMediaGrid Adapter', function () {
           'dealId': undefined,
           'width': 300,
           'height': 600,
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
           'vastXml': '\n<\/Ad>\n<\/VAST>',
           'adResponse': {
             'content': '\n<\/Ad>\n<\/VAST>'
           }
+        },
+        {
+          'requestId': '2bc598e42b6a',
+          'cpm': 1.00,
+          'creativeId': 12,
+          'dealId': undefined,
+          'width': undefined,
+          'height': undefined,
+          'currency': 'USD',
+          'mediaType': 'video',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
+          'vastXml': '\n<\/Ad>\n<\/VAST>',
+          'adResponse': {
+            'content': '\n<\/Ad>\n<\/VAST>'
+          }
         }
       ];
 
@@ -503,11 +793,11 @@ describe('TheMediaGrid Adapter', function () {
 
     it('complicated case', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '
test content 4
', 'auid': 1, 'h': 600, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 5
', 'auid': 2, 'h': 600, 'w': 350}], 'seat': '1'},
+        {'bid': [{'impid': '2164be6358b9', 'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300, dealid: 11}], 'seat': '1'},
+        {'bid': [{'impid': '4e111f1b66e4', 'price': 0.5, 'adm': '
test content 2
', 'auid': 2, 'h': 600, 'w': 300, dealid: 12}], 'seat': '1'},
+        {'bid': [{'impid': '26d6f897b516', 'price': 0.15, 'adm': '
test content 3
', 'auid': 1, 'h': 90, 'w': 728}], 'seat': '1'},
+        {'bid': [{'impid': '326bde7fbf69', 'price': 0.15, 'adm': '
test content 4
', 'auid': 1, 'h': 600, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '2234f233b22a', 'price': 0.5, 'adm': '
test content 5
', 'auid': 2, 'h': 600, 'w': 350}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -576,11 +866,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '4e111f1b66e4',
@@ -590,11 +882,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 2
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '26d6f897b516',
@@ -604,11 +898,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 728,
           'height': 90,
           'ad': '
test content 3
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            advertiserDomains: []
+          },
         },
         {
           'requestId': '326bde7fbf69',
@@ -618,87 +914,13 @@ describe('TheMediaGrid Adapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 4
',
-          'bidderCode': 'grid',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
-        }
-      ];
-
-      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
-      expect(result).to.deep.equal(expectedResponse);
-    });
-
-    it('dublicate uids and sizes in one slot', function () {
-      const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 1, 'h': 250, 'w': 300}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 1, 'h': 250, 'w': 300}], 'seat': '1'},
-      ];
-      const bidRequests = [
-        {
-          'bidder': 'grid',
-          'params': {
-            'uid': '1'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '5126e301f4be',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'grid',
-          'params': {
-            'uid': '1'
-          },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '57b2ebe70e16',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        },
-        {
-          'bidder': 'grid',
-          'params': {
-            'uid': '1'
+          'meta': {
+            advertiserDomains: []
           },
-          'adUnitCode': 'adunit-code-1',
-          'sizes': [[300, 250], [300, 600]],
-          'bidId': '225fcd44b18c',
-          'bidderRequestId': '171c5405a390',
-          'auctionId': '35bcbc0f7e79c',
-        }
-      ];
-      const request = spec.buildRequests(bidRequests);
-      const expectedResponse = [
-        {
-          'requestId': '5126e301f4be',
-          'cpm': 1.15,
-          'creativeId': 1,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '
test content 1
',
-          'bidderCode': 'grid',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': false,
-          'ttl': 360,
-        },
-        {
-          'requestId': '57b2ebe70e16',
-          'cpm': 0.5,
-          'creativeId': 1,
-          'dealId': undefined,
-          'width': 300,
-          'height': 250,
-          'ad': '
test content 2
',
-          'bidderCode': 'grid',
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': false,
-          'ttl': 360,
         }
       ];
 
diff --git a/test/spec/modules/gridNMBidAdapter_spec.js b/test/spec/modules/gridNMBidAdapter_spec.js
index 0dbaac0c526..6d3a607c0c5 100644
--- a/test/spec/modules/gridNMBidAdapter_spec.js
+++ b/test/spec/modules/gridNMBidAdapter_spec.js
@@ -132,6 +132,43 @@ describe('TheMediaGridNM Adapter', function () {
         expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
       });
     });
+
+    it('should return true when required params is absent, but available in mediaTypes', function () {
+      const paramsList = [
+        {
+          'source': 'jwp',
+          'secid': '11',
+          'pubid': '22',
+          'video': {
+            'protocols': [1, 2, 3, 4, 5, 6]
+          }
+        },
+        {
+          'source': 'jwp',
+          'secid': '11',
+          'pubid': '22',
+          'video': {
+            'mimes': ['video/mp4', 'video/x-ms-wmv'],
+          }
+        }
+      ];
+
+      const mediaTypes = {
+        video: {
+          mimes: ['video/mp4', 'video/x-ms-wmv'],
+          playerSize: [200, 300],
+          protocols: [1, 2, 3, 4, 5, 6]
+        }
+      };
+
+      paramsList.forEach((params) => {
+        const validBid = Object.assign({}, bid);
+        delete validBid.params;
+        validBid.params = params;
+        validBid.mediaTypes = mediaTypes;
+        expect(spec.isBidRequestValid(validBid)).to.equal(true);
+      });
+    });
   });
 
   describe('buildRequests', function () {
@@ -198,6 +235,39 @@ describe('TheMediaGridNM Adapter', function () {
       });
     });
 
+    it('should attach valid params from mediaTypes', function () {
+      const mediaTypes = {
+        video: {
+          skipafter: 10,
+          minduration: 10,
+          maxduration: 100,
+          protocols: [1, 3, 4],
+          playerSize: [300, 250]
+        }
+      };
+      const bidRequest = Object.assign({ mediaTypes }, bidRequests[0]);
+      const req = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const expectedVideo = {
+        'skipafter': 10,
+        'mind': 10,
+        'maxd': 100,
+        'mimes': ['video/mp4', 'video/x-ms-wmv'],
+        'protocols': [1, 2, 3, 4, 5, 6],
+        'size': '300x250'
+      };
+      const expectedParams = Object.assign({}, bidRequest.params);
+      expectedParams.video = Object.assign(expectedParams.video, expectedVideo);
+
+      expect(req.url).to.be.an('string');
+      const payload = parseRequestUrl(req.url);
+      expect(payload).to.have.property('u', referrer);
+      expect(payload).to.have.property('r', '22edbae2733bf6');
+      expect(payload).to.have.property('wrapperType', 'Prebid_js');
+      expect(payload).to.have.property('wrapperVersion', '$prebid.version$');
+      expect(payload).to.have.property('sizes', '300x250,300x600');
+      expect(req.data).to.deep.equal(expectedParams);
+    });
+
     it('if gdprConsent is present payload must have gdpr params', function () {
       const [request] = spec.buildRequests([bidRequests[0]], {gdprConsent: {consentString: 'AAA', gdprApplies: true}, refererInfo: bidderRequest.refererInfo});
       expect(request.url).to.be.an('string');
@@ -235,7 +305,7 @@ describe('TheMediaGridNM Adapter', function () {
   describe('interpretResponse', function () {
     const responses = [
       {'bid': [{'price': 1.15, 'adm': '\n<\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 250, 'w': 300, 'dealid': 11}], 'seat': '2'},
-      {'bid': [{'price': 0.5, 'adm': '\n<\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 600, 'w': 300}], 'seat': '2'},
+      {'bid': [{'price': 0.5, 'adm': '\n<\/Ad>\n<\/VAST>', 'content_type': 'video', 'h': 600, 'w': 300, adomain: ['my_domain.ru']}], 'seat': '2'},
       {'bid': [{'price': 0, 'h': 250, 'w': 300}], 'seat': '2'},
       {'bid': [{'price': 0, 'adm': '\n<\/Ad>\n<\/VAST>', 'h': 250, 'w': 300}], 'seat': '2'},
       undefined,
@@ -300,12 +370,14 @@ describe('TheMediaGridNM Adapter', function () {
           'dealId': 11,
           'width': 300,
           'height': 250,
-          'bidderCode': 'gridNM',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
           'vastXml': '\n<\/Ad>\n<\/VAST>',
+          'meta': {
+            'advertiserDomains': []
+          },
           'adResponse': {
             'content': '\n<\/Ad>\n<\/VAST>'
           }
@@ -317,12 +389,14 @@ describe('TheMediaGridNM Adapter', function () {
           'dealId': undefined,
           'width': 300,
           'height': 600,
-          'bidderCode': 'gridNM',
           'currency': 'USD',
           'mediaType': 'video',
-          'netRevenue': false,
+          'netRevenue': true,
           'ttl': 360,
           'vastXml': '\n<\/Ad>\n<\/VAST>',
+          'meta': {
+            'advertiserDomains': ['my_domain.ru']
+          },
           'adResponse': {
             'content': '\n<\/Ad>\n<\/VAST>'
           }
@@ -354,6 +428,9 @@ describe('TheMediaGridNM Adapter', function () {
           'bidId': '2bc598e42b6a',
           'bidderRequestId': '39d74f5b71464',
           'auctionId': '1cbd2feafe5e8b',
+          'meta': {
+            'advertiserDomains': []
+          },
           'mediaTypes': {
             'video': {
               'context': 'instream'
diff --git a/test/spec/modules/gumgumBidAdapter_spec.js b/test/spec/modules/gumgumBidAdapter_spec.js
index 7022f8f96dd..19d3309e3ee 100644
--- a/test/spec/modules/gumgumBidAdapter_spec.js
+++ b/test/spec/modules/gumgumBidAdapter_spec.js
@@ -1,3 +1,5 @@
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/gumgumBidAdapter.js';
@@ -33,7 +35,11 @@ describe('gumgumAdapter', function () {
     };
 
     it('should return true when required params found', function () {
+      const zoneBid = { ...bid, params: { 'zone': '123' } };
+      const pubIdBid = { ...bid, params: { 'pubId': 123 } };
       expect(spec.isBidRequestValid(bid)).to.equal(true);
+      expect(spec.isBidRequestValid(zoneBid)).to.equal(true);
+      expect(spec.isBidRequestValid(pubIdBid)).to.equal(true);
     });
 
     it('should return true when required params found', function () {
@@ -46,6 +52,17 @@ describe('gumgumAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true when inslot sends sizes and trackingid', function () {
+      let bid = Object.assign({}, bid);
+      delete bid.params;
+      bid.params = {
+        'inSlot': '789',
+        'sizes': [[0, 1], [2, 3], [4, 5], [6, 7]]
+      };
+
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
     it('should return false when no unit type is specified', function () {
       let bid = Object.assign({}, bid);
       delete bid.params;
@@ -81,6 +98,7 @@ describe('gumgumAdapter', function () {
   });
 
   describe('buildRequests', function () {
+    let sizesArray = [[300, 250], [300, 600]];
     let bidRequests = [
       {
         'bidder': 'gumgum',
@@ -88,7 +106,7 @@ describe('gumgumAdapter', function () {
           'inSlot': '9'
         },
         'adUnitCode': 'adunit-code',
-        'sizes': [[300, 250], [300, 600]],
+        'sizes': sizesArray,
         'bidId': '30b31c1838de1e',
         'schain': {
           'ver': '1.0',
@@ -114,6 +132,151 @@ describe('gumgumAdapter', function () {
         }
       }
     ];
+    const vidMediaTypes = {
+      video: {
+        playerSize: [640, 480],
+        context: 'instream',
+        minduration: 1,
+        maxduration: 2,
+        linearity: 1,
+        startdelay: 1,
+        placement: 123456,
+        protocols: [1, 2]
+      }
+    };
+    const zoneParam = { 'zone': '123a' };
+    const pubIdParam = { 'pubId': 123 };
+
+    it('should set pubId param if found', function () {
+      const request = { ...bidRequests[0], params: pubIdParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.pubId).to.equal(pubIdParam.pubId);
+    });
+
+    it('should set t param when zone param is found', function () {
+      const request = { ...bidRequests[0], params: zoneParam };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.t).to.equal(zoneParam.zone);
+    });
+
+    it('should set the iriscat param when found', function () {
+      const request = { ...bidRequests[0], params: { iriscat: 'abc123' } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.have.property('iriscat');
+    });
+
+    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];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
+    it('should not set the irisid param when not of type string', function () {
+      const request = { ...bidRequests[0], params: { irisid: 123456 } }
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data).to.not.have.property('irisid');
+    });
+
+    it('should set the global placement id (gpid)', function () {
+      const req = { ...bidRequests[0], ortb2Imp: { ext: { data: { adserver: { name: 'test', adslot: 123456 } } } } }
+      const bidRequest = spec.buildRequests([req])[0];
+      expect(bidRequest).to.have.property('gpid');
+      expect(bidRequest.gpid).to.equal(123456);
+    });
+
+    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];
+      expect(bidRequest.data).to.have.property('fp');
+      expect(bidRequest.data.fp).to.equal(42);
+    });
+
+    describe('product id', function () {
+      it('should set the correct pi param if native param is found', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, native: 2 } };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(5);
+      });
+      it('should set the correct pi param for video', function () {
+        const request = { ...bidRequests[0], params: zoneParam, mediaTypes: vidMediaTypes };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(7);
+      });
+      it('should set the correct pi param for invideo', function () {
+        const invideo = { video: { ...vidMediaTypes.video, linearity: 2 } };
+        const request = { ...bidRequests[0], params: zoneParam, mediaTypes: invideo };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(6);
+      });
+      it('should set the correct pi param if slot param is found', function () {
+        const request = { ...bidRequests[0], params: { ...zoneParam, slot: '123s' } };
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.pi).to.equal(3);
+      });
+      it('should default the pi param to 2 if only zone or pubId param is found', function () {
+        const zoneRequest = { ...bidRequests[0], params: zoneParam };
+        const pubIdRequest = { ...bidRequests[0], params: pubIdParam };
+        const zoneBidRequest = spec.buildRequests([zoneRequest])[0];
+        const pubIdBidRequest = spec.buildRequests([pubIdRequest])[0];
+        expect(zoneBidRequest.data.pi).to.equal(2);
+        expect(pubIdBidRequest.data.pi).to.equal(2);
+      });
+    });
+
+    it('should return a defined sizes field for video', function () {
+      const request = { ...bidRequests[0], mediaTypes: vidMediaTypes, params: { 'videoPubID': 123 } };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.sizes).to.equal(vidMediaTypes.video.playerSize);
+    });
+    it('should handle multiple sizes for inslot', function () {
+      const mediaTypes = { banner: { sizes: [[300, 250], [300, 600]] } }
+      const request = { ...bidRequests[0], mediaTypes };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.bf).to.equal('300x250,300x600');
+    });
+    describe('floorModule', function () {
+      const floorTestData = {
+        'currency': 'USD',
+        'floor': 1.50
+      };
+      bidRequests[0].getFloor = _ => {
+        return floorTestData;
+      };
+      it('should return the value from getFloor if present', function () {
+        const request = spec.buildRequests(bidRequests)[0];
+        expect(request.data.fp).to.equal(floorTestData.floor);
+      });
+      it('should return the getFloor.floor value if it is greater than bidfloor', function () {
+        const bidfloor = 0.80;
+        const request = { ...bidRequests[0] };
+        request.params.bidfloor = bidfloor;
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.fp).to.equal(floorTestData.floor);
+      });
+      it('should return the bidfloor value if it is greater than getFloor.floor', function () {
+        const bidfloor = 1.80;
+        const request = { ...bidRequests[0] };
+        request.params.bidfloor = bidfloor;
+        const bidRequest = spec.buildRequests([request])[0];
+        expect(bidRequest.data.fp).to.equal(bidfloor);
+      });
+      it('should return a floor currency', function () {
+        const request = spec.buildRequests(bidRequests)[0];
+        expect(request.data.fpc).to.equal(floorTestData.currency);
+      })
+    });
 
     it('sends bid request to ENDPOINT via GET', function () {
       const request = spec.buildRequests(bidRequests)[0];
@@ -133,6 +296,25 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data).to.include.any.keys('t');
       expect(bidRequest.data).to.include.any.keys('fp');
     });
+    it('should set iriscat parameter if iriscat param is found and is of type string', function () {
+      const iriscat = 'segment';
+      const request = { ...bidRequests[0] };
+      request.params = { ...request.params, iriscat };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.equal(iriscat);
+    });
+    it('should not send iriscat parameter if iriscat param is not found', function () {
+      const request = { ...bidRequests[0] };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.be.undefined;
+    });
+    it('should not send iriscat parameter if iriscat param is not of type string', function () {
+      const iriscat = 123;
+      const request = { ...bidRequests[0] };
+      request.params = { ...request.params, iriscat };
+      const bidRequest = spec.buildRequests([request])[0];
+      expect(bidRequest.data.iriscat).to.be.undefined;
+    });
     it('should send pubId if inScreenPubID param is specified', function () {
       const request = Object.assign({}, bidRequests[0]);
       delete request.params;
@@ -145,21 +327,7 @@ describe('gumgumAdapter', function () {
       expect(bidRequest.data).to.not.include.any.keys('t');
     });
     it('should send pubId if videoPubID param is specified', function () {
-      const mediaTypes = {
-        video: {
-          playerSize: [640, 480],
-          context: 'instream',
-          minduration: 1,
-          maxduration: 2,
-          linearity: 1,
-          startdelay: 1,
-          placement: 123456,
-          protocols: [1, 2]
-        }
-      };
-      const request = Object.assign({}, bidRequests[0]);
-      request.mediaTypes = mediaTypes
-      request.params = { 'videoPubID': 123 };
+      const request = { ...bidRequests[0], mediaTypes: vidMediaTypes, params: { 'videoPubID': 123 } };
       const bidRequest = spec.buildRequests([request])[0];
       expect(bidRequest.data).to.include.any.keys('pubId');
       expect(bidRequest.data.pubId).to.equal(request.params.videoPubID);
@@ -307,60 +475,85 @@ describe('gumgumAdapter', function () {
   })
 
   describe('interpretResponse', function () {
-    let serverResponse = {
-      'ad': {
-        'id': 29593,
-        'width': 300,
-        'height': 250,
-        'ipd': 2000,
-        'markup': '
I am an ad
',
-        'ii': true,
-        'du': null,
-        'price': 0,
-        'zi': 0,
-        'impurl': 'http://g2.gumgum.com/ad/view',
-        'clsurl': 'http://g2.gumgum.com/ad/close'
+    const metaData = { adomain: ['advertiser.com'], mediaType: BANNER }
+    const serverResponse = {
+      ad: {
+        id: 29593,
+        width: 300,
+        height: 250,
+        ipd: 2000,
+        markup: '
I am an ad
',
+        ii: true,
+        du: null,
+        price: 0,
+        zi: 0,
+        impurl: 'http://g2.gumgum.com/ad/view',
+        clsurl: 'http://g2.gumgum.com/ad/close'
       },
-      'pag': {
-        't': 'ggumtest',
-        'pvid': 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
-        'css': 'html { overflow-y: auto }',
-        'js': 'console.log("environment", env);'
+      pag: {
+        t: 'ggumtest',
+        pvid: 'aa8bbb65-427f-4689-8cee-e3eed0b89eec',
+        css: 'html { overflow-y: auto }',
+        js: 'console.log("environment", env);'
       },
-      'jcsi': { t: 0, rq: 8 },
-      'thms': 10000
+      jcsi: { t: 0, rq: 8 },
+      thms: 10000,
+      meta: metaData
     }
-    let bidRequest = {
+    const bidRequest = {
       id: 12345,
       sizes: [[300, 250], [1, 1]],
       url: ENDPOINT,
       method: 'GET',
       pi: 3
     }
-    let expectedResponse = {
-      'ad': '
I am an ad
',
-      'cpm': 0,
-      'creativeId': 29593,
-      'currency': 'USD',
-      'height': '250',
-      'netRevenue': true,
-      'requestId': 12345,
-      'width': '300',
-      // dealId: DEAL_ID,
-      // referrer: REFERER,
-      ttl: 60
+    const expectedMetaData = { advertiserDomains: ['advertiser.com'], mediaType: BANNER };
+    const expectedResponse = {
+      ad: '
I am an ad
',
+      cpm: 0,
+      creativeId: 29593,
+      currency: 'USD',
+      height: '250',
+      netRevenue: true,
+      requestId: 12345,
+      width: '300',
+      mediaType: BANNER,
+      ttl: 60,
+      meta: expectedMetaData
     };
 
     it('should get correct bid response', function () {
       expect(spec.interpretResponse({ body: serverResponse }, bidRequest)).to.deep.equal([expectedResponse]);
     });
 
+    it('should set a default value for advertiserDomains if adomain is not found', function () {
+      const meta = { ...metaData };
+      delete meta.adomain;
+
+      const response = { ...serverResponse, meta };
+      const expectedMeta = { ...expectedMetaData, advertiserDomains: [] };
+      const expected = { ...expectedResponse, meta: expectedMeta };
+
+      expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
+    });
+
+    it('should set a default value for meta.mediaType if mediaType is not found in the response', function () {
+      const meta = { ...metaData };
+      delete meta.mediaType;
+      const response = { ...serverResponse, meta };
+      const expected = { ...expectedResponse };
+
+      expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
+    });
+
     it('should pass correct currency if found in bid response', function () {
       const cur = 'EURO';
-      let response = Object.assign({}, serverResponse);
-      let expected = Object.assign({}, expectedResponse);
+      const response = { ...serverResponse };
       response.ad.cur = cur;
+
+      const expected = { ...expectedResponse };
       expected.currency = cur;
+
       expect(spec.interpretResponse({ body: response }, bidRequest)).to.deep.equal([expected]);
     });
 
@@ -385,6 +578,25 @@ describe('gumgumAdapter', function () {
       expect(result.length).to.equal(0);
     });
 
+    it('uses response width and height', function () {
+      const result = spec.interpretResponse({ body: serverResponse }, bidRequest)[0];
+      expect(result.width).to.equal(serverResponse.ad.width.toString());
+      expect(result.height).to.equal(serverResponse.ad.height.toString());
+    });
+
+    it('defaults to use bidRequest sizes when width and height are not found', function () {
+      const { ad, jcsi, pag, thms, meta } = serverResponse
+      const noAdSizes = { ...ad }
+      delete noAdSizes.width
+      delete noAdSizes.height
+      const responseWithoutSizes = { jcsi, pag, thms, meta, ad: noAdSizes }
+      const request = { ...bidRequest, sizes: [[100, 200]] }
+      const result = spec.interpretResponse({ body: responseWithoutSizes }, request)[0];
+
+      expect(result.width).to.equal(request.sizes[0][0].toString())
+      expect(result.height).to.equal(request.sizes[0][1].toString())
+    });
+
     it('returns 1x1 when eligible product and size available', function () {
       let inscreenBidRequest = {
         id: 12346,
@@ -423,11 +635,25 @@ describe('gumgumAdapter', function () {
     });
 
     it('updates jcsi object when the server response jcsi prop is found', function () {
-      const response = Object.assign({cw: 'AD_JSON'}, serverResponse);
+      const response = Object.assign({ cw: 'AD_JSON' }, serverResponse);
       const bidResponse = spec.interpretResponse({ body: response }, bidRequest)[0].ad;
       const decodedResponse = JSON.parse(atob(bidResponse));
       expect(decodedResponse.jcsi).to.eql(JCSI);
     });
+
+    it('sets the correct mediaType depending on product', function () {
+      const bannerBidResponse = spec.interpretResponse({ body: serverResponse }, bidRequest)[0];
+      const invideoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 6 } })[0];
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(bannerBidResponse.mediaType).to.equal(BANNER);
+      expect(invideoBidResponse.mediaType).to.equal(VIDEO);
+      expect(videoBidResponse.mediaType).to.equal(VIDEO);
+    });
+
+    it('sets a vastXml property if mediaType is video', function () {
+      const videoBidResponse = spec.interpretResponse({ body: serverResponse }, { ...bidRequest, data: { pi: 7 } })[0];
+      expect(videoBidResponse.vastXml).to.exist;
+    });
   })
   describe('getUserSyncs', function () {
     const syncOptions = {
diff --git a/test/spec/modules/h12mediaBidAdapter_spec.js b/test/spec/modules/h12mediaBidAdapter_spec.js
index 08a83ce981f..9861069f260 100644
--- a/test/spec/modules/h12mediaBidAdapter_spec.js
+++ b/test/spec/modules/h12mediaBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec} from 'modules/h12mediaBidAdapter';
 import {newBidder} from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
 
 describe('H12 Media Adapter', function () {
   const DEFAULT_CURRENCY = 'USD';
@@ -21,6 +22,7 @@ describe('H12 Media Adapter', function () {
     auctionId: '9adc85ed-43ee-4a78-816b-52b7e578f313',
     params: {
       pubid: 123321,
+      pubsubid: 'pubsubtestid',
     },
   };
 
@@ -72,34 +74,34 @@ describe('H12 Media Adapter', function () {
     currency: 'EUR',
     netRevenue: true,
     ttl: 500,
-    bids: [{
+    bid: {
       bidId: validBid.bidId,
       cpm: 0.33,
       width: 300,
       height: 600,
       creativeId: '335566',
       ad: '
my ad
',
-      usersync: [
-        {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'image'},
-        {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'iframe'}
-      ],
       meta: {
         advertiserId: '54321',
         advertiserName: 'My advertiser',
         advertiserDomains: ['test.com']
       }
-    }]
+    },
+    usersync: [
+      {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'image'},
+      {url: 'https://cookiesync.3rdpartypartner.com/?3rdparty_partner_user_id={user_id}&partner_id=h12media&gdpr_applies={gdpr}&gdpr_consent_string={gdpr_cs}', type: 'iframe'}
+    ],
   };
 
   const serverResponse2 = {
-    bids: [{
+    bid: {
       bidId: validBid2.bidId,
       cpm: 0.33,
       width: 300,
       height: 600,
       creativeId: '335566',
       ad: '
my ad 2
',
-    }]
+    }
   };
 
   function removeElement(id) {
@@ -152,6 +154,10 @@ describe('H12 Media Adapter', function () {
 
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
+    sandbox.stub(frameElement, 'getBoundingClientRect').returns({
+      left: 10,
+      top: 10,
+    });
   });
 
   afterEach(function () {
@@ -186,36 +192,62 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({adunitSize: validBid.mediaTypes.banner.sizes});
+      expect(requestsData).to.include({adunitSize: validBid.mediaTypes.banner.sizes});
     });
 
     it('should return empty bid size', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData2 = requests[1].data.bidrequest;
+
+      expect(requestsData2).to.deep.include({adunitSize: []});
+    });
+
+    it('should return pubsubid from params', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
+      const requestsData = requests[0].data.bidrequest;
+      const requestsData2 = requests[1].data.bidrequest;
+
+      expect(requestsData).to.include({pubsubid: 'pubsubtestid'});
+      expect(requestsData2).to.include({pubsubid: ''});
+    });
 
-      expect(requestsData.bidrequests[1]).to.deep.include({adunitSize: []});
+    it('should return empty for incorrect pubsubid from params', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const bidWithPub = {...validBid};
+      bidWithPub.params.pubsubid = 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii'; // More than 32 chars
+      const requests = spec.buildRequests([bidWithPub], bidderRequest);
+      const requestsData = requests[0].data.bidrequest;
+
+      expect(requestsData).to.include({pubsubid: ''});
     });
 
     it('should return bid size from params', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
+      const requestsData2 = requests[1].data.bidrequest;
 
-      expect(requestsData.bidrequests[1]).to.include({size: validBid2.params.size});
+      expect(requestsData).to.include({size: ''});
+      expect(requestsData2).to.include({size: validBid2.params.size});
     });
 
     it('should return GDPR info', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
       expect(requestsData).to.include({gdpr: true, gdpr_cs: bidderRequest.gdprConsent.consentString});
+      expect(requestsData2).to.include({gdpr: true, gdpr_cs: bidderRequest.gdprConsent.consentString});
     });
 
     it('should not have error on empty GDPR', function () {
@@ -223,9 +255,23 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid2.adUnitCode);
       const bidderRequestWithoutGDRP = {...bidderRequest, gdprConsent: null};
       const requests = spec.buildRequests([validBid, validBid2], bidderRequestWithoutGDRP);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
       expect(requestsData).to.include({gdpr: false});
+      expect(requestsData2).to.include({gdpr: false});
+    });
+
+    it('should not have error on empty USP', function () {
+      createElementVisible(validBid.adUnitCode);
+      createElementVisible(validBid2.adUnitCode);
+      const bidderRequestWithoutUSP = {...bidderRequest, uspConsent: null};
+      const requests = spec.buildRequests([validBid, validBid2], bidderRequestWithoutUSP);
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
+
+      expect(requestsData).to.include({usp: false});
+      expect(requestsData2).to.include({usp: false});
     });
 
     it('should create single POST', function () {
@@ -233,7 +279,8 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
 
-      expect(requests.method).to.equal('POST');
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[1].method).to.equal('POST');
     });
   });
 
@@ -241,42 +288,44 @@ describe('H12 Media Adapter', function () {
     it('should return coords', function () {
       createElementVisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.deep.include({coords: {x: 10, y: 10}});
+      expect(requestsData).to.deep.include({coords: {x: 10, y: 10}});
     });
 
-    it('should define not iframe', function () {
+    it('should define iframe', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const requests = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data;
+      const requestsData2 = requests[1].data;
 
-      expect(requestsData).to.include({isiframe: false});
+      expect(requestsData).to.include({isiframe: true});
+      expect(requestsData2).to.include({isiframe: true});
     });
 
     it('should define visible element', function () {
       createElementVisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: false});
+      expect(requestsData).to.include({ishidden: false});
     });
 
     it('should define invisible element', function () {
       createElementInvisible(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: true});
+      expect(requestsData).to.include({ishidden: true});
     });
 
     it('should define hidden element', function () {
       createElementHidden(validBid.adUnitCode);
       const requests = spec.buildRequests([validBid], bidderRequest);
-      const requestsData = requests.data;
+      const requestsData = requests[0].data.bidrequest;
 
-      expect(requestsData.bidrequests[0]).to.include({ishidden: true});
+      expect(requestsData).to.include({ishidden: true});
     });
   });
 
@@ -290,27 +339,27 @@ describe('H12 Media Adapter', function () {
     it('should return no bids if the response is empty', function () {
       const bidResponse = spec.interpretResponse({ body: [] }, { validBid });
 
-      expect(bidResponse.length).to.equal(0);
+      expect(bidResponse).to.be.empty;
     });
 
     it('should return valid bid responses', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const request = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const bidResponse = spec.interpretResponse({body: serverResponse}, request);
+      const bidResponse = spec.interpretResponse({body: serverResponse}, request[0]);
 
       expect(bidResponse[0]).to.deep.include({
         requestId: validBid.bidId,
-        ad: serverResponse.bids[0].ad,
+        ad: serverResponse.bid.ad,
         mediaType: 'banner',
-        creativeId: serverResponse.bids[0].creativeId,
-        cpm: serverResponse.bids[0].cpm,
-        width: serverResponse.bids[0].width,
-        height: serverResponse.bids[0].height,
+        creativeId: serverResponse.bid.creativeId,
+        cpm: serverResponse.bid.cpm,
+        width: serverResponse.bid.width,
+        height: serverResponse.bid.height,
         currency: 'EUR',
         netRevenue: true,
         ttl: 500,
-        meta: serverResponse.bids[0].meta,
+        meta: serverResponse.bid.meta,
         pubid: validBid.params.pubid
       });
     });
@@ -319,17 +368,17 @@ describe('H12 Media Adapter', function () {
       createElementVisible(validBid.adUnitCode);
       createElementVisible(validBid2.adUnitCode);
       const request = spec.buildRequests([validBid, validBid2], bidderRequest);
-      const bidResponse = spec.interpretResponse({body: serverResponse2}, request);
+      const bidResponse = spec.interpretResponse({body: serverResponse2}, request[0]);
 
       expect(bidResponse[0]).to.deep.include({
         requestId: validBid2.bidId,
-        ad: serverResponse2.bids[0].ad,
+        ad: serverResponse2.bid.ad,
         mediaType: 'banner',
-        creativeId: serverResponse2.bids[0].creativeId,
-        cpm: serverResponse2.bids[0].cpm,
-        width: serverResponse2.bids[0].width,
-        height: serverResponse2.bids[0].height,
-        meta: serverResponse2.bids[0].meta,
+        creativeId: serverResponse2.bid.creativeId,
+        cpm: serverResponse2.bid.cpm,
+        width: serverResponse2.bid.width,
+        height: serverResponse2.bid.height,
+        meta: serverResponse2.bid.meta,
         pubid: validBid2.params.pubid,
         currency: DEFAULT_CURRENCY,
         netRevenue: DEFAULT_NET_REVENUE,
diff --git a/test/spec/modules/haloIdSystem_spec.js b/test/spec/modules/haloIdSystem_spec.js
new file mode 100644
index 00000000000..8b6a67adee1
--- /dev/null
+++ b/test/spec/modules/haloIdSystem_spec.js
@@ -0,0 +1,42 @@
+import { haloIdSubmodule, storage } from 'modules/haloIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+
+describe('HaloIdSystem', function () {
+  describe('getId', function() {
+    let getDataFromLocalStorageStub;
+
+    beforeEach(function() {
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(function () {
+      getDataFromLocalStorageStub.restore();
+    });
+
+    it('gets a haloId', function() {
+      const config = {
+        params: {}
+      };
+      const callbackSpy = sinon.spy();
+      const callback = haloIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      const request = server.requests[0];
+      expect(request.url).to.eq(`https://id.halo.ad.gt/api/v1/pbhid`);
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ haloId: 'testHaloId1' }));
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({haloId: 'testHaloId1'});
+    });
+
+    it('gets a cached haloid', function() {
+      const config = {
+        params: {}
+      };
+      getDataFromLocalStorageStub.withArgs('auHaloId').returns('tstCachedHaloId1');
+
+      const callbackSpy = sinon.spy();
+      const callback = haloIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+      expect(callbackSpy.lastCall.lastArg).to.deep.equal({haloId: 'tstCachedHaloId1'});
+    });
+  });
+});
diff --git a/test/spec/modules/haloRtdProvider_spec.js b/test/spec/modules/haloRtdProvider_spec.js
new file mode 100644
index 00000000000..3052441a00d
--- /dev/null
+++ b/test/spec/modules/haloRtdProvider_spec.js
@@ -0,0 +1,374 @@
+import {config} from 'src/config.js';
+import {HALOID_LOCAL_NAME, RTD_LOCAL_NAME, addRealTimeData, getRealTimeData, haloSubmodule, storage} from 'modules/haloRtdProvider.js';
+import {server} from 'test/mocks/xhr.js';
+
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('haloRtdProvider', function() {
+  let getDataFromLocalStorageStub;
+
+  beforeEach(function() {
+    config.resetConfig();
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(function () {
+    getDataFromLocalStorageStub.restore();
+  });
+
+  describe('haloSubmodule', function() {
+    it('successfully instantiates', function () {
+		  expect(haloSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Add Real-Time Data', function() {
+    it('merges ortb2 data', function() {
+      let rtdConfig = {};
+      let bidConfig = {};
+
+      const setConfigUserObj1 = {
+        name: 'www.dataprovider1.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      const setConfigUserObj2 = {
+        name: 'www.dataprovider2.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1914'
+        }]
+      };
+
+      const setConfigSiteObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1812'
+          },
+          {
+            id: '1955'
+          }
+        ]
+      }
+
+      config.setConfig({
+        ortb2: {
+          user: {
+            data: [setConfigUserObj1, setConfigUserObj2]
+          },
+          site: {
+            content: {
+              data: [setConfigSiteObj1]
+            }
+          }
+        }
+      });
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider4.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1918'
+          },
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const rtdSiteObj1 = {
+        name: 'www.dataprovider5.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1945'
+          },
+          {
+            id: '2003'
+          }
+        ]
+      };
+
+      const rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj1]
+          },
+          site: {
+            content: {
+              data: [rtdSiteObj1]
+            }
+          }
+        }
+      };
+
+      let pbConfig = config.getConfig();
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      let ortb2Config = config.getConfig().ortb2;
+
+      expect(ortb2Config.user.data).to.deep.include.members([setConfigUserObj1, setConfigUserObj2, rtdUserObj1]);
+      expect(ortb2Config.site.content.data).to.deep.include.members([setConfigSiteObj1, rtdSiteObj1]);
+    });
+
+    it('allows publisher defined rtd ortb2 logic', function() {
+      const rtdConfig = {
+        params: {
+          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+            if (rtd.ortb2.user.data[0].segment[0].id == '1776') {
+              pbConfig.setConfig({ortb2: rtd.ortb2});
+            } else {
+              pbConfig.setConfig({ortb2: {}});
+            }
+          }
+        }
+      };
+
+      let bidConfig = {};
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider.com',
+        ext: { taxonomyname: 'iab_audience_taxonomy' },
+        segment: [{
+          id: '1776'
+        }]
+      };
+
+      let rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj1]
+          }
+        }
+      };
+
+      config.resetConfig();
+
+      let pbConfig = config.getConfig();
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+      expect(config.getConfig().ortb2.user.data).to.deep.include.members([rtdUserObj1]);
+
+      const rtdUserObj2 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [{
+          id: 'pubseg1'
+        }]
+      };
+
+      rtd = {
+        ortb2: {
+          user: {
+            data: [rtdUserObj2]
+          }
+        }
+      };
+
+      config.resetConfig();
+
+      pbConfig = config.getConfig();
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+      expect(config.getConfig().ortb2).to.deep.equal({});
+    });
+
+    it('allows publisher defined adunit logic', function() {
+      const rtdConfig = {
+        params: {
+          handleRtd: function(bidConfig, rtd, rtdConfig, pbConfig) {
+            var adUnits = bidConfig.adUnits;
+            for (var i = 0; i < adUnits.length; i++) {
+              var adUnit = adUnits[i];
+              for (var j = 0; j < adUnit.bids.length; j++) {
+                var bid = adUnit.bids[j];
+                if (bid.bidder == 'adBuzz') {
+                  for (var k = 0; k < rtd.adBuzz.length; k++) {
+                    bid.adBuzzData.segments.adBuzz.push(rtd.adBuzz[k]);
+                  }
+                } else if (bid.bidder == 'trueBid') {
+                  for (var k = 0; k < rtd.trueBid.length; k++) {
+                    bid.trueBidSegments.push(rtd.trueBid[k]);
+                  }
+                }
+              }
+            }
+          }
+        }
+      };
+
+      let bidConfig = {
+        adUnits: [
+          {
+            bids: [
+              {
+                bidder: 'adBuzz',
+                adBuzzData: {
+                  segments: {
+                    adBuzz: [
+                      {
+                        id: 'adBuzzSeg1'
+                      }
+                    ]
+                  }
+                }
+              },
+              {
+                bidder: 'trueBid',
+                trueBidSegments: []
+              }
+            ]
+          }
+        ]
+      };
+
+      const rtd = {
+        adBuzz: [{id: 'adBuzzSeg2'}, {id: 'adBuzzSeg3'}],
+        trueBid: [{id: 'truebidSeg1'}, {id: 'truebidSeg2'}, {id: 'truebidSeg3'}]
+      };
+
+      addRealTimeData(bidConfig, rtd, rtdConfig);
+
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[0].id).to.equal('adBuzzSeg1');
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[1].id).to.equal('adBuzzSeg2');
+      expect(bidConfig.adUnits[0].bids[0].adBuzzData.segments.adBuzz[2].id).to.equal('adBuzzSeg3');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[0].id).to.equal('truebidSeg1');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[1].id).to.equal('truebidSeg2');
+      expect(bidConfig.adUnits[0].bids[1].trueBidSegments[2].id).to.equal('truebidSeg3');
+    });
+  });
+
+  describe('Get Real-Time Data', function() {
+    it('gets rtd from local storage cache', function() {
+      const rtdConfig = {
+        params: {
+          segmentCache: true
+        }
+      };
+
+      const bidConfig = {};
+
+      const rtdUserObj1 = {
+        name: 'www.dataprovider3.com',
+        ext: {
+          taxonomyname: 'iab_audience_taxonomy'
+        },
+        segment: [
+          {
+            id: '1918'
+          },
+          {
+            id: '1939'
+          }
+        ]
+      };
+
+      const cachedRtd = {
+        rtd: {
+          ortb2: {
+            user: {
+              data: [rtdUserObj1]
+            }
+          }
+        }
+      };
+
+      getDataFromLocalStorageStub.withArgs(RTD_LOCAL_NAME).returns(JSON.stringify(cachedRtd));
+
+      expect(config.getConfig().ortb2).to.be.undefined;
+      getRealTimeData(bidConfig, () => {}, rtdConfig, {});
+      expect(config.getConfig().ortb2.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+
+    it('gets real-time data via async request', function() {
+      const setConfigSiteObj1 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [
+          {
+            id: 'pubseg1'
+          },
+          {
+            id: 'pubseg2'
+          }
+        ]
+      }
+
+      config.setConfig({
+        ortb2: {
+          site: {
+            content: {
+              data: [setConfigSiteObj1]
+            }
+          }
+        }
+      });
+
+      const rtdConfig = {
+        params: {
+          segmentCache: false,
+          usePubHalo: true,
+          requestParams: {
+            publisherId: 'testPub1'
+          }
+        }
+      };
+
+      let bidConfig = {};
+
+      const rtdUserObj1 = {
+        name: 'www.audigent.com',
+        ext: {
+          segtax: '1',
+          taxprovider: '1'
+        },
+        segment: [
+          {
+            id: 'pubseg1'
+          },
+          {
+            id: 'pubseg2'
+          }
+        ]
+      };
+
+      const data = {
+        rtd: {
+          ortb2: {
+            user: {
+              data: [rtdUserObj1]
+            }
+          }
+        }
+      };
+
+      getDataFromLocalStorageStub.withArgs(HALOID_LOCAL_NAME).returns('testHaloId1');
+      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('haloId', 'testHaloId1');
+
+      request.respond(200, responseHeader, JSON.stringify(data));
+
+      expect(config.getConfig().ortb2.user.data).to.deep.include.members([rtdUserObj1]);
+    });
+  });
+});
diff --git a/test/spec/modules/haxmediaBidAdapter_spec.js b/test/spec/modules/haxmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..2e39d771bdf
--- /dev/null
+++ b/test/spec/modules/haxmediaBidAdapter_spec.js
@@ -0,0 +1,304 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/haxmediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('haxmediaBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'haxmedia',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  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://balancer.haxmedia.io/?c=o&m=multi');
+    });
+    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');
+      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');
+    });
+
+    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');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      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);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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/hybridBidAdapter_spec.js b/test/spec/modules/hybridBidAdapter_spec.js
index e5ad878c9b1..ffbc27293fb 100644
--- a/test/spec/modules/hybridBidAdapter_spec.js
+++ b/test/spec/modules/hybridBidAdapter_spec.js
@@ -25,16 +25,22 @@ describe('Hybrid.ai Adapter', function() {
     placeId: PLACE_ID,
     placement: 'video'
   }
+  const inImageMandatoryParams = {
+    placeId: PLACE_ID,
+    placement: 'inImage',
+    imageUrl: 'https://hybrid.ai/images/image.jpg'
+  }
   const validBidRequests = [
     getSlotConfigs({ banner: {} }, bannerMandatoryParams),
-    getSlotConfigs({ video: {playerSize: [[640, 480]]} }, videoMandatoryParams)
+    getSlotConfigs({ video: {playerSize: [[640, 480]], context: 'outstream'} }, videoMandatoryParams),
+    getSlotConfigs({ banner: {sizes: [0, 0]} }, inImageMandatoryParams)
   ]
   describe('isBidRequestValid method', function() {
     describe('returns true', function() {
       describe('when banner slot config has all mandatory params', () => {
-        describe('and placement has the correct value', function() {
+        describe('and banner placement has the correct value', function() {
           const slotConfig = getSlotConfigs(
-            { banner: {} },
+            {banner: {}},
             {
               placeId: PLACE_ID,
               placement: 'banner'
@@ -43,6 +49,22 @@ describe('Hybrid.ai Adapter', function() {
           const isBidRequestValid = spec.isBidRequestValid(slotConfig)
           expect(isBidRequestValid).to.equal(true)
         })
+        describe('and In-Image placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {
+              banner: {
+                sizes: [[0, 0]]
+              }
+            },
+            {
+              placeId: PLACE_ID,
+              placement: 'inImage',
+              imageUrl: 'imageUrl'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
         describe('when video slot has all mandatory params.', function() {
           it('should return true, when video mediatype object are correct.', function() {
             const slotConfig = getSlotConfigs(
@@ -84,6 +106,15 @@ describe('Hybrid.ai Adapter', function() {
           )
           expect(isBidRequestValid).to.equal(false)
         })
+        it('does not have the imageUrl.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placeId: PLACE_ID,
+              placement: 'inImage'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
         it('does not have a the correct placement.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
             createSlotconfig({
@@ -224,7 +255,8 @@ describe('Hybrid.ai Adapter', function() {
                   currency: 'USD',
                   content: 'html',
                   width: 100,
-                  height: 100
+                  height: 100,
+                  advertiserDomains: ['hybrid.ai']
                 }
               ]
             }
@@ -238,6 +270,37 @@ describe('Hybrid.ai Adapter', function() {
           expect(bids[0].height).to.equal(100)
           expect(bids[0].currency).to.equal('USD')
           expect(bids[0].netRevenue).to.equal(true)
+          expect(bids[0].meta.advertiserDomains).to.deep.equal(['hybrid.ai'])
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+        it('should return a In-Image bid', function() {
+          const request = spec.buildRequests([validBidRequests[2]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: 'html',
+                  inImage: {
+                    actionUrls: {}
+                  },
+                  width: 100,
+                  height: 100,
+                  ttl: 360
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
           expect(typeof bids[0].ad).to.equal('string')
         })
       })
@@ -253,7 +316,8 @@ describe('Hybrid.ai Adapter', function() {
                   currency: 'USD',
                   content: 'html',
                   width: 100,
-                  height: 100
+                  height: 100,
+                  transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
                 }
               ]
             }
diff --git a/test/spec/modules/iasRtdProvider_spec.js b/test/spec/modules/iasRtdProvider_spec.js
new file mode 100644
index 00000000000..778a3a81b9b
--- /dev/null
+++ b/test/spec/modules/iasRtdProvider_spec.js
@@ -0,0 +1,74 @@
+import { iasSubModule } from 'modules/iasRtdProvider.js';
+import { expect } from 'chai';
+
+describe('iasRtdProvider is a RTD provider that', function () {
+  it('has the correct module name', function () {
+    expect(iasSubModule.name).to.equal('ias');
+  });
+  describe('has a method `init` that', function () {
+    it('exists', function () {
+      expect(iasSubModule.init).to.be.a('function');
+    });
+    it('returns true', function () {
+      expect(iasSubModule.init()).to.equal(true);
+    });
+  });
+  describe('has a method `getBidRequestData` that', function () {
+    const callback = sinon.spy();
+    const config = {
+      name: 'ias',
+      waitForIt: true,
+      params: {
+        pubId: 1234
+      }
+    };
+    it('exists', function () {
+      expect(iasSubModule.getBidRequestData).to.be.a('function');
+    });
+    it('verify config params', function () {
+      expect(config.name).to.not.be.undefined;
+      expect(config.name).to.equal('ias');
+      expect(config.params.pubId).to.not.be.undefined;
+      expect(config.params).to.have.property('pubId');
+    });
+    it('invoke method', function () {
+      iasSubModule.getBidRequestData({ adUnits: adUnits }, callback, config);
+      expect(adUnits).to.length(2);
+      expect(callback.calledOnce).to.be.false;
+    });
+  });
+});
+
+const adUnits = [
+  {
+    code: 'one-div-id',
+    mediaTypes: {
+      banner: {
+        sizes: [[970, 250], [728, 90], [1000, 90]]
+      }
+    },
+    sizes: [[970, 250], [728, 90], [1000, 90]],
+    bids: [
+      {
+        bidder: 'ias',
+        params: {
+          pubId: '1234',
+          adUnitPath: '/a/b/c'
+        }
+      }]
+  },
+  {
+    code: 'two-div-id',
+    mediaTypes: {
+      banner: { sizes: [[300, 250], [300, 600]] }
+    },
+    sizes: [[300, 250], [300, 600]],
+    bids: [
+      {
+        bidder: 'ias',
+        params: {
+          pubId: '1234',
+          adUnitPath: '/d/e/f'
+        }
+      }]
+  }];
diff --git a/test/spec/modules/id5AnalyticsAdapter_spec.js b/test/spec/modules/id5AnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..4a1e708ed7d
--- /dev/null
+++ b/test/spec/modules/id5AnalyticsAdapter_spec.js
@@ -0,0 +1,452 @@
+import adapterManager from '../../../src/adapterManager.js';
+import id5AnalyticsAdapter from '../../../modules/id5AnalyticsAdapter.js';
+import { expect } from 'chai';
+import sinon from 'sinon';
+import events from '../../../src/events.js';
+import constants from '../../../src/constants.json';
+import { generateUUID } from '../../../src/utils.js';
+
+const CONFIG_URL = 'https://api.id5-sync.com/analytics/12349/pbjs';
+const INGEST_URL = 'https://test.me/ingest';
+
+describe('ID5 analytics adapter', () => {
+  let server;
+  let config;
+
+  beforeEach(() => {
+    server = sinon.createFakeServer();
+    config = {
+      options: {
+        partnerId: 12349,
+      }
+    };
+  });
+
+  afterEach(() => {
+    server.restore();
+  });
+
+  it('registers itself with the adapter manager', () => {
+    const adapter = adapterManager.getAnalyticsAdapter('id5Analytics');
+    expect(adapter).to.exist;
+    expect(adapter.gvlid).to.be.a('number');
+    expect(adapter.adapter).to.equal(id5AnalyticsAdapter);
+  });
+
+  it('tolerates undefined or empty config', () => {
+    id5AnalyticsAdapter.enableAnalytics(undefined);
+    id5AnalyticsAdapter.enableAnalytics({});
+  });
+
+  it('calls configuration endpoint', () => {
+    server.respondWith('GET', CONFIG_URL, [200,
+      {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*'
+      },
+      `{ "sampling": 0, "ingestUrl": "${INGEST_URL}" }`
+    ]);
+    id5AnalyticsAdapter.enableAnalytics(config);
+    server.respond();
+
+    expect(server.requests).to.have.length(1);
+
+    id5AnalyticsAdapter.disableAnalytics();
+  });
+
+  it('does not call configuration endpoint when partner id is missing', () => {
+    id5AnalyticsAdapter.enableAnalytics({});
+    server.respond();
+
+    expect(server.requests).to.have.length(0);
+
+    id5AnalyticsAdapter.disableAnalytics();
+  });
+
+  describe('after configuration', () => {
+    let auction;
+
+    beforeEach(() => {
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}" }`
+      ]);
+
+      server.respondWith('POST', INGEST_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        ''
+      ]);
+
+      auction = {
+        auctionId: generateUUID(),
+        adUnits: [{
+          'code': 'user-728',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250], [300, 600], [728, 90]]
+            }
+          },
+          adUnitCodes: ['user-728']
+        }],
+      };
+    });
+
+    afterEach(() => {
+      id5AnalyticsAdapter.disableAnalytics();
+    });
+
+    it('sends auction end events to the backend', () => {
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      // Why 3? 1: config, 2: tcfEnforcement, 3: auctionEnd
+      // tcfEnforcement? yes, gdprEnforcement module emits in reaction to auctionEnd
+      expect(server.requests).to.have.length(3);
+
+      const body1 = JSON.parse(server.requests[1].requestBody);
+      expect(body1.source).to.equal('pbjs');
+      expect(body1.event).to.equal('tcf2Enforcement');
+      expect(body1.partnerId).to.equal(12349);
+      expect(body1.meta).to.be.a('object');
+      expect(body1.meta.pbjs).to.equal($$PREBID_GLOBAL$$.version);
+      expect(body1.meta.sampling).to.equal(1);
+      expect(body1.meta.tz).to.be.a('number');
+
+      const body2 = JSON.parse(server.requests[2].requestBody);
+      expect(body2.source).to.equal('pbjs');
+      expect(body2.event).to.equal('auctionEnd');
+      expect(body2.partnerId).to.equal(12349);
+      expect(body2.meta).to.be.a('object');
+      expect(body2.meta.pbjs).to.equal($$PREBID_GLOBAL$$.version);
+      expect(body2.meta.sampling).to.equal(1);
+      expect(body2.meta.tz).to.be.a('number');
+      expect(body2.payload).to.eql(auction);
+    });
+
+    it('filters unwanted IDs from the events it sends', () => {
+      auction.adUnits[0].bids = [{
+        'bidder': 'appnexus',
+        'params': {
+          'placementId': '16618951'
+        },
+        'userId': {
+          'criteoId': '_h_y_19IMUhMZG1TOTRReHFNc29TekJ3TzQ3elhnRU81ayUyQjhiRkdJJTJGaTFXJTJCdDRnVmN4S0FETUhQbXdmQWg0M3g1NWtGbGolMkZXalclMkJvWjJDOXFDSk1HU3ZKaVElM0QlM0Q',
+          'id5id': {
+            'uid': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*FSycZQy7v7zWXiKbEpPEWoB3_UiWdPGzh554ncYDvOkAAA3rajiR0yNrFAU7oDTu',
+            'ext': { 'linkType': 1 }
+          },
+          'tdid': '888a6042-8f99-483b-aa26-23c44bc9166b'
+        },
+        'userIdAsEids': [{
+          'source': 'criteo.com',
+          'uids': [{
+            'id': '_h_y_19IMUhMZG1TOTRReHFNc29TekJ3TzQ3elhnRU81ayUyQjhiRkdJJTJGaTFXJTJCdDRnVmN4S0FETUhQbXdmQWg0M3g1NWtGbGolMkZXalclMkJvWjJDOXFDSk1HU3ZKaVElM0QlM0Q',
+            'atype': 1
+          }]
+        }, {
+          'source': 'id5-sync.com',
+          'uids': [{
+            'id': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*FSycZQy7v7zWXiKbEpPEWoB3_UiWdPGzh554ncYDvOkAAA3rajiR0yNrFAU7oDTu',
+            'atype': 1,
+            'ext': { 'linkType': 1 }
+          }]
+        }]
+      }];
+
+      auction.bidderRequests = [{
+        'bidderCode': 'appnexus',
+        'auctionId': 'e8d15df4-d89c-44c9-8b36-812f75cbf227',
+        'bidderRequestId': '1451a3c759c60359',
+        'bids': [
+          {
+            'bidder': 'appnexus',
+            'params': {
+              'placementId': '16824712'
+            },
+            'userId': {
+              'id5id': {
+                'uid': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*CmuuahP8jbPJGRCUDdT2VZ8wz0eJM8O8mNlKktlEjuYAABFEjc2c9faqDencf2hR',
+                'ext': {
+                  'linkType': 1
+                }
+              },
+              'sharedid': {
+                'id': '01F6J4T72MRFYVWTN65WFA0H7N',
+                'third': '01F6J4T72MRFYVWTN65WFA0H7N'
+              },
+              'tdid': '0e45f56b-ad09-4c91-b090-8bd03e0d0754'
+            },
+            'userIdAsEids': [
+              {
+                'source': 'id5-sync.com',
+                'uids': [
+                  {
+                    'id': 'ID5-ZHMOQ99ulpk687Fd9xVwzxMsYtkQIJnI-qm3iWdtww!ID5*CmuuahP8jbPJGRCUDdT2VZ8wz0eJM8O8mNlKktlEjuYAABFEjc2c9faqDencf2hR',
+                    'atype': 1,
+                    'ext': {
+                      'linkType': 1
+                    }
+                  }
+                ]
+              },
+              {
+                'source': 'sharedid.org',
+                'uids': [
+                  {
+                    'id': '01F6J4T72MRFYVWTN65WFA0H7N',
+                    'atype': 1,
+                    'ext': {
+                      'third': '01F6J4T72MRFYVWTN65WFA0H7N'
+                    }
+                  }
+                ]
+              },
+              {
+                'source': 'adserver.org',
+                'uids': [
+                  {
+                    'id': '0e45f56b-ad09-4c91-b090-8bd03e0d0754',
+                    'atype': 1,
+                    'ext': {
+                      'rtiPartner': 'TDID'
+                    }
+                  }
+                ]
+              }
+            ],
+            'ortb2Imp': {
+              'ext': {
+                'data': {
+                  'adserver': {
+                    'name': 'gam',
+                    'adslot': '/6783/Kiwi/portail'
+                  },
+                  'pbadslot': '/6783/Kiwi/portail'
+                }
+              }
+            },
+            'adUnitCode': 'btf_leaderboard',
+            'transactionId': '3ce8216e-7898-4a22-86ba-01519b62bfce',
+            'sizes': [
+              [
+                728,
+                90
+              ]
+            ],
+            'bidId': '146661c05209a56e',
+            'bidderRequestId': '1451a3c759c60359',
+            'auctionId': 'e8d15df4-d89c-44c9-8b36-812f75cbf227',
+            'src': 'client',
+            'bidRequestsCount': 2,
+            'bidderRequestsCount': 2,
+            'bidderWinsCount': 0
+          }
+        ],
+        'auctionStart': 1621959214757,
+        'timeout': 2000,
+        'refererInfo': {
+          'referer': 'https://www.blog.com/?pbjs_debug=true',
+          'reachedTop': true,
+          'isAmp': false,
+          'numIframes': 0,
+          'stack': [
+            'https://www.blog.com/?pbjs_debug=true'
+          ],
+          'canonicalUrl': null
+        },
+        'gdprConsent': {
+          'consentString': 'CPGw1WAPGw1WAAHABBENBbCsAP_AAH_AAAAAH3tf_X__b3_j-_59__t0eY1f9_7_v-0zjhfdt-8N2f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrTPsbk2Mr7NKJ7PEmnMbe2dYGH9_n93TuZKY7__8___z__-v_v____f_r-3_3__59X---_e_V399zLv9__3__9gfaASYal8AF2JY4Mk0aVQogQhWEh0AoAKKAYWiawgZXBTsrgI9QQMAEJqAjAiBBiCjFgEAAgEASERASAHggEQBEAgABACpAQgAI2AQWAFgYBAAKAaFiBFAEIEhBkcFRymBARItFBPZWAJRd7GmEIZRYAUCj-iowEShBAsDISFg4AAA.f_gAD_gAAAAA',
+          'vendorData': {
+            'cmpId': 7,
+            'cmpVersion': 1,
+            'gdprApplies': true,
+            'tcfPolicyVersion': 2,
+            'eventStatus': 'useractioncomplete',
+            'cmpStatus': 'loaded',
+            'listenerId': 47,
+            'tcString': 'CPGw1WAPGw1WAAHABBENBbCsAP_AAH_AAAAAH3tf_X__b3_j-_59__t0eY1f9_7_v-0zjhfdt-8N2f_X_L8X42M7vF36pq4KuR4Eu3LBIQdlHOHcTUmw6okVrTPsbk2Mr7NKJ7PEmnMbe2dYGH9_n93TuZKY7__8___z__-v_v____f_r-3_3__59X---_e_V399zLv9__3__9gfaASYal8AF2JY4Mk0aVQogQhWEh0AoAKKAYWiawgZXBTsrgI9QQMAEJqAjAiBBiCjFgEAAgEASERASAHggEQBEAgABACpAQgAI2AQWAFgYBAAKAaFiBFAEIEhBkcFRymBARItFBPZWAJRd7GmEIZRYAUCj-iowEShBAsDISFg4AAA.f_gAD_gAAAAA',
+          },
+          'gdprApplies': true,
+          'addtlConsent': '1~7.12.35.62.66.70.89.93.108.122.144.149.153.162.167.184.196.221.241.253.259.272.311.317.323.326.338.348.350.415.440.448.449.482.486.491.494.495.540.571.574.585.587.588.590.725.733.780.817.839.864.867.932.938.981.986.1031.1033.1051.1092.1097.1126.1127.1170.1171.1186.1201.1204.1205.1211.1215.1230.1232.1236.1248.1276.1290.1301.1313.1344.1364.1365.1415.1419.1428.1449.1451.1509.1558.1564.1570.1577.1591.1651.1669.1712.1716.1720.1721.1725.1733.1753.1765.1799.1810.1834.1842.1870.1878.1889.1896.1911.1922.1929.2012.2072.2078.2079.2109.2177.2202.2253.2290.2299.2316.2357.2373.2526.2531.2571.2572.2575.2628.2663.2677.2776.2778.2779.2985.3033.3052.3154',
+          'apiVersion': 2
+        },
+        'start': 1621959214763
+      }];
+
+      auction.bidsReceived = [{
+        'bidderCode': 'appnexus',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '99e7838aa7f1c4f',
+        'requestId': '21e0b32208ee9a',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.020601,
+        'creativeId': 209272535,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': 'user-728',
+        'appnexus': {
+          'buyerMemberId': 11563
+        },
+        'meta': {
+          'advertiserId': 4388779
+        },
+        'ad': 'stuff i am not interested in',
+        'originalCpm': 0.020601,
+        'originalCurrency': 'USD',
+        'auctionId': 'c7694dbb-a583-4a73-a933-b16f1f821ba4',
+        // Make sure cleanup is resilient
+        'someNullObject': null,
+        'someUndefinedProperty': undefined
+      }];
+
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(3);
+
+      const body = JSON.parse(server.requests[2].requestBody);
+      expect(body.event).to.equal('auctionEnd');
+      expect(body.payload.adUnits[0].bids[0].userId).to.eql({
+        'criteoId': '__ID5_REDACTED__',
+        'id5id': '__ID5_REDACTED__',
+        'tdid': '__ID5_REDACTED__'
+      });
+      expect(body.payload.bidderRequests[0].bids[0].userId).to.eql({
+        'sharedid': '__ID5_REDACTED__',
+        'id5id': '__ID5_REDACTED__',
+        'tdid': '__ID5_REDACTED__'
+      });
+      body.payload.adUnits[0].bids[0].userIdAsEids.forEach((userId) => {
+        expect(userId.uids[0].id).to.equal('__ID5_REDACTED__');
+        if (userId.uids[0].ext) {
+          expect(userId.uids[0].ext).to.equal('__ID5_REDACTED__');
+        }
+      });
+      body.payload.bidderRequests[0].bids[0].userIdAsEids.forEach((userId) => {
+        expect(userId.uids[0].id).to.equal('__ID5_REDACTED__');
+        if (userId.uids[0].ext) {
+          expect(userId.uids[0].ext).to.equal('__ID5_REDACTED__');
+        }
+      });
+      expect(body.payload.bidsReceived[0].ad).to.equal(undefined);
+      expect(body.payload.bidsReceived[0].requestId).to.equal('21e0b32208ee9a');
+    });
+
+    it('can override events to collect if configured to do so', () => {
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}", "eventsToTrack": ["tcf2Enforcement"] }`
+      ]);
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(2);
+      const body1 = JSON.parse(server.requests[1].requestBody);
+      expect(body1.event).to.equal('tcf2Enforcement');
+    });
+
+    it('can extend cleanup rules from server side', () => {
+      auction.bidsReceived = [{
+        'bidderCode': 'appnexus',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '99e7838aa7f1c4f',
+        'requestId': '21e0b32208ee9a',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.020601,
+        'creativeId': 209272535,
+        'currency': 'USD',
+        'netRevenue': true,
+        'ttl': 300,
+        'adUnitCode': 'user-728',
+        'appnexus': {
+          'buyerMemberId': 11563
+        },
+        'meta': {
+          'advertiserId': 4388779
+        },
+        'ad': 'stuff i am not interested in',
+        'originalCpm': 0.020601,
+        'originalCurrency': 'USD',
+        'auctionId': 'c7694dbb-a583-4a73-a933-b16f1f821ba4'
+      }, {
+        'bidderCode': 'ix',
+        'width': 728,
+        'height': 90,
+        'statusMessage': 'Bid available',
+        'adId': '228f725de4a9ff09',
+        'requestId': '225a42b4a8ec7287',
+        'mediaType': 'banner',
+        'source': 'client',
+        'cpm': 0.06,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': '8838044',
+        'ad': 'lots of HTML code',
+        'ttl': 300,
+        'meta': {
+          'networkId': 85,
+          'brandId': 822,
+          'brandName': 'Microsoft Brands',
+          'advertiserDomains': [
+            'microsoftstore.com'
+          ]
+        },
+        'originalCpm': 0.06,
+        'originalCurrency': 'USD',
+        'auctionId': 'fe28ce44-61bb-4ed8-be3c-3e801dfddcb9',
+        'responseTimestamp': 1621954632648,
+        'requestTimestamp': 1621954632498,
+        'bidder': 'ix',
+        'adUnitCode': 'sticky_footer',
+        'timeToRespond': 150,
+        'pbLg': '0.00',
+        'pbCg': '0.06',
+        'size': '728x90',
+        'adserverTargeting': {
+          'hb_bidder': 'ix',
+        }
+      }];
+      server.respondWith('GET', CONFIG_URL, [200,
+        {
+          'Content-Type': 'application/json',
+          'Access-Control-Allow-Origin': '*'
+        },
+        `{ "sampling": 1, "ingestUrl": "${INGEST_URL}", "additionalCleanupRules": {"auctionEnd": [{"match":["bidsReceived", "*", "requestId"],"apply":"erase"}]} }`
+      ]);
+      id5AnalyticsAdapter.enableAnalytics(config);
+      server.respond();
+      events.emit(constants.EVENTS.AUCTION_END, auction);
+      server.respond();
+
+      expect(server.requests).to.have.length(3);
+      const body = JSON.parse(server.requests[2].requestBody);
+      expect(body.event).to.equal('auctionEnd');
+      expect(body.payload.bidsReceived[0].requestId).to.equal(undefined);
+      expect(body.payload.bidsReceived[1].requestId).to.equal(undefined);
+      expect(body.payload.bidsReceived[0].bidderCode).to.equal('appnexus');
+      expect(body.payload.bidsReceived[1].bidderCode).to.equal('ix');
+    });
+  });
+});
diff --git a/test/spec/modules/id5IdSystem_spec.js b/test/spec/modules/id5IdSystem_spec.js
index de5a2c5f5cd..7e5b64c5157 100644
--- a/test/spec/modules/id5IdSystem_spec.js
+++ b/test/spec/modules/id5IdSystem_spec.js
@@ -1,9 +1,21 @@
+import {
+  id5IdSubmodule,
+  ID5_STORAGE_NAME,
+  ID5_PRIVACY_STORAGE_NAME,
+  getFromLocalStorage,
+  storeInLocalStorage,
+  expDaysStr,
+  nbCacheName,
+  getNbFromCache,
+  storeNbInCache,
+  isInControlGroup
+} from 'modules/id5IdSystem.js';
 import { init, requestBidsHook, setSubmoduleRegistry, coreStorage } from 'modules/userId/index.js';
 import { config } from 'src/config.js';
-import { id5IdSubmodule } from 'modules/id5IdSystem.js';
 import { server } from 'test/mocks/xhr.js';
 import events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
+import * as utils from 'src/utils.js';
 
 let expect = require('chai').expect;
 
@@ -11,33 +23,31 @@ 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 ID5_PARTNER = 173;
-  const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_PARTNER}.json`;
-  const ID5_COOKIE_NAME = 'id5idcookie';
-  const ID5_NB_COOKIE_NAME = `pbjs-id5id-${ID5_PARTNER}-nb`;
-  const ID5_EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+  const ID5_TEST_PARTNER_ID = 173;
+  const ID5_ENDPOINT = `https://id5-sync.com/g/v2/${ID5_TEST_PARTNER_ID}.json`;
+  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;
   const ID5_STORED_OBJ = {
     'universal_uid': ID5_STORED_ID,
-    'signature': ID5_STORED_SIGNATURE
+    'signature': ID5_STORED_SIGNATURE,
+    'link_type': ID5_STORED_LINK_TYPE
   };
-  const ID5_LEGACY_STORED_OBJ = {
-    'ID5ID': ID5_STORED_ID
-  }
   const ID5_RESPONSE_ID = 'newid5id';
   const ID5_RESPONSE_SIGNATURE = 'abcdef';
+  const ID5_RESPONSE_LINK_TYPE = 2;
   const ID5_JSON_RESPONSE = {
     'universal_uid': ID5_RESPONSE_ID,
     'signature': ID5_RESPONSE_SIGNATURE,
-    'link_type': 0
+    'link_type': ID5_RESPONSE_LINK_TYPE
   };
 
-  function getId5FetchConfig(storageName = ID5_COOKIE_NAME, storageType = 'cookie') {
+  function getId5FetchConfig(storageName = ID5_STORAGE_NAME, storageType = 'html5') {
     return {
       name: ID5_MODULE_NAME,
       params: {
-        partner: ID5_PARTNER
+        partner: ID5_TEST_PARTNER_ID
       },
       storage: {
         name: storageName,
@@ -50,7 +60,9 @@ describe('ID5 ID System', function() {
     return {
       name: ID5_MODULE_NAME,
       value: {
-        id5id: value
+        id5id: {
+          uid: value
+        }
       }
     }
   }
@@ -63,10 +75,10 @@ describe('ID5 ID System', function() {
     }
   }
   function getFetchCookieConfig() {
-    return getUserSyncConfig([getId5FetchConfig()]);
+    return getUserSyncConfig([getId5FetchConfig(ID5_STORAGE_NAME, 'cookie')]);
   }
   function getFetchLocalStorageConfig() {
-    return getUserSyncConfig([getId5FetchConfig(ID5_COOKIE_NAME, 'html5')]);
+    return getUserSyncConfig([getId5FetchConfig(ID5_STORAGE_NAME, 'html5')]);
   }
   function getValueConfig(value) {
     return getUserSyncConfig([getId5ValueConfig(value)]);
@@ -80,6 +92,37 @@ describe('ID5 ID System', function() {
     };
   }
 
+  describe('Check for valid publisher config', function() {
+    it('should fail with invalid config', function() {
+      // no config
+      expect(id5IdSubmodule.getId()).to.be.eq(undefined);
+      expect(id5IdSubmodule.getId({ })).to.be.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);
+    });
+
+    it('should warn with non-recommended storage params', function() {
+      let logWarnStub = sinon.stub(utils, 'logWarn');
+
+      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 } });
+      expect(logWarnStub.calledOnce).to.be.true;
+      logWarnStub.restore();
+    });
+  });
+
   describe('Xhr Requests from getId()', function() {
     const responseHeader = { 'Content-Type': 'application/json' };
     let callbackSpy = sinon.spy();
@@ -91,121 +134,177 @@ describe('ID5 ID System', function() {
 
     });
 
-    it('should fail if no partner is provided in the config', function() {
-      expect(id5IdSubmodule.getId()).to.be.eq(undefined);
-    });
-
-    it('should call the ID5 server with 1puid field for legacy storedObj format', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_LEGACY_STORED_OBJ).callback;
+    it('should call the ID5 server and handle a valid response', function () {
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, undefined).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
       expect(request.url).to.contain(ID5_ENDPOINT);
       expect(request.withCredentials).to.be.true;
-      expect(requestBody.s).to.eq('');
-      expect(requestBody.partner).to.eq(ID5_PARTNER);
-      expect(requestBody['1puid']).to.eq(ID5_STORED_ID);
+      expect(requestBody.partner).to.eq(ID5_TEST_PARTNER_ID);
+      expect(requestBody.o).to.eq('pbjs');
+      expect(requestBody.pd).to.be.undefined;
+      expect(requestBody.s).to.be.undefined;
+      expect(requestBody.provider).to.be.undefined
+      expect(requestBody.v).to.eq('$prebid.version$');
+      expect(requestBody.gdpr).to.exist;
+      expect(requestBody.gdpr_consent).to.be.undefined;
+      expect(requestBody.us_privacy).to.be.undefined;
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
       expect(callbackSpy.calledOnce).to.be.true;
       expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with signature field for new storedObj format', function () {
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
+    it('should call the ID5 server with no signature field when no stored object', function () {
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, undefined).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.s).to.be.undefined;
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should call the ID5 server with signature field from stored object', function () {
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
       expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-      expect(requestBody.partner).to.eq(ID5_PARTNER);
-      expect(requestBody['1puid']).to.eq('');
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
     });
 
     it('should call the ID5 server with pd field when pd config is set', function () {
       const pubData = 'b50ca08271795a8e7e4012813f23d505193d75c0f2e2bb99baa63aa822f66ed3';
 
-      let config = getId5FetchConfig().params;
-      config.pd = pubData;
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = pubData;
 
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
       expect(requestBody.pd).to.eq(pubData);
-      expect(requestBody['1puid']).to.eq('');
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with empty pd field when pd config is not set', function () {
-      let config = getId5FetchConfig().params;
-      config.pd = undefined;
+    it('should call the ID5 server with no pd field when pd config is not set', function () {
+      let id5Config = getId5FetchConfig();
+      id5Config.params.pd = undefined;
 
-      let submoduleCallback = id5IdSubmodule.getId(config, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
-      expect(requestBody.pd).to.eq('');
+      expect(requestBody.pd).to.be.undefined;
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
     });
 
-    it('should call the ID5 server with nb=1 when no stored value exists', function () {
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+    it('should call the ID5 server with nb=1 when no stored value exists and reset after', function () {
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
       expect(requestBody.nbPage).to.eq(1);
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
     });
 
-    it('should call the ID5 server with incremented nb when stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+    it('should call the ID5 server with incremented nb when stored value exists and reset after', function () {
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
-      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig().params, undefined, ID5_STORED_OBJ).callback;
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
       submoduleCallback(callbackSpy);
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(request.withCredentials).to.be.true;
       expect(requestBody.nbPage).to.eq(2);
 
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
-      expect(callbackSpy.calledOnce).to.be.true;
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal(ID5_JSON_RESPONSE);
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
+    });
+
+    it('should call the ID5 server with ab feature = 1 when abTesting is turned on', function () {
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = { enabled: true, controlGroupPct: 10 }
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features.ab).to.eq(1);
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should call the ID5 server without ab feature when abTesting is turned off', function () {
+      let id5Config = getId5FetchConfig();
+      id5Config.params.abTesting = { enabled: false, controlGroupPct: 10 }
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features).to.be.undefined;
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should call the ID5 server without ab feature when when abTesting is not set', function () {
+      let id5Config = getId5FetchConfig();
+
+      let submoduleCallback = id5IdSubmodule.getId(id5Config, undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      let requestBody = JSON.parse(request.requestBody);
+      expect(requestBody.features).to.be.undefined;
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+    });
+
+    it('should store the privacy object from the ID5 server response', function () {
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+
+      let responseObject = utils.deepClone(ID5_JSON_RESPONSE);
+      responseObject.privacy = {
+        jurisdiction: 'gdpr',
+        id5_consent: true
+      };
+      request.respond(200, responseHeader, JSON.stringify(responseObject));
+      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.eq(JSON.stringify(responseObject.privacy));
+      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+    });
+
+    it('should not store a privacy object if not part of ID5 server response', function () {
+      coreStorage.removeDataFromLocalStorage(ID5_PRIVACY_STORAGE_NAME);
+      let submoduleCallback = id5IdSubmodule.getId(getId5FetchConfig(), undefined, ID5_STORED_OBJ).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+
+      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      expect(getFromLocalStorage(ID5_PRIVACY_STORAGE_NAME)).to.be.null;
     });
   });
 
@@ -214,34 +313,39 @@ describe('ID5 ID System', function() {
 
     beforeEach(function() {
       sinon.stub(events, 'getEvents').returns([]);
-      coreStorage.setCookie(ID5_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
+      coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
       adUnits = [getAdUnitMock()];
     });
     afterEach(function() {
       events.getEvents.restore();
-      coreStorage.setCookie(ID5_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, '', ID5_EXPIRED_COOKIE_DATE);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+      coreStorage.removeDataFromLocalStorage(ID5_STORAGE_NAME);
+      coreStorage.removeDataFromLocalStorage(`${ID5_STORAGE_NAME}_last`);
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
     });
 
-    it('should add stored ID from cookie to bids', function (done) {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
+    it('should add stored ID from cache to bids', function (done) {
+      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
 
       setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
-      config.setConfig(getFetchCookieConfig());
+      config.setConfig(getFetchLocalStorageConfig());
 
       requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id).to.equal(ID5_STORED_ID);
+            expect(bid.userId.id5id.uid).to.equal(ID5_STORED_ID);
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: ID5_SOURCE,
-              uids: [{ id: ID5_STORED_ID, atype: 1 }]
+              uids: [{
+                id: ID5_STORED_ID,
+                atype: 1,
+                ext: {
+                  linkType: ID5_STORED_LINK_TYPE
+                }
+              }]
             });
           });
         });
@@ -258,7 +362,7 @@ describe('ID5 ID System', function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property(`userId.${ID5_EIDS_NAME}`);
-            expect(bid.userId.id5id).to.equal(ID5_STORED_ID);
+            expect(bid.userId.id5id.uid).to.equal(ID5_STORED_ID);
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: ID5_SOURCE,
               uids: [{ id: ID5_STORED_ID, atype: 1 }]
@@ -269,44 +373,40 @@ describe('ID5 ID System', function() {
       }, { adUnits });
     });
 
-    it('should set nb=1 in cookie when no stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '', ID5_EXPIRED_COOKIE_DATE);
+    it('should set nb=1 in cache when no stored nb value exists and cached ID', function () {
+      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
+      coreStorage.removeDataFromLocalStorage(ID5_NB_STORAGE_NAME);
 
       setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
-      config.setConfig(getFetchCookieConfig());
+      config.setConfig(getFetchLocalStorageConfig());
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('1');
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(1);
     });
 
-    it('should increment nb in cookie when stored value exists', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+    it('should increment nb in cache when stored nb value exists and cached ID', function () {
+      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
       setSubmoduleRegistry([id5IdSubmodule]);
       init(config);
-      config.setConfig(getFetchCookieConfig());
+      config.setConfig(getFetchLocalStorageConfig());
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('2');
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
     });
 
-    // TODO : Check why it is failing
-    xit('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_STORED_OBJ), expStr);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, (new Date(Date.now() - 50000).toUTCString()), expStr);
-      coreStorage.setCookie(ID5_NB_COOKIE_NAME, '1', expStr);
+    it('should call ID5 servers with signature and incremented nb post auction if refresh needed', function () {
+      storeInLocalStorage(ID5_STORAGE_NAME, JSON.stringify(ID5_STORED_OBJ), 1);
+      storeInLocalStorage(`${ID5_STORAGE_NAME}_last`, expDaysStr(-1), 1);
+      storeNbInCache(ID5_TEST_PARTNER_ID, 1);
 
-      let id5Config = getFetchCookieConfig();
+      let id5Config = getFetchLocalStorageConfig();
       id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
 
       setSubmoduleRegistry([id5IdSubmodule]);
@@ -314,72 +414,220 @@ describe('ID5 ID System', function() {
       config.setConfig(id5Config);
 
       let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+      requestBidsHook((adUnitConfig) => { innerAdUnits = adUnitConfig.adUnits }, {adUnits});
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('2');
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(2);
 
       expect(server.requests).to.be.empty;
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      events.emit(CONSTANTS.EVENTS.REQUEST_BIDS, {});
 
       let request = server.requests[0];
       let requestBody = JSON.parse(request.requestBody);
       expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
-      expect(requestBody.nbPage).to.eq(2);
+      // TODO: Uncomment below to check what is not working
+      // expect(requestBody.s).to.eq(ID5_STORED_SIGNATURE);
+      // expect(requestBody.nbPage).to.eq(2);
 
       const responseHeader = { 'Content-Type': 'application/json' };
       request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
 
-      expect(coreStorage.getCookie(ID5_COOKIE_NAME)).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
+      expect(decodeURIComponent(getFromLocalStorage(ID5_STORAGE_NAME))).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
+      expect(getNbFromCache(ID5_TEST_PARTNER_ID)).to.be.eq(0);
     });
+  });
 
-    // TODO : Check why it is failing
-    xit('should call ID5 servers with 1puid and nb=1 post auction if refresh needed for legacy stored object', function () {
-      let expStr = (new Date(Date.now() + 25000).toUTCString());
-      coreStorage.setCookie(ID5_COOKIE_NAME, JSON.stringify(ID5_LEGACY_STORED_OBJ), expStr);
-      coreStorage.setCookie(`${ID5_COOKIE_NAME}_last`, (new Date(Date.now() - 50000).toUTCString()), expStr);
+  describe('Decode stored object', function() {
+    const expectedDecodedObject = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
 
-      let id5Config = getFetchCookieConfig();
-      id5Config.userSync.userIds[0].storage.refreshInSeconds = 2;
+    it('should properly decode from a stored object', function() {
+      expect(id5IdSubmodule.decode(ID5_STORED_OBJ, getId5FetchConfig())).to.deep.equal(expectedDecodedObject);
+    });
+    it('should return undefined if passed a string', function() {
+      expect(id5IdSubmodule.decode('somestring', getId5FetchConfig())).to.eq(undefined);
+    });
+  });
 
-      setSubmoduleRegistry([id5IdSubmodule]);
-      init(config);
-      config.setConfig(id5Config);
+  describe('A/B Testing', function() {
+    const expectedDecodedObjectWithIdAbOff = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE } } };
+    const expectedDecodedObjectWithIdAbOn = { id5id: { uid: ID5_STORED_ID, ext: { linkType: ID5_STORED_LINK_TYPE, abTestingControlGroup: false } } };
+    const expectedDecodedObjectWithoutIdAbOn = { id5id: { uid: '', ext: { linkType: 0, abTestingControlGroup: true } } };
+    let testConfig;
 
-      let innerAdUnits;
-      requestBidsHook((config) => { innerAdUnits = config.adUnits }, {adUnits});
+    beforeEach(function() {
+      testConfig = getId5FetchConfig();
+    });
+
+    describe('Configuration Validation', function() {
+      let logErrorSpy;
+      let logInfoSpy;
+
+      beforeEach(function() {
+        logErrorSpy = sinon.spy(utils, 'logError');
+        logInfoSpy = sinon.spy(utils, 'logInfo');
+      });
+      afterEach(function() {
+        logErrorSpy.restore();
+        logInfoSpy.restore();
+      });
+
+      // A/B Testing ON, but invalid config
+      let testInvalidAbTestingConfigsWithError = [
+        { enabled: true },
+        { enabled: true, controlGroupPct: 2 },
+        { enabled: true, controlGroupPct: -1 },
+        { enabled: true, controlGroupPct: 'a' },
+        { enabled: true, controlGroupPct: true }
+      ];
+      testInvalidAbTestingConfigsWithError.forEach((testAbTestingConfig) => {
+        it('should be undefined if ratio is invalid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.be.undefined;
+        });
+        it('should error if config is invalid, and always return an ID', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+          sinon.assert.calledOnce(logErrorSpy);
+        });
+      });
+
+      // A/B Testing OFF, with invalid config (ignore)
+      let testInvalidAbTestingConfigsWithoutError = [
+        { enabled: false, controlGroupPct: -1 },
+        { enabled: false, controlGroupPct: 2 },
+        { enabled: false, controlGroupPct: 'a' },
+        { enabled: false, controlGroupPct: true }
+      ];
+      testInvalidAbTestingConfigsWithoutError.forEach((testAbTestingConfig) => {
+        it('should be undefined if ratio is invalid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.be.undefined;
+        });
+        it('should not error if config is invalid but A/B testing is off, and always return an ID', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+          sinon.assert.notCalled(logErrorSpy);
+        });
+      });
+
+      // A/B Testing ON, with valid config
+      let testValidConfigs = [
+        { enabled: true, controlGroupPct: 0 },
+        { enabled: true, controlGroupPct: 0.5 },
+        { enabled: true, controlGroupPct: 1 }
+      ];
+      testValidConfigs.forEach((testAbTestingConfig) => {
+        it('should not be undefined if ratio is valid', () => {
+          expect(isInControlGroup('userId', testAbTestingConfig.controlGroupPct)).to.not.be.undefined;
+        });
+        it('should not error if config is valid', function () {
+          testConfig.params.abTesting = testAbTestingConfig;
+          id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          sinon.assert.notCalled(logErrorSpy);
+        });
+      });
+    });
 
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('1');
+    describe('A/B Testing Config is not Set', function() {
+      let randStub;
 
-      expect(server.requests).to.be.empty;
-      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      beforeEach(function() {
+        randStub = sinon.stub(Math, 'random').callsFake(function() {
+          return 0;
+        });
+      });
+      afterEach(function () {
+        randStub.restore();
+      });
+
+      it('should expose ID when A/B config is not set', function () {
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+      });
+
+      it('should expose ID when A/B config is empty', function () {
+        testConfig.params.abTesting = { };
+
+        let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+        expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+      });
+    });
 
-      let request = server.requests[0];
-      let requestBody = JSON.parse(request.requestBody);
-      expect(request.url).to.contain(ID5_ENDPOINT);
-      expect(requestBody['1puid']).to.eq(ID5_STORED_ID);
-      expect(requestBody.nbPage).to.eq(1);
+    describe('A/B Testing Config is Set', function() {
+      let randStub;
 
-      const responseHeader = { 'Content-Type': 'application/json' };
-      request.respond(200, responseHeader, JSON.stringify(ID5_JSON_RESPONSE));
+      beforeEach(function() {
+        randStub = sinon.stub(Math, 'random').callsFake(function() {
+          return 0.25;
+        });
+      });
+      afterEach(function () {
+        randStub.restore();
+      });
+
+      describe('IsInControlGroup', function () {
+        it('Nobody is in a 0% control group', function () {
+          expect(isInControlGroup('dsdndskhsdks', 0)).to.be.false;
+          expect(isInControlGroup('3erfghyuijkm', 0)).to.be.false;
+          expect(isInControlGroup('', 0)).to.be.false;
+          expect(isInControlGroup(undefined, 0)).to.be.false;
+        });
 
-      expect(coreStorage.getCookie(ID5_COOKIE_NAME)).to.be.eq(JSON.stringify(ID5_JSON_RESPONSE));
-      expect(coreStorage.getCookie(ID5_NB_COOKIE_NAME)).to.be.eq('0');
-    });
-  });
+        it('Everybody is in a 100% control group', function () {
+          expect(isInControlGroup('dsdndskhsdks', 1)).to.be.true;
+          expect(isInControlGroup('3erfghyuijkm', 1)).to.be.true;
+          expect(isInControlGroup('', 1)).to.be.true;
+          expect(isInControlGroup(undefined, 1)).to.be.true;
+        });
 
-  describe('Decode stored object', function() {
-    const decodedObject = { 'id5id': ID5_STORED_ID };
+        it('Being in the control group must be consistant', function () {
+          const inControlGroup = isInControlGroup('dsdndskhsdks', 0.5);
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+          expect(inControlGroup === isInControlGroup('dsdndskhsdks', 0.5)).to.be.true;
+        });
 
-    it('should properly decode from a stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_STORED_OBJ)).to.deep.equal(decodedObject);
-    });
-    it('should properly decode from a legacy stored object', function() {
-      expect(id5IdSubmodule.decode(ID5_LEGACY_STORED_OBJ)).to.deep.equal(decodedObject);
-    });
-    it('should return undefined if passed a string', function() {
-      expect(id5IdSubmodule.decode('somestring')).to.eq(undefined);
+        it('Control group ratio must be within a 10% error on a large sample', function () {
+          let nbInControlGroup = 0;
+          const sampleSize = 100;
+          for (let i = 0; i < sampleSize; i++) {
+            nbInControlGroup = nbInControlGroup + (isInControlGroup('R$*df' + i, 0.5) ? 1 : 0);
+          }
+          expect(nbInControlGroup).to.be.greaterThan(sampleSize / 2 - sampleSize / 10);
+          expect(nbInControlGroup).to.be.lessThan(sampleSize / 2 + sampleSize / 10);
+        });
+      });
+
+      describe('Decode', function() {
+        it('should expose ID when A/B testing is off', function () {
+          testConfig.params.abTesting = {
+            enabled: false,
+            controlGroupPct: 0.5
+          };
+
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOff);
+        });
+
+        it('should expose ID when no one is in control group', function () {
+          testConfig.params.abTesting = {
+            enabled: true,
+            controlGroupPct: 0
+          };
+
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithIdAbOn);
+        });
+
+        it('should not expose ID when everyone is in control group', function () {
+          testConfig.params.abTesting = {
+            enabled: true,
+            controlGroupPct: 1
+          };
+
+          let decoded = id5IdSubmodule.decode(ID5_STORED_OBJ, testConfig);
+          expect(decoded).to.deep.equal(expectedDecodedObjectWithoutIdAbOn);
+        });
+      });
     });
   });
 });
diff --git a/test/spec/modules/idImportLibrary_spec.js b/test/spec/modules/idImportLibrary_spec.js
new file mode 100644
index 00000000000..699c2c43a94
--- /dev/null
+++ b/test/spec/modules/idImportLibrary_spec.js
@@ -0,0 +1,61 @@
+import * as utils from 'src/utils.js';
+import * as idImportlibrary from 'modules/idImportLibrary.js';
+
+var expect = require('chai').expect;
+
+describe('currency', function () {
+  let fakeCurrencyFileServer;
+  let sandbox;
+  let clock;
+
+  let fn = sinon.spy();
+
+  beforeEach(function () {
+    fakeCurrencyFileServer = sinon.fakeServer.create();
+    sinon.stub(utils, 'logInfo');
+    sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    utils.logInfo.restore();
+    utils.logError.restore();
+    fakeCurrencyFileServer.restore();
+    idImportlibrary.setConfig({});
+  });
+
+  describe('setConfig', function () {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+      clock.restore();
+    });
+
+    it('results when no config available', function () {
+      idImportlibrary.setConfig({});
+      sinon.assert.called(utils.logError);
+    });
+    it('results with config available', function () {
+      idImportlibrary.setConfig({ 'url': 'URL' });
+      sinon.assert.called(utils.logInfo);
+    });
+    it('results with config default debounce ', function () {
+      let config = { 'url': 'URL' }
+      idImportlibrary.setConfig(config);
+      expect(config.debounce).to.be.equal(250);
+    });
+    it('results with config default fullscan ', function () {
+      let config = { 'url': 'URL' }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(false);
+    });
+    it('results with config fullscan ', function () {
+      let config = { 'url': 'URL', 'fullscan': true }
+      idImportlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(true);
+    });
+  });
+});
diff --git a/test/spec/modules/idLibrary_spec.js b/test/spec/modules/idLibrary_spec.js
new file mode 100644
index 00000000000..682c2df1e44
--- /dev/null
+++ b/test/spec/modules/idLibrary_spec.js
@@ -0,0 +1,61 @@
+import * as utils from 'src/utils.js';
+import * as idlibrary from 'modules/idLibrary.js';
+
+var expect = require('chai').expect;
+
+describe('currency', function () {
+  let fakeCurrencyFileServer;
+  let sandbox;
+  let clock;
+
+  let fn = sinon.spy();
+
+  beforeEach(function () {
+    fakeCurrencyFileServer = sinon.fakeServer.create();
+    sinon.stub(utils, 'logInfo');
+    sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    utils.logInfo.restore();
+    utils.logError.restore();
+    fakeCurrencyFileServer.restore();
+    idlibrary.setConfig({});
+  });
+
+  describe('setConfig', function () {
+    beforeEach(function() {
+      sandbox = sinon.sandbox.create();
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
+    });
+
+    afterEach(function () {
+      sandbox.restore();
+      clock.restore();
+    });
+
+    it('results when no config available', function () {
+      idlibrary.setConfig({});
+      sinon.assert.called(utils.logError);
+    });
+    it('results with config available', function () {
+      idlibrary.setConfig({ 'url': 'URL' });
+      sinon.assert.called(utils.logInfo);
+    });
+    it('results with config default debounce ', function () {
+      let config = { 'url': 'URL' }
+      idlibrary.setConfig(config);
+      expect(config.debounce).to.be.equal(250);
+    });
+    it('results with config default fullscan ', function () {
+      let config = { 'url': 'URL' }
+      idlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(false);
+    });
+    it('results with config fullscan ', function () {
+      let config = { 'url': 'URL', 'fullscan': true }
+      idlibrary.setConfig(config);
+      expect(config.fullscan).to.be.equal(true);
+    });
+  });
+});
diff --git a/test/spec/modules/identityLinkIdSystem_spec.js b/test/spec/modules/identityLinkIdSystem_spec.js
index 0d539d5988c..a31270c86c7 100644
--- a/test/spec/modules/identityLinkIdSystem_spec.js
+++ b/test/spec/modules/identityLinkIdSystem_spec.js
@@ -1,29 +1,36 @@
 import {identityLinkSubmodule} from 'modules/identityLinkIdSystem.js';
 import * as utils from 'src/utils.js';
 import {server} from 'test/mocks/xhr.js';
+import {getStorageManager} from '../../../src/storageManager.js';
+
+export const storage = getStorageManager();
 
 const pid = '14';
-const defaultConfigParams = {pid: pid};
+let defaultConfigParams;
 const responseHeader = {'Content-Type': 'application/json'}
 
 describe('IdentityLinkId tests', function () {
   let logErrorStub;
 
   beforeEach(function () {
+    defaultConfigParams = { params: {pid: pid} };
     logErrorStub = sinon.stub(utils, 'logError');
+    // remove _lr_retry_request cookie before test
+    storage.setCookie('_lr_retry_request', 'true', 'Thu, 01 Jan 1970 00:00:01 GMT');
   });
 
   afterEach(function () {
+    defaultConfigParams = {};
     logErrorStub.restore();
   });
 
   it('should log an error if no configParams were passed when getId', function () {
-    identityLinkSubmodule.getId();
+    identityLinkSubmodule.getId({ params: {} });
     expect(logErrorStub.calledOnce).to.be.true;
   });
 
   it('should log an error if pid configParam was not passed when getId', function () {
-    identityLinkSubmodule.getId({});
+    identityLinkSubmodule.getId({ params: {} });
     expect(logErrorStub.calledOnce).to.be.true;
   });
 
@@ -41,7 +48,22 @@ describe('IdentityLinkId tests', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the LiveRamp envelope endpoint with consent string', function () {
+  it('should NOT call the LiveRamp envelope endpoint if gdpr applies but consent string is empty string', function () {
+    let consentData = {
+      gdprApplies: true,
+      consentString: ''
+    };
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should NOT call the LiveRamp envelope endpoint if gdpr applies but consent string is missing', function () {
+    let consentData = { gdprApplies: true };
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams, consentData);
+    expect(submoduleCallback).to.be.undefined;
+  });
+
+  it('should call the LiveRamp envelope endpoint with IAB consent string v1', function () {
     let callBackSpy = sinon.spy();
     let consentData = {
       gdprApplies: true,
@@ -59,6 +81,27 @@ describe('IdentityLinkId tests', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
+  it('should call the LiveRamp envelope endpoint with IAB consent string v2', function () {
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      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=4&cv=CO4VThZO4VTiuADABBENAzCgAP_AAEOAAAAAAwwAgAEABhAAgAgAAA.YAAAAAAAAAA');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
   it('should not throw Uncaught TypeError when envelope endpoint returns empty response', function () {
     let callBackSpy = sinon.spy();
     let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
@@ -88,4 +131,38 @@ describe('IdentityLinkId tests', function () {
     );
     expect(callBackSpy.calledOnce).to.be.true;
   });
+
+  it('should not call the LiveRamp envelope endpoint if cookie _lr_retry_request exist', function () {
+    let now = new Date();
+    now.setTime(now.getTime() + 3000);
+    storage.setCookie('_lr_retry_request', 'true', now.toUTCString());
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request).to.be.eq(undefined);
+  });
+
+  it('should call the LiveRamp envelope endpoint if cookie _lr_retry_request does not exist and notUse3P config property was not set', function () {
+    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;
+  });
+
+  it('should not call the LiveRamp envelope endpoint if config property notUse3P is set to true', function () {
+    defaultConfigParams.params.notUse3P = true;
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = identityLinkSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request).to.be.eq(undefined);
+  });
 });
diff --git a/test/spec/modules/idxIdSystem_spec.js b/test/spec/modules/idxIdSystem_spec.js
new file mode 100644
index 00000000000..14cd9a88d13
--- /dev/null
+++ b/test/spec/modules/idxIdSystem_spec.js
@@ -0,0 +1,117 @@
+import { expect } from 'chai';
+import find from 'core-js-pure/features/array/find.js';
+import { config } from 'src/config.js';
+import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { storage, idxIdSubmodule } from 'modules/idxIdSystem.js';
+
+const IDX_COOKIE_NAME = '_idx';
+const IDX_DUMMY_VALUE = 'idx value for testing';
+const IDX_COOKIE_STORED = '{ "idx": "' + IDX_DUMMY_VALUE + '" }';
+const ID_COOKIE_OBJECT = { id: IDX_DUMMY_VALUE };
+const IDX_COOKIE_OBJECT = { idx: IDX_DUMMY_VALUE };
+
+function getConfigMock() {
+  return {
+    userSync: {
+      syncDelay: 0,
+      userIds: [{
+        name: 'idx'
+      }]
+    }
+  }
+}
+
+function getAdUnitMock(code = 'adUnit-code') {
+  return {
+    code,
+    mediaTypes: {banner: {}, native: {}},
+    sizes: [
+      [300, 200],
+      [300, 600]
+    ],
+    bids: [{
+      bidder: 'sampleBidder',
+      params: { placementId: 'banner-only-bidder' }
+    }]
+  };
+}
+
+describe('IDx ID 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('IDx: test "getId" method', () => {
+    it('provides the stored IDx if a cookie exists', () => {
+      getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.deep.equal(ID_COOKIE_OBJECT);
+    });
+
+    it('provides the stored IDx if cookie is absent but present in local storage', () => {
+      getDataFromLocalStorageStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.deep.equal(ID_COOKIE_OBJECT);
+    });
+
+    it('returns undefined if both cookie and local storage are empty', () => {
+      let idx = idxIdSubmodule.getId();
+      expect(idx).to.be.undefined;
+    })
+  });
+
+  describe('IDx: test "decode" method', () => {
+    it('provides the IDx from a stored object', () => {
+      expect(idxIdSubmodule.decode(ID_COOKIE_OBJECT)).to.deep.equal(IDX_COOKIE_OBJECT);
+    });
+
+    it('provides the IDx from a stored string', () => {
+      expect(idxIdSubmodule.decode(IDX_DUMMY_VALUE)).to.deep.equal(IDX_COOKIE_OBJECT);
+    });
+  });
+
+  describe('requestBids hook', () => {
+    let adUnits;
+
+    beforeEach(() => {
+      adUnits = [getAdUnitMock()];
+      setSubmoduleRegistry([idxIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock());
+      getCookieStub.withArgs(IDX_COOKIE_NAME).returns(IDX_COOKIE_STORED);
+    });
+
+    it('when a stored IDx exists it is added to bids', (done) => {
+      requestBidsHook(() => {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.idx');
+            expect(bid.userId.idx).to.equal(IDX_DUMMY_VALUE);
+            const idxIdAsEid = find(bid.userIdAsEids, e => e.source == 'idx.lat');
+            expect(idxIdAsEid).to.deep.equal({
+              source: 'idx.lat',
+              uids: [{
+                id: IDX_DUMMY_VALUE,
+                atype: 1,
+              }]
+            });
+          });
+        });
+        done();
+      }, { adUnits });
+    });
+  });
+});
diff --git a/test/spec/modules/impactifyBidAdapter_spec.js b/test/spec/modules/impactifyBidAdapter_spec.js
new file mode 100644
index 00000000000..d14cea8cad3
--- /dev/null
+++ b/test/spec/modules/impactifyBidAdapter_spec.js
@@ -0,0 +1,398 @@
+import { expect } from 'chai';
+import { spec } from 'modules/impactifyBidAdapter.js';
+import * as utils from 'src/utils.js';
+
+const BIDDER_CODE = 'impactify';
+const BIDDER_ALIAS = ['imp'];
+const DEFAULT_CURRENCY = 'USD';
+const DEFAULT_VIDEO_WIDTH = 640;
+const DEFAULT_VIDEO_HEIGHT = 480;
+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;
+
+var gdprData = {
+  'consentString': 'BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA',
+  'gdprApplies': true
+};
+
+describe('ImpactifyAdapter', function () {
+  describe('isBidRequestValid', function () {
+    let validBid = {
+      bidder: 'impactify',
+      params: {
+        appId: '1',
+        format: 'screen',
+        style: 'inline'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, validBid);
+      delete bid.params;
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when appId is missing', () => {
+      const bid = utils.deepClone(validBid);
+      delete bid.params.appId;
+
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when appId is not a string', () => {
+      const bid = utils.deepClone(validBid);
+
+      bid.params.appId = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.appId = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when format is missing', () => {
+      const bid = utils.deepClone(validBid);
+      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);
+
+      bid.params.format = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.format = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return false when format is not equals to screen or display', () => {
+      const bid = utils.deepClone(validBid);
+      if (bid.params.format != 'screen' && bid.params.format != 'display') {
+        expect(spec.isBidRequestValid(bid)).to.equal(false);
+      }
+    });
+
+    it('should return false when style is missing', () => {
+      const bid = utils.deepClone(validBid);
+      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);
+
+      bid.params.style = 123;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = false;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = void (0);
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+      bid.params.style = {};
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+  describe('buildRequests', function () {
+    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'
+      }
+    ];
+    let videoBidderRequest = {
+      bidderRequestId: '98845765110',
+      auctionId: '165410516454',
+      bidderCode: 'impactify',
+      bids: [
+        {
+          ...videoBidRequests[0]
+        }
+      ],
+      refererInfo: {
+        referer: 'https://impactify.io'
+      }
+    };
+
+    it('sends video bid request to ENDPOINT via POST', function () {
+      const request = spec.buildRequests(videoBidRequests, videoBidderRequest);
+      expect(request.url).to.equal(ORIGIN + AUCTIONURI);
+      expect(request.method).to.equal('POST');
+    });
+  });
+  describe('interpretResponse', function () {
+    it('should get correct bid response', function () {
+      let response = {
+        id: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: '65820304700829014',
+                impid: '462c08f20d428',
+                price: 3.40,
+                adm: '',
+                adid: '97517771',
+                adomain: [
+                  ''
+                ],
+                iurl: 'https://fra1-ib.adnxs.com/cr?id=97517771',
+                cid: '9325',
+                crid: '97517771',
+                w: 1,
+                h: 1,
+                ext: {
+                  prebid: {
+                    'type': 'video'
+                  },
+                  bidder: {
+                    prebid: {
+                      type: 'video',
+                      video: {
+                        duration: 30,
+                        primary_category: ''
+                      }
+                    },
+                    bidder: {
+                      appnexus: {
+                        brand_id: 182979,
+                        auction_id: 8657683934873599656,
+                        bidder_id: 2,
+                        bid_ad_type: 1,
+                        creative_info: {
+                          video: {
+                            duration: 30,
+                            mimes: [
+                              'video/x-flv',
+                              'video/mp4',
+                              'video/webm'
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            seat: 'impactify'
+          }
+        ],
+        cur: DEFAULT_CURRENCY,
+        ext: {
+          responsetimemillis: {
+            impactify: 114
+          },
+          prebid: {
+            auctiontimestamp: 1614587024591
+          }
+        }
+      };
+      let bidderRequest = {
+        bids: [
+          {
+            bidId: '462c08f20d428',
+            adUnitCode: '/19968336/header-bid-tag-1',
+            auctionId: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+            bidder: 'impactify',
+            sizes: [[DEFAULT_VIDEO_WIDTH, DEFAULT_VIDEO_HEIGHT]],
+            mediaTypes: {
+              video: {
+                context: 'outstream'
+              }
+            }
+          },
+        ]
+      }
+      let expectedResponse = [
+        {
+          id: '65820304700829014',
+          requestId: '462c08f20d428',
+          cpm: 3.40,
+          currency: DEFAULT_CURRENCY,
+          netRevenue: true,
+          ad: '',
+          width: 1,
+          height: 1,
+          hash: 'test',
+          expiry: 166192938,
+          ttl: 300,
+          creativeId: '97517771'
+        }
+      ];
+      let result = spec.interpretResponse({ body: response }, bidderRequest);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+  });
+  describe('getUserSyncs', function () {
+    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'
+      }
+    ];
+    let videoBidderRequest = {
+      bidderRequestId: '98845765110',
+      auctionId: '165410516454',
+      bidderCode: 'impactify',
+      bids: [
+        {
+          ...videoBidRequests[0]
+        }
+      ],
+      refererInfo: {
+        referer: 'https://impactify.io'
+      }
+    };
+    let validResponse = {
+      id: '19ab94a9-b0d7-4ed7-9f80-ad0c033cf1b1',
+      seatbid: [
+        {
+          bid: [
+            {
+              id: '65820304700829014',
+              impid: '462c08f20d428',
+              price: 3.40,
+              adm: '',
+              adid: '97517771',
+              adomain: [
+                ''
+              ],
+              iurl: 'https://fra1-ib.adnxs.com/cr?id=97517771',
+              cid: '9325',
+              crid: '97517771',
+              w: 1,
+              h: 1,
+              ext: {
+                prebid: {
+                  'type': 'video'
+                },
+                bidder: {
+                  prebid: {
+                    type: 'video',
+                    video: {
+                      duration: 30,
+                      primary_category: ''
+                    }
+                  },
+                  bidder: {
+                    appnexus: {
+                      brand_id: 182979,
+                      auction_id: 8657683934873599656,
+                      bidder_id: 2,
+                      bid_ad_type: 1,
+                      creative_info: {
+                        video: {
+                          duration: 30,
+                          mimes: [
+                            'video/x-flv',
+                            'video/mp4',
+                            'video/webm'
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          seat: 'impactify'
+        }
+      ],
+      cur: DEFAULT_CURRENCY,
+      ext: {
+        responsetimemillis: {
+          impactify: 114
+        },
+        prebid: {
+          auctiontimestamp: 1614587024591
+        }
+      }
+    };
+    it('should return empty response if server response is false', function () {
+      const result = spec.getUserSyncs('bad', false, gdprData);
+      expect(result).to.be.empty;
+    });
+    it('should return empty response if server response is empty', 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);
+      expect(result[0].url).to.include('gdpr=1');
+      expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
+    });
+  });
+
+  describe('On winning bid', function () {
+    const bid = {
+      ad: '',
+      cpm: '2'
+    };
+    const result = spec.onBidWon(bid);
+    assert.ok(result);
+  });
+
+  describe('On bid Time out', function () {
+    const bid = {
+      ad: '',
+      cpm: '2'
+    };
+    const result = spec.onTimeout(bid);
+    assert.ok(result);
+  });
+})
diff --git a/test/spec/modules/improvedigitalBidAdapter_spec.js b/test/spec/modules/improvedigitalBidAdapter_spec.js
index 5a20944a6ed..095e50f0c66 100644
--- a/test/spec/modules/improvedigitalBidAdapter_spec.js
+++ b/test/spec/modules/improvedigitalBidAdapter_spec.js
@@ -28,6 +28,12 @@ describe('Improve Digital Adapter Tests', function () {
     sizes: [[300, 250], [160, 600], ['blah', 150], [-1, 300], [300, -5]]
   };
 
+  const videoParams = {
+    skip: 1,
+    skipmin: 5,
+    skipafter: 30
+  }
+
   const instreamBidRequest = utils.deepClone(simpleBidRequest);
   instreamBidRequest.mediaTypes = {
     video: {
@@ -154,6 +160,8 @@ describe('Improve Digital Adapter Tests', function () {
       expect(params.bid_request.version).to.equal(`${spec.version}-${idClient.CONSTANTS.CLIENT_VERSION}`);
       expect(params.bid_request.gdpr).to.not.exist;
       expect(params.bid_request.us_privacy).to.not.exist;
+      expect(params.bid_request.schain).to.not.exist;
+      expect(params.bid_request.user).to.not.exist;
       expect(params.bid_request.imp).to.deep.equal([
         {
           id: '33e9500b21129f',
@@ -255,6 +263,14 @@ describe('Improve Digital Adapter Tests', function () {
       params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].bidfloor).to.equal(0.05);
       expect(params.bid_request.imp[0].bidfloorcur).to.equal('EUR');
+
+      // getFloor defined -> use it over bidFloor
+      let getFloorResponse = { currency: 'USD', floor: 3 };
+      bidRequest.getFloor = () => getFloorResponse;
+      request = spec.buildRequests([bidRequest])[0];
+      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].bidfloor).to.equal(3);
+      expect(params.bid_request.imp[0].bidfloorcur).to.equal('USD');
     });
 
     it('should add GDPR consent string', function () {
@@ -278,14 +294,23 @@ describe('Improve Digital Adapter Tests', function () {
       expect(params.bid_request.referrer).to.equal('https://blah.com/test.html');
     });
 
+    it('should not add video params for banner', function () {
+      const bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
     it('should add ad type for instream video', function () {
-      let bidRequest = Object.assign({}, simpleBidRequest);
+      let bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
       bidRequest.mediaType = 'video';
       let request = spec.buildRequests([bidRequest], bidderRequest)[0];
       let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+      expect(params.bid_request.imp[0].video).to.not.exist;
 
-      bidRequest = Object.assign({}, simpleBidRequest);
+      bidRequest = JSON.parse(JSON.stringify(simpleBidRequest));
       bidRequest.mediaTypes = {
         video: {
           context: 'instream',
@@ -295,18 +320,89 @@ describe('Improve Digital Adapter Tests', function () {
       request = spec.buildRequests([bidRequest], bidderRequest)[0];
       params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.deep.equal(['video']);
+      expect(params.bid_request.imp[0].video).to.not.exist;
     });
 
     it('should not set ad type for outstream video', function() {
       const request = spec.buildRequests([outstreamBidRequest])[0];
       const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.not.exist;
+      expect(params.bid_request.imp[0].video).to.not.exist;
     });
 
     it('should not set ad type for multi-format bids', function() {
       const request = spec.buildRequests([multiFormatBidRequest], bidderRequest)[0];
       const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
       expect(params.bid_request.imp[0].ad_types).to.not.exist;
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
+    it('should set video params for instream', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
+    });
+
+    it('should set skip params only if skip=1', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      // 1
+      const videoTest = {
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30
+      }
+      bidRequest.params.video = videoTest;
+      let request = spec.buildRequests([bidRequest])[0];
+      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoTest);
+
+      // 0 - leave out skipmin and skipafter
+      videoTest.skip = 0;
+      bidRequest.params.video = videoTest;
+      request = spec.buildRequests([bidRequest])[0];
+      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal({ skip: 0 });
+
+      // other
+      videoTest.skip = 'blah';
+      bidRequest.params.video = videoTest;
+      request = spec.buildRequests([bidRequest])[0];
+      params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.not.exist;
+    });
+
+    it('should ignore invalid/unexpected video params', function() {
+      const bidRequest = JSON.parse(JSON.stringify(instreamBidRequest));
+      // 1
+      const videoTest = {
+        skip: 1,
+        skipmin: 5,
+        skipafter: 30
+      }
+      const videoTestInvParam = Object.assign({}, videoTest);
+      videoTestInvParam.blah = 1;
+      bidRequest.params.video = videoTestInvParam;
+      let request = spec.buildRequests([bidRequest])[0];
+      let params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoTest);
+    });
+
+    it('should set video params for outstream', function() {
+      const bidRequest = JSON.parse(JSON.stringify(outstreamBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
+    });
+
+    it('should set video params for multi-format', function() {
+      const bidRequest = JSON.parse(JSON.stringify(multiFormatBidRequest));
+      bidRequest.params.video = videoParams;
+      const request = spec.buildRequests([bidRequest])[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.imp[0].video).to.deep.equal(videoParams);
     });
 
     it('should not set Prebid sizes in bid request for instream video', function () {
@@ -345,6 +441,22 @@ describe('Improve Digital Adapter Tests', function () {
       expect(params.bid_request.schain).to.equal(schain);
     });
 
+    it('should add eids', function () {
+      const userId = { id5id:	{ uid: '1111' } };
+      const expectedUserObject = { ext: { eids: [{
+        source: 'id5-sync.com',
+        uids: [{
+          atype: 1,
+          id: '1111'
+        }]
+      }]}};
+      const bidRequest = Object.assign({}, simpleBidRequest);
+      bidRequest.userId = userId;
+      const request = spec.buildRequests([bidRequest], bidderRequestReferrer)[0];
+      const params = JSON.parse(decodeURIComponent(request.data.substring(PARAM_PREFIX.length)));
+      expect(params.bid_request.user).to.deep.equal(expectedUserObject);
+    });
+
     it('should return 2 requests', function () {
       const requests = spec.buildRequests([
         simpleBidRequest,
@@ -646,7 +758,6 @@ describe('Improve Digital Adapter Tests', function () {
     const expectedBid = [
       {
         'ad': '',
-        'adId': '33e9500b21129f',
         'creativeId': '422031',
         'cpm': 1.45888594164456,
         'currency': 'USD',
@@ -663,7 +774,6 @@ describe('Improve Digital Adapter Tests', function () {
       expectedBid[0],
       {
         'ad': '',
-        'adId': '1234',
         'creativeId': '422033',
         'cpm': 1.23,
         'currency': 'USD',
@@ -679,7 +789,6 @@ describe('Improve Digital Adapter Tests', function () {
     const expectedBidNative = [
       {
         mediaType: 'native',
-        adId: '33e9500b21129f',
         creativeId: '422031',
         cpm: 1.45888594164456,
         currency: 'USD',
@@ -728,7 +837,6 @@ describe('Improve Digital Adapter Tests', function () {
     const expectedBidInstreamVideo = [
       {
         'vastXml': '',
-        'adId': '33e9500b21129f',
         'creativeId': '422031',
         'cpm': 1.45888594164456,
         'currency': 'USD',
@@ -853,6 +961,14 @@ describe('Improve Digital Adapter Tests', function () {
       expect(bids[0].netRevenue).to.equal(true);
     });
 
+    it('should set advertiserDomains', function () {
+      const adomain = ['domain.com'];
+      const response = JSON.parse(JSON.stringify(serverResponse));
+      response.body.bid[0].adomain = adomain;
+      const bids = spec.interpretResponse(response, {bidderRequest});
+      expect(bids[0].meta.advertiserDomains).to.equal(adomain);
+    });
+
     // Native ads
     it('should return a well-formed native ad bid', function () {
       let bids = spec.interpretResponse(serverResponseNative, {bidderRequest});
diff --git a/test/spec/modules/inmarBidAdapter_spec.js b/test/spec/modules/inmarBidAdapter_spec.js
new file mode 100644
index 00000000000..998fe20d369
--- /dev/null
+++ b/test/spec/modules/inmarBidAdapter_spec.js
@@ -0,0 +1,240 @@
+// import or require modules necessary for the test, e.g.:
+import {expect} from 'chai'; // may prefer 'assert' in place of 'expect'
+import {
+  spec
+} from 'modules/inmarBidAdapter.js';
+import {config} from 'src/config.js';
+
+describe('Inmar adapter tests', function () {
+  var DEFAULT_PARAMS_NEW_SIZES = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      banner: {
+        sizes: [
+          [300, 250], [300, 600], [728, 90], [970, 250]]
+      }
+    },
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }];
+
+  var DEFAULT_PARAMS_VIDEO = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      video: {
+        context: 'instream', // or 'outstream'
+        playerSize: [640, 480],
+        mimes: ['video/mp4']
+      }
+    },
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }];
+
+  var DEFAULT_PARAMS_WO_OPTIONAL = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    sizes: [
+      [300, 250],
+      [300, 600],
+      [728, 90],
+      [970, 250]
+    ],
+    bidder: 'inmar',
+    params: {
+      partnerId: 12345,
+    },
+    auctionId: '851adee7-d843-48f9-a7e9-9ff00573fcbf',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6'
+  }];
+
+  var BID_RESPONSE = {
+    body: {
+      cpm: 1.50,
+      ad: '',
+      meta: {
+        mediaType: 'banner',
+      },
+      width: 300,
+      height: 250,
+      creativeId: '189198063',
+      netRevenue: true,
+      currency: 'USD',
+      ttl: 300,
+      dealId: 'dealId'
+
+    }
+  };
+
+  var BID_RESPONSE_VIDEO = {
+    body: {
+      cpm: 1.50,
+      meta: {
+        mediaType: 'video',
+      },
+      width: 1,
+      height: 1,
+      creativeId: '189198063',
+      netRevenue: true,
+      currency: 'USD',
+      ttl: 300,
+      vastUrl: 'https://vast.com/vast.xml',
+      dealId: 'dealId'
+    }
+  };
+
+  it('Verify build request to prebid 3.0 display test', function() {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.data);
+    expect(requestContent.bidRequests[0].params).to.have.property('partnerId').and.to.equal(12345);
+    expect(requestContent.bidRequests[0]).to.have.property('auctionId').and.to.equal('0cb3144c-d084-4686-b0d6-f5dbe917c563');
+    expect(requestContent.bidRequests[0]).to.have.property('bidId').and.to.equal('2c7c8e9c900244');
+    expect(requestContent.bidRequests[0]).to.have.property('bidRequestsCount').and.to.equal(1);
+    expect(requestContent.bidRequests[0]).to.have.property('bidder').and.to.equal('inmar');
+    expect(requestContent.bidRequests[0]).to.have.property('bidderRequestId').and.to.equal('1858b7382993ca');
+    expect(requestContent.bidRequests[0]).to.have.property('adUnitCode').and.to.equal('test-div');
+    expect(requestContent.refererInfo).to.have.property('referer').and.to.equal('https://domain.com');
+    expect(requestContent.bidRequests[0].mediaTypes.banner).to.have.property('sizes');
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[0]).to.have.ordered.members([300, 250]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[1]).to.have.ordered.members([300, 600]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[2]).to.have.ordered.members([728, 90]);
+    expect(requestContent.bidRequests[0].mediaTypes.banner.sizes[3]).to.have.ordered.members([970, 250]);
+    expect(requestContent.bidRequests[0]).to.have.property('transactionId').and.to.equal('29df2112-348b-4961-8863-1b33684d95e6');
+    expect(requestContent.refererInfo).to.have.property('numIframes').and.to.equal(0);
+  })
+
+  it('Verify interprete response', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE, request);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.ad).to.equal('');
+    expect(bid.meta.mediaType).to.equal('banner');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.ttl).to.equal(300);
+    expect(bid.dealId).to.equal('dealId');
+  });
+
+  it('no banner media response', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_NEW_SIZES, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request);
+    const bid = bids[0];
+    expect(bid.vastUrl).to.equal('https://vast.com/vast.xml');
+  });
+
+  it('Verifies bidder_code', function () {
+    expect(spec.code).to.equal('inmar');
+  });
+
+  it('Verifies bidder aliases', function () {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.equal('inm');
+  });
+
+  it('Verifies if bid request is valid', function () {
+    expect(spec.isBidRequestValid(DEFAULT_PARAMS_NEW_SIZES[0])).to.equal(true);
+    expect(spec.isBidRequestValid(DEFAULT_PARAMS_WO_OPTIONAL[0])).to.equal(true);
+    expect(spec.isBidRequestValid({})).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {}
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        partnerId: 12345
+      }
+    })).to.equal(true);
+  });
+
+  it('Verifies user syncs image', function () {
+    var syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE], {
+      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE], {
+      consentString: '',
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [], {
+      consentString: null,
+      referer: 'http://domain.com',
+      gdprApplies: true
+    })
+    expect(syncs).to.have.lengthOf(1);
+    expect(syncs[0].type).to.equal('image');
+  });
+});
diff --git a/test/spec/modules/inskinBidAdapter_spec.js b/test/spec/modules/inskinBidAdapter_spec.js
index e817b3e3b81..151cbce7692 100644
--- a/test/spec/modules/inskinBidAdapter_spec.js
+++ b/test/spec/modules/inskinBidAdapter_spec.js
@@ -250,7 +250,7 @@ describe('InSkin BidAdapter', function () {
       const payload = JSON.parse(request.data);
 
       expect(payload.keywords).to.be.an('array').that.is.empty;
-      expect(payload.placements[0].properties).to.be.undefined;
+      expect(payload.placements[0].properties.restrictions).to.be.undefined;
     });
 
     it('should add keywords if TCF v2 purposes are not granted', function () {
@@ -328,6 +328,7 @@ describe('InSkin BidAdapter', function () {
         expect(b).to.have.property('currency', 'USD');
         expect(b).to.have.property('creativeId');
         expect(b).to.have.property('ttl', 360);
+        expect(b.meta).to.have.property('advertiserDomains');
         expect(b).to.have.property('netRevenue', true);
       });
     });
diff --git a/test/spec/modules/instreamTracking_spec.js b/test/spec/modules/instreamTracking_spec.js
new file mode 100644
index 00000000000..8d795fec88b
--- /dev/null
+++ b/test/spec/modules/instreamTracking_spec.js
@@ -0,0 +1,221 @@
+import { assert } from 'chai';
+import { trackInstreamDeliveredImpressions } from 'modules/instreamTracking.js';
+import { config } from 'src/config.js';
+import events from 'src/events.js';
+import * as utils from 'src/utils.js';
+import * as sinon from 'sinon';
+import { INSTREAM, OUTSTREAM } from 'src/video.js';
+
+const BIDDER_CODE = 'sampleBidder';
+const VIDEO_CACHE_KEY = '4cf395af-8fee-4960-af0e-88d44e399f14';
+
+let sandbox;
+
+function enableInstreamTracking(regex) {
+  let configStub = sandbox.stub(config, 'getConfig');
+  configStub.withArgs('instreamTracking').returns(Object.assign(
+    {
+      enabled: true,
+      maxWindow: 10,
+      pollingFreq: 0
+    },
+    regex && {urlPattern: regex},
+  ));
+}
+
+function mockPerformanceApi({adServerCallSent, videoPresent}) {
+  let performanceStub = sandbox.stub(window.performance, 'getEntriesByType');
+  let entries = [{
+    name: 'https://domain.com/img.png',
+    initiatorType: 'img'
+  }, {
+    name: 'https://domain.com/script.js',
+    initiatorType: 'script'
+  }, {
+    name: 'https://domain.com/xhr',
+    initiatorType: 'xmlhttprequest'
+  }, {
+    name: 'https://domain.com/fetch',
+    initiatorType: 'fetch'
+  }];
+
+  if (adServerCallSent || videoPresent) {
+    entries.push({
+      name: 'https://adserver.com/ads?custom_params=hb_uuid%3D' + VIDEO_CACHE_KEY + '%26pos%3D' + VIDEO_CACHE_KEY,
+      initiatorType: 'xmlhttprequest'
+    });
+  }
+
+  if (videoPresent) {
+    entries.push({
+      name: 'https://prebid-vast-cache.com/cache?key=' + VIDEO_CACHE_KEY,
+      initiatorType: 'xmlhttprequest'
+    });
+  }
+
+  performanceStub.withArgs('resource').returns(entries);
+}
+
+function mockBidResponse(adUnit, requestId) {
+  const bid = {
+    'adUnitCod': adUnit.code,
+    'bidderCode': adUnit.bids[0].bidder,
+    'width': adUnit.sizes[0][0],
+    'height': adUnit.sizes[0][1],
+    'statusMessage': 'Bid available',
+    'adId': 'id',
+    'requestId': requestId,
+    'source': 'client',
+    'no_bid': false,
+    'cpm': '1.1495',
+    'ttl': 180,
+    'creativeId': 'id',
+    'netRevenue': true,
+    'currency': 'USD',
+  }
+  if (adUnit.mediaTypes.video) {
+    bid.videoCacheKey = VIDEO_CACHE_KEY;
+  }
+  return bid
+}
+
+function mockBidRequest(adUnit, bidResponse) {
+  return {
+    'bidderCode': bidResponse.bidderCode,
+    'auctionId': '20882439e3238c',
+    'bidderRequestId': 'bidderRequestId',
+    'bids': [
+      {
+        'adUnitCode': adUnit.code,
+        'mediaTypes': adUnit.mediaTypes,
+        'bidder': bidResponse.bidderCode,
+        'bidId': bidResponse.requestId,
+        'sizes': adUnit.sizes,
+        'params': adUnit.bids[0].params,
+        'bidderRequestId': 'bidderRequestId',
+        'auctionId': '20882439e3238c',
+      }
+    ],
+    'auctionStart': 1505250713622,
+    'timeout': 3000
+  };
+}
+
+function getMockInput(mediaType) {
+  const bannerAdUnit = {
+    code: 'banner',
+    mediaTypes: {banner: {sizes: [[300, 250]]}},
+    sizes: [[300, 250]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+  const outStreamAdUnit = {
+    code: 'video-' + OUTSTREAM,
+    mediaTypes: {video: {playerSize: [640, 480], context: OUTSTREAM}},
+    sizes: [[640, 480]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+  const inStreamAdUnit = {
+    code: 'video-' + INSTREAM,
+    mediaTypes: {video: {playerSize: [640, 480], context: INSTREAM}},
+    sizes: [[640, 480]],
+    bids: [{bidder: BIDDER_CODE, params: {placementId: 'id'}}]
+  };
+
+  let adUnit;
+  switch (mediaType) {
+    default:
+    case 'banner':
+      adUnit = bannerAdUnit;
+      break;
+    case OUTSTREAM:
+      adUnit = outStreamAdUnit;
+      break;
+    case INSTREAM:
+      adUnit = inStreamAdUnit;
+      break;
+  }
+
+  const bidResponse = mockBidResponse(adUnit, utils.getUniqueIdentifierStr());
+  const bidderRequest = mockBidRequest(adUnit, bidResponse);
+  return {
+    adUnits: [adUnit],
+    bidsReceived: [bidResponse],
+    bidderRequests: [bidderRequest],
+  };
+}
+
+describe('Instream Tracking', function () {
+  beforeEach(function () {
+    sandbox = sinon.sandbox.create();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
+
+  describe('gaurd checks', function () {
+    it('skip if tracking not enable', function () {
+      sandbox.stub(config, 'getConfig').withArgs('instreamTracking').returns(undefined);
+      assert.isNotOk(trackInstreamDeliveredImpressions({
+        adUnits: [],
+        bidsReceived: [],
+        bidderRequests: []
+      }), 'should not start tracking when tracking is disabled');
+    });
+
+    it('run only if instream bids are present', function () {
+      enableInstreamTracking();
+      assert.isNotOk(trackInstreamDeliveredImpressions({adUnits: [], bidsReceived: [], bidderRequests: []}));
+    });
+
+    it('checks for instream bids', function (done) {
+      enableInstreamTracking();
+      assert.isNotOk(trackInstreamDeliveredImpressions(getMockInput('banner')), 'should not start tracking when banner bids are present')
+      assert.isNotOk(trackInstreamDeliveredImpressions(getMockInput(OUTSTREAM)), 'should not start tracking when outstream bids are present')
+      mockPerformanceApi({});
+      assert.isOk(trackInstreamDeliveredImpressions(getMockInput(INSTREAM)), 'should start tracking when instream bids are present')
+      setTimeout(done, 10);
+    });
+  });
+
+  describe('instream bids check', function () {
+    let spyEventsOn;
+
+    beforeEach(function () {
+      spyEventsOn = sandbox.spy(events, 'emit');
+    });
+
+    it('BID WON event is not emitted when no video cache key entries are present', function (done) {
+      enableInstreamTracking();
+      trackInstreamDeliveredImpressions(getMockInput(INSTREAM));
+      mockPerformanceApi({});
+      setTimeout(function () {
+        assert.isNotOk(spyEventsOn.calledWith('bidWon'))
+        done()
+      }, 10);
+    });
+
+    it('BID WON event is not emitted when ad server call is sent', function (done) {
+      enableInstreamTracking();
+      mockPerformanceApi({adServerCallSent: true});
+      setTimeout(function () {
+        assert.isNotOk(spyEventsOn.calledWith('bidWon'))
+        done()
+      }, 10);
+    });
+
+    it('BID WON event is emitted when video cache key is present', function (done) {
+      enableInstreamTracking(/cache/);
+      const bidWonSpy = sandbox.spy();
+      events.on('bidWon', bidWonSpy);
+      mockPerformanceApi({adServerCallSent: true, videoPresent: true});
+
+      trackInstreamDeliveredImpressions(getMockInput(INSTREAM));
+      setTimeout(function () {
+        assert.isOk(spyEventsOn.calledWith('bidWon'))
+        assert(bidWonSpy.args[0][0].videoCacheKey, VIDEO_CACHE_KEY, 'Video cache key in bid won should be equal to video cache call');
+        done()
+      }, 10);
+    });
+  });
+});
diff --git a/test/spec/modules/intentIqIdSystem_spec.js b/test/spec/modules/intentIqIdSystem_spec.js
new file mode 100644
index 00000000000..8ea30a6ba92
--- /dev/null
+++ b/test/spec/modules/intentIqIdSystem_spec.js
@@ -0,0 +1,181 @@
+import { expect } from 'chai';
+import {intentIqIdSubmodule, readData, FIRST_PARTY_KEY} from 'modules/intentIqIdSystem.js';
+import * as utils from 'src/utils.js';
+import {server} from 'test/mocks/xhr.js';
+
+const partner = 10;
+const pai = '11';
+const pcid = '12';
+const defaultConfigParams = { params: {partner: partner} };
+const paiConfigParams = { params: {partner: partner, pai: pai} };
+const pcidConfigParams = { params: {partner: partner, pcid: pcid} };
+const allConfigParams = { params: {partner: partner, pai: pai, pcid: pcid} };
+const responseHeader = {'Content-Type': 'application/json'}
+
+describe('IntentIQ tests', function () {
+  let logErrorStub;
+
+  beforeEach(function () {
+    logErrorStub = sinon.stub(utils, 'logError');
+  });
+
+  afterEach(function () {
+    logErrorStub.restore();
+  });
+
+  it('should log an error if no configParams were passed when getId', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: {} });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should log an error if partner configParam was not passed when getId', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: {} });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should log an error if partner configParam was not a numeric value', function () {
+    let submodule = intentIqIdSubmodule.getId({ params: {partner: '10'} });
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(submodule).to.be.undefined;
+  });
+
+  it('should call the IntentIQ endpoint with only partner', function () {
+    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({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  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);
+  });
+
+  it('should call the IntentIQ endpoint with only partner, pai', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(paiConfigParams).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&pai=11&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the IntentIQ endpoint with only partner, pcid', function () {
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = intentIqIdSubmodule.getId(pcidConfigParams).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&iiqidtype=2&iiqpcid=');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the IntentIQ endpoint with partner, pcid, pai', 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({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should not throw Uncaught TypeError when IntentIQ endpoint returns empty response', function () {
+    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(
+      204,
+      responseHeader,
+      ''
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(request.response).to.equal('');
+  });
+
+  it('should log an error and continue to callback if ajax request errors', function () {
+    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(
+      503,
+      responseHeader,
+      'Unavailable'
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('save result if 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: 'test_personid', ls: true})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.args[0][0]).to.be.eq('test_personid');
+  });
+
+  it('dont save result if ls=false', 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: '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');
+  });
+});
diff --git a/test/spec/modules/interactiveOffersBidAdapter_spec.js b/test/spec/modules/interactiveOffersBidAdapter_spec.js
new file mode 100644
index 00000000000..2ea620dc30c
--- /dev/null
+++ b/test/spec/modules/interactiveOffersBidAdapter_spec.js
@@ -0,0 +1,43 @@
+import { expect } from 'chai';
+import {spec} from 'modules/interactiveOffersBidAdapter.js';
+
+describe('Interactive Offers Prebbid.js Adapter', function() {
+  describe('isBidRequestValid function', function() {
+    let bid = {bidder: 'interactiveOffers', params: {pubid: 100, tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0};
+
+    it('returns true if all the required params are present and properly formatted', function() {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('returns false if any if the required params is missing', function() {
+      bid.params = {};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('returns false if any if the required params is not properly formatted', function() {
+      bid.params = {pubid: 'abcd123', tmax: 250};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+      bid.params = {pubid: 100, tmax: '+250'};
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+  describe('buildRequests function', function() {
+    let validBidRequests = [{bidder: 'interactiveOffers', params: {pubid: 100, tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}];
+    let bidderRequest = {bidderCode: 'interactiveOffers', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', bidderRequestId: '1eb79bc9dd44a', bids: [{bidder: 'interactiveOffers', params: {pubid: 100, tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}], timeout: 5000, refererInfo: {referer: 'http://www.google.com', reachedTop: true, isAmp: false, numIframes: 0, stack: ['http://www.google.com'], canonicalUrl: null}};
+
+    it('returns a Prebid.js request object with a valid json string at the "data" property', function() {
+      let request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).length !== 0;
+    });
+  });
+  describe('interpretResponse function', function() {
+    let openRTBResponse = {body: [{cur: 'USD', id: '2052afa35febb79baa9893cc3ae8b83b89740df65fe98b1bd358dbae6e912801', seatbid: [{seat: 1493, bid: [{ext: {tagid: '227faa83f86546'}, crid: '24477', adm: '', nurl: '', adid: '1138', adomain: ['url.com'], price: '1.53', w: 300, h: 250, iurl: 'http://url.com', cat: ['IAB13-11'], id: '5507ced7a39c06942d3cb260197112ba712e4180', attr: [], impid: 1, cid: '13280'}]}], 'bidid': '0959b9d58ba71b3db3fa29dce3b117c01fc85de0'}], 'headers': {}};
+    let prebidRequest = {method: 'POST', url: 'https://url.com', data: '{"id": "1aad860c-e04b-482b-acac-0da55ed491c8", "site": {"id": "url.com", "name": "url.com", "domain": "url.com", "page": "http://url.com", "ref": "http://url.com", "publisher": {"id": 100, "name": "http://url.com", "domain": "url.com"}, "content": {"language": "pt-PT"}}, "source": {"fd": 0, "tid": "1aad860c-e04b-482b-acac-0da55ed491c8", "pchain": ""}, "device": {"ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.192 Safari/537.36", "language": "pt-PT"}, "user": {}, "imp": [{"id":1, "secure": 0, "tagid": "227faa83f86546", "banner": {"pos": 0, "w": 300, "h": 250, "format": [{"w": 300, "h": 250}]}}], "tmax": 300}', bidderRequest: {bidderCode: 'interactiveOffers', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', bidderRequestId: '1eb79bc9dd44a', bids: [{bidder: 'interactiveOffers', params: {pubid: 100, tmax: 300}, mediaTypes: {banner: {sizes: [[300, 250]]}}, adUnitCode: 'pageAd01', transactionId: '16526f30-3be2-43f6-ab37-f1ab1f2ac25d', sizes: [[300, 250]], bidId: '227faa83f86546', bidderRequestId: '1eb79bc9dd44a', auctionId: '1aad860c-e04b-482b-acac-0da55ed491c8', src: 'client', bidRequestsCount: 1, bidderRequestsCount: 1, bidderWinsCount: 0}], timeout: 5000, refererInfo: {referer: 'http://url.com', reachedTop: true, isAmp: false, numIframes: 0, stack: ['http://url.com'], canonicalUrl: null}}};
+
+    it('returns an array of Prebid.js response objects', function() {
+      let prebidResponses = spec.interpretResponse(openRTBResponse, prebidRequest);
+      expect(prebidResponses).to.not.be.empty;
+      expect(prebidResponses[0].meta.advertiserDomains[0]).to.equal('url.com');
+    });
+  });
+});
diff --git a/test/spec/modules/invamiaBidAdapter_spec.js b/test/spec/modules/invamiaBidAdapter_spec.js
new file mode 100644
index 00000000000..ed004b651bd
--- /dev/null
+++ b/test/spec/modules/invamiaBidAdapter_spec.js
@@ -0,0 +1,169 @@
+import {expect} from 'chai';
+import {spec} from 'modules/invamiaBidAdapter.js';
+
+describe('invamia bid adapter tests', function () {
+  describe('bid requests', function () {
+    it('should accept valid bid', function () {
+      const validBid = {
+        bidder: 'invamia',
+        params: {zoneId: 123},
+      };
+
+      expect(spec.isBidRequestValid(validBid)).to.equal(true);
+    });
+
+    it('should reject invalid bid', function () {
+      const invalidBid = {
+        bidder: 'invamia',
+        params: {},
+      };
+
+      expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
+    });
+
+    it('should correctly build payload string', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests)[0].data;
+
+      expect(payload).to.contain('ctype=div');
+      expect(payload).to.contain('pzoneid=123');
+      expect(payload).to.contain('width=300');
+      expect(payload).to.contain('height=250');
+    });
+
+    it('should support multiple bids', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }, {
+        bidder: 'invamia',
+        params: {zoneId: 321},
+        mediaTypes: {
+          banner: {
+            sizes: [[728, 90]],
+          },
+        },
+        bidId: '23acc48ad47af52',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba992',
+        bidderRequestId: '1c56ad30b9b8ca82',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea9347292',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+
+    it('should support multiple sizes', function () {
+      const bidRequests = [{
+        bidder: 'invamia',
+        params: {zoneId: 123},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          },
+        },
+        bidId: '23acc48ad47af5',
+        auctionId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+        bidderRequestId: '1c56ad30b9b8ca8',
+        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      }];
+      const payload = spec.buildRequests(bidRequests);
+
+      expect(payload).to.be.lengthOf(2);
+    });
+  });
+
+  describe('bid responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: {
+          banner: {
+            hash: '1c56ad30b9b8ca8',
+          },
+          hb: {
+            cpm: 0.5,
+            netRevenue: false,
+          },
+          template: {
+            html: '',
+          },
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('23acc48ad47af5');
+      expect(bids[0].creativeId).to.equal('1c56ad30b9b8ca8');
+      expect(bids[0].width).to.equal(300);
+      expect(bids[0].height).to.equal(250);
+      expect(bids[0].ttl).to.equal(600);
+      expect(bids[0].cpm).to.equal(0.5);
+      expect(bids[0].netRevenue).to.equal(false);
+      expect(bids[0].currency).to.equal('USD');
+    });
+
+    it('should return empty bid response', function () {
+      const serverResponse = {
+        body: {},
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+
+    it('should return empty bid response 2', function () {
+      const serverResponse = {
+        body: {
+          template: {
+            html: '',
+          }
+        },
+      };
+      const bidderRequest = {
+        bidId: '23acc48ad47af5',
+        params: {
+          requestedSizes: [300, 250],
+        },
+      };
+
+      const bids = spec.interpretResponse(serverResponse, {bidderRequest});
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/invibesBidAdapter_spec.js b/test/spec/modules/invibesBidAdapter_spec.js
index b75c6a4578f..ea3e1d6611b 100644
--- a/test/spec/modules/invibesBidAdapter_spec.js
+++ b/test/spec/modules/invibesBidAdapter_spec.js
@@ -22,7 +22,11 @@ describe('invibesBidAdapter:', function () {
         [400, 300],
         [125, 125]
       ],
-      transactionId: 't1'
+      transactionId: 't1',
+      userId: {
+        pubcid: 'pub-cid-code',
+        pubProvidedId: 'pub-provided-id'
+      }
     }, {
       bidId: 'b2',
       bidder: BIDDER_CODE,
@@ -137,11 +141,19 @@ describe('invibesBidAdapter:', function () {
     });
 
     it('has capped ids if local storage variable is correctly formatted', function () {
+      top.window.invibes.optIn = 1;
+      top.window.invibes.purposes = [true, false, false, false, false, false, false, false, false, false];
       localStorage.ivvcap = '{"9731":[1,1768600800000]}';
       const request = spec.buildRequests(bidRequests, {auctionStart: Date.now()});
       expect(request.data.capCounts).to.equal('9731=1');
     });
 
+    it('does not have capped ids if local storage variable is correctly formatted but no opt in', function () {
+      localStorage.ivvcap = '{"9731":[1,1768600800000]}';
+      const request = spec.buildRequests(bidRequests, {auctionStart: Date.now()});
+      expect(request.data.capCounts).to.equal('');
+    });
+
     it('does not have capped ids if local storage variable is incorrectly formatted', function () {
       localStorage.ivvcap = ':[1,1574334216992]}';
       const request = spec.buildRequests(bidRequests, {auctionStart: Date.now()});
@@ -178,106 +190,143 @@ describe('invibesBidAdapter:', function () {
       expect(JSON.parse(request.data.bidParamsJson).placementIds).to.contain(bidRequests[1].params.placementId);
     });
 
-    it('uses cookies', function () {
-      global.document.cookie = 'ivNoCookie=1';
+    it('sends undefined lid when no cookie', function () {
       let request = spec.buildRequests(bidRequests);
       expect(request.data.lId).to.be.undefined;
     });
 
-    it('doesnt send the domain id if not graduated', function () {
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1522929537626,"hc":1}';
-      let request = spec.buildRequests(bidRequests);
-      expect(request.data.lId).to.not.exist;
-    });
-
-    it('try to graduate but not enough count - doesnt send the domain id', function () {
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1521818537626,"hc":0}';
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-    });
-
-    it('try to graduate but not old enough - doesnt send the domain id', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":5}';
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-    });
-
-    it('graduate and send the domain id', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"dvdjkams6nkq","cr":1521818537626,"hc":7}'));
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.exist;
-    });
-
-    it('send the domain id if already graduated', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi"}'));
-      let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
-    });
-
-    it('send the domain id after replacing it with new format', function () {
+    it('sends lid 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 = 'ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":0}';
       let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.lId).to.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
     });
 
-    it('dont send the domain id if consent declined on tcf v1', function () {
+    it('should send purpose 1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
             gdprApplies: true,
             hasGlobalConsent: false,
-            vendorConsents: {436: false}
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
           }
         }
       };
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.purposes.split(',')[0]).to.equal('true');
     });
 
-    it('dont send the domain id if consent declined on tcf v2', function () {
+    it('should send purpose 2 & 7', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
             gdprApplies: true,
             hasGlobalConsent: false,
-            vendor: {consents: {436: false}}
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
           }
         }
       };
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.purposes.split(',')[1] && request.data.purposes.split(',')[6]).to.equal('true');
     });
 
-    it('dont send the domain id if no consent', function () {
-      let bidderRequest = {};
-      stubDomainOptions(new StubbedPersistence('{"id":"f8zoh044p9oi.8537626"}'));
+    it('should send purpose 9', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.not.exist;
+      expect(request.data.purposes.split(',')[9]).to.equal('true');
     });
 
-    it('try to init id but was already loaded on page - does not increment the id again', function () {
-      let bidderRequest = {gdprConsent: {vendorData: {vendorConsents: {436: true}}}};
-      global.document.cookie = 'ivbsdid={"id":"dvdjkams6nkq","cr":1521818537626,"hc":0}';
+    it('should send legitimateInterests 2 & 7', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              },
+              legitimateInterests: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.lId).to.not.exist;
-      expect(top.window.invibes.dom.tempId).to.exist;
+      expect(request.data.li.split(',')[1] && request.data.li.split(',')[6]).to.equal('true');
     });
-
     it('should send oi = 0 when vendorData is null', function () {
       let bidderRequest = {
         gdprConsent: {
@@ -315,7 +364,6 @@ describe('invibesBidAdapter:', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.oi).to.equal(2);
     });
-
     it('should send oi = 0 when vendor consents for invibes are false on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
@@ -343,8 +391,76 @@ describe('invibesBidAdapter:', function () {
       let request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.oi).to.equal(0);
     });
+    it('should send oi = 2 when vendor consent for invibes are false and vendor legitimate interest for invibes are true on tcf v2', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}, legitimateInterests: {436: true}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(2);
+    });
+    it('should send oi = 0 when vendor consents and legitimate interests for invibes are false on tcf v2', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}, legitimateInterests: {436: false}},
+            purpose: {
+              consents: {
+                1: true,
+                2: true,
+                3: true,
+                4: true,
+                5: true,
+                6: true,
+                7: true,
+                8: true,
+                9: true,
+                10: true
+              }
+            }
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(0);
+    });
+    it('should send oi = 0 when purpose consents is null', function () {
+      let bidderRequest = {
+        gdprConsent: {
+          vendorData: {
+            gdprApplies: true,
+            hasGlobalConsent: false,
+            vendor: {consents: {436: false}},
+            purpose: {}
+          }
+        }
+      };
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.oi).to.equal(0);
+    });
 
-    it('should send oi = 0 when purpose consents weren\'t approved on tcf v2', function () {
+    it('should send oi = 2 when purpose consents weren\'t approved on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -369,10 +485,10 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents are less then 10 on tcf v2', function () {
+    it('should send oi = 2 when purpose consents are less then 10 on tcf v2', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -392,7 +508,7 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
     it('should send oi = 4 when vendor consents are null on tcf v2', function () {
@@ -527,7 +643,7 @@ describe('invibesBidAdapter:', function () {
       expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents weren\'t approved on tcf v1', function () {
+    it('should send oi = 2 when purpose consents weren\'t approved on tcf v1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -545,10 +661,10 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
-    it('should send oi = 0 when purpose consents are less then 5 on tcf v1', function () {
+    it('should send oi = 2 when purpose consents are less then 5 on tcf v1', function () {
       let bidderRequest = {
         gdprConsent: {
           vendorData: {
@@ -564,7 +680,7 @@ describe('invibesBidAdapter:', function () {
         }
       };
       let request = spec.buildRequests(bidRequests, bidderRequest);
-      expect(request.data.oi).to.equal(0);
+      expect(request.data.oi).to.equal(2);
     });
 
     it('should send oi = 0 when vendor consents for invibes are false on tcf v1', function () {
@@ -617,9 +733,51 @@ describe('invibesBidAdapter:', function () {
           
           
           
-        `
+        `,
+      meta: {}
     }];
 
+    let multiResponse = {
+      AdPlacements: [{
+        Ads: [{
+          BidPrice: 0.5,
+          VideoExposedId: 123
+        }],
+        BidModel: {
+          BidVersion: 1,
+          PlacementId: '12345',
+          AuctionStartTime: Date.now(),
+          CreativeHtml: ''
+        }
+      }]
+    };
+
+    let invalidResponse = {
+      AdPlacements: [{
+        Ads: [{
+          BidPrice: 0.5,
+          VideoExposedId: 123
+        }]
+      }]
+    };
+
+    let responseWithMeta = {
+      Ads: [{
+        BidPrice: 0.5,
+        VideoExposedId: 123
+      }],
+      BidModel: {
+        BidVersion: 1,
+        PlacementId: '12345',
+        AuctionStartTime: Date.now(),
+        CreativeHtml: '',
+        Meta: {
+          advertiserDomains: ['theadvertiser.com', 'theadvertiser_2.com'],
+          advertiserName: 'theadvertiser'
+        }
+      }
+    };
+
     context('when the response is not valid', function () {
       it('handles response with no bids requested', function () {
         let emptyResult = spec.interpretResponse({body: response});
@@ -665,29 +823,39 @@ describe('invibesBidAdapter:', function () {
         let emptyResult = spec.interpretResponse({BidModel: {}, Ads: [{BidPrice: 1}]}, {bidRequests});
         expect(emptyResult).to.be.empty;
       });
+
+      it('handles response when bid model is missing', function () {
+        let emptyResult = spec.interpretResponse(invalidResponse);
+        expect(emptyResult).to.be.empty;
+      });
     });
 
-    context('when the response is valid', function () {
-      it('responds with a valid bid', function () {
-        top.window.invibes.setCookie('a', 'b', 370);
-        top.window.invibes.setCookie('c', 'd', 0);
-        let result = spec.interpretResponse({body: response}, {bidRequests});
+    context('when the multiresponse is valid', function () {
+      it('responds with a valid multiresponse bid', function () {
+        let result = spec.interpretResponse({body: multiResponse}, {bidRequests});
         expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
       });
 
-      it('responds with a valid bid and uses logger', function () {
-        localStorage.InvibesDEBUG = true;
+      it('responds with a valid singleresponse bid', function () {
         let result = spec.interpretResponse({body: response}, {bidRequests});
         expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
       });
 
       it('does not make multiple bids', function () {
-        localStorage.InvibesDEBUG = false;
         let result = spec.interpretResponse({body: response}, {bidRequests});
         let secondResult = spec.interpretResponse({body: response}, {bidRequests});
         expect(secondResult).to.be.empty;
       });
     });
+
+    context('when the response has meta', function () {
+      it('responds with a valid bid, with the meta info', function () {
+        let result = spec.interpretResponse({body: responseWithMeta}, {bidRequests});
+        expect(result[0].meta.advertiserName).to.equal('theadvertiser');
+        expect(result[0].meta.advertiserDomains).to.contain('theadvertiser.com');
+        expect(result[0].meta.advertiserDomains).to.contain('theadvertiser_2.com');
+      });
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -705,6 +873,16 @@ describe('invibesBidAdapter:', function () {
       expect(response.url).to.include(SYNC_ENDPOINT);
       expect(response.url).to.include('optIn');
       expect(response.url).to.include('ivvbks');
+    });
+
+    it('returns an iframe with params including if enabled', function () {
+      top.window.invibes.optIn = 1;
+      global.document.cookie = 'ivvbks=17639.0,1,2;ivbsdid={"id":"dvdjkams6nkq","cr":' + Date.now() + ',"hc":0}';
+      let response = spec.getUserSyncs({iframeEnabled: true});
+      expect(response.type).to.equal('iframe');
+      expect(response.url).to.include(SYNC_ENDPOINT);
+      expect(response.url).to.include('optIn');
+      expect(response.url).to.include('ivvbks');
       expect(response.url).to.include('ivbsdid');
     });
 
diff --git a/test/spec/modules/ipromBidAdapter_spec.js b/test/spec/modules/ipromBidAdapter_spec.js
new file mode 100644
index 00000000000..a3310a33cc2
--- /dev/null
+++ b/test/spec/modules/ipromBidAdapter_spec.js
@@ -0,0 +1,195 @@
+import {expect} from 'chai';
+import {spec} from 'modules/ipromBidAdapter.js';
+
+describe('iPROM Adapter', function () {
+  let bidRequests;
+  let bidderRequest;
+
+  beforeEach(function () {
+    bidRequests = [
+      {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+        adUnitCode: '/19966331/header-bid-tag-1',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [300, 600]],
+          }
+        },
+        bidId: '29a72b151f7bd3',
+        auctionId: 'e36abb27-g3b1-1ad6-8a4c-701c8919d3hh',
+        bidderRequestId: '2z76da40m1b3cb8',
+        transactionId: 'j51lhf58-1ad6-g3b1-3j6s-912c9493g0gu'
+      }
+    ];
+
+    bidderRequest = {
+      timeout: 3000,
+      refererInfo: {
+        referer: 'https://adserver.si/index.html',
+        reachedTop: true,
+        numIframes: 1,
+        stack: [
+          'https://adserver.si/index.html',
+          'https://adserver.si/iframe1.html',
+        ]
+      }
+    }
+  });
+
+  describe('validating bids', function () {
+    it('should accept valid bid', function () {
+      let validBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: '300x250',
+        },
+      };
+
+      const isValid = spec.isBidRequestValid(validBid);
+
+      expect(isValid).to.equal(true);
+    });
+
+    it('should reject bid if missing dimension and id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {}
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing dimension', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if dimension is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: '1234',
+          dimension: 404,
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if missing id', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+
+    it('should reject bid if id is not a string', function () {
+      let invalidBid = {
+        bidder: 'iprom',
+        params: {
+          id: 1234,
+          dimension: '300x250',
+        }
+      };
+
+      const isValid = spec.isBidRequestValid(invalidBid);
+
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('building requests', function () {
+    it('should go to correct endpoint', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(request.method).to.exist;
+      expect(request.method).to.equal('POST');
+      expect(request.url).to.exist;
+      expect(request.url).to.equal('https://core.iprom.net/programmatic');
+    });
+
+    it('should add referer info', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.referer).to.exist;
+      expect(requestparse.referer.referer).to.equal('https://adserver.si/index.html');
+    });
+
+    it('should add adapter version', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.version).to.exist;
+    });
+
+    it('should contain id and dimension', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const requestparse = JSON.parse(request.data);
+
+      expect(requestparse.bids[0].params.id).to.equal('1234');
+      expect(requestparse.bids[0].params.dimension).to.equal('300x250');
+    });
+  });
+
+  describe('handling responses', function () {
+    it('should return complete bid response', function () {
+      const serverResponse = {
+        body: [{
+          requestId: '29a72b151f7bd3',
+          cpm: 0.5,
+          width: '300',
+          height: '250',
+          creativeId: 1234,
+          ad: 'Iprom Header bidding example',
+          aDomains: ['https://example.com'],
+        }
+        ]};
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(serverResponse, request);
+
+      expect(bids).to.be.lengthOf(1);
+      expect(bids[0].requestId).to.equal('29a72b151f7bd3');
+      expect(bids[0].cpm).to.equal(0.5);
+      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(['https://example.com']);
+    });
+
+    it('should return empty bid response', function () {
+      const emptyServerResponse = {
+        body: []
+      };
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const bids = spec.interpretResponse(emptyServerResponse, request);
+
+      expect(bids).to.be.lengthOf(0);
+    });
+  });
+});
diff --git a/test/spec/modules/ironsourceBidAdapter_spec.js b/test/spec/modules/ironsourceBidAdapter_spec.js
new file mode 100644
index 00000000000..cca928ff28b
--- /dev/null
+++ b/test/spec/modules/ironsourceBidAdapter_spec.js
@@ -0,0 +1,381 @@
+import { expect } from 'chai';
+import { spec } from 'modules/ironsourceBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { VIDEO } from '../../../src/mediaTypes.js';
+
+const ENDPOINT = 'https://hb.yellowblue.io/hb';
+const TEST_ENDPOINT = 'https://hb.yellowblue.io/hb-test';
+const TTL = 360;
+
+describe('ironsourceAdapter', 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': {
+        'isOrg': '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 = {
+        'isOrg': null
+      };
+      expect(spec.isBidRequestValid(newBid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'isOrg': 'jdye8weeyirk00000001'
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'isOrg': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'ironsource',
+    }
+
+    const customSessionId = '12345678';
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('sends bid request to test ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(testModeBidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(TEST_ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('should send the correct bid Id', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.bid_id).to.equal('299ffc8cca0b87');
+      }
+    });
+
+    it('sends the is_wrapper query param', function () {
+      bidRequests[0].params.isWrapper = true;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.is_wrapper).to.equal(true);
+      }
+    });
+
+    it('sends the custom session id as a query param', function () {
+      bidRequests[0].params.sessionId = customSessionId;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.session_id).to.equal(customSessionId);
+      }
+    });
+
+    it('should send the correct width and height', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('width', 640);
+        expect(request.data).to.have.property('height', 480);
+      }
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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.setConfig({
+        userSync: {
+          syncEnabled: true
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('us_privacy', '1YNN');
+      }
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('gdpr');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('gdpr', true);
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('schain', '1.0,1!indirectseller.com,00001,,,,');
+      }
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      cpm: 12.5,
+      vastXml: '',
+      width: 640,
+      height: 480,
+      requestId: '21e12606d47ba7',
+      netRevenue: true,
+      currency: 'USD'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '21e12606d47ba7',
+          cpm: 12.5,
+          width: 640,
+          height: 480,
+          creativeId: '21e12606d47ba7',
+          currency: 'USD',
+          netRevenue: true,
+          ttl: TTL,
+          vastXml: '',
+          mediaType: VIDEO
+        }
+      ];
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        userSyncPixels: [
+          'https://image-sync-url.test/1',
+          'https://image-sync-url.test/2',
+          'https://image-sync-url.test/3'
+        ]
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        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([]);
+    });
+  })
+});
diff --git a/test/spec/modules/ixBidAdapter_spec.js b/test/spec/modules/ixBidAdapter_spec.js
index 114a2226770..cf716fd594b 100644
--- a/test/spec/modules/ixBidAdapter_spec.js
+++ b/test/spec/modules/ixBidAdapter_spec.js
@@ -3,9 +3,10 @@ import { config } from 'src/config.js';
 import { expect } from 'chai';
 import { newBidder } from 'src/adapters/bidderFactory.js';
 import { spec } from 'modules/ixBidAdapter.js';
+import { createEidsArray } from 'modules/userId/eids.js';
 
 describe('IndexexchangeAdapter', function () {
-  const IX_SECURE_ENDPOINT = 'https://as-sec.casalemedia.com/cygnus';
+  const IX_SECURE_ENDPOINT = 'https://htlb.casalemedia.com/cygnus';
   const VIDEO_ENDPOINT_VERSION = 8.1;
   const BANNER_ENDPOINT_VERSION = 7.2;
 
@@ -18,7 +19,6 @@ describe('IndexexchangeAdapter', function () {
         'sid': '00001',
         'hp': 1
       },
-
       {
         'asi': 'indirectseller-2.com',
         'sid': '00002',
@@ -26,6 +26,129 @@ describe('IndexexchangeAdapter', function () {
       }
     ]
   };
+  const div_many_sizes = [
+    [300, 250],
+    [600, 410],
+    [336, 280],
+    [400, 300],
+    [320, 50],
+    [360, 360],
+    [250, 250],
+    [320, 250],
+    [400, 250],
+    [387, 359],
+    [300, 50],
+    [372, 250],
+    [320, 320],
+    [412, 412],
+    [327, 272],
+    [312, 260],
+    [384, 320],
+    [335, 250],
+    [366, 305],
+    [374, 250],
+    [375, 375],
+    [272, 391],
+    [364, 303],
+    [414, 414],
+    [366, 375],
+    [272, 360],
+    [364, 373],
+    [366, 359],
+    [320, 100],
+    [360, 250],
+    [468, 60],
+    [480, 300],
+    [600, 400],
+    [600, 300],
+    [33, 28],
+    [40, 30],
+    [32, 5],
+    [36, 36],
+    [25, 25],
+    [320, 25],
+    [400, 25],
+    [387, 35],
+    [300, 5],
+    [372, 20],
+    [320, 32],
+    [412, 41],
+    [327, 27],
+    [312, 26],
+    [384, 32],
+    [335, 25],
+    [366, 30],
+    [374, 25],
+    [375, 37],
+    [272, 31],
+    [364, 303],
+    [414, 41],
+    [366, 35],
+    [272, 60],
+    [364, 73],
+    [366, 59],
+    [320, 10],
+    [360, 25],
+    [468, 6],
+    [480, 30],
+    [600, 40],
+    [600, 30]
+  ];
+
+  const ONE_VIDEO = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
+        },
+        size: [400, 100]
+      },
+      sizes: [[400, 100]],
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [[400, 100]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const ONE_BANNER = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      sizes: [[300, 250]],
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748561-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47229',
+      bidId: '1a2b3c4d',
+      bidderRequestId: '11a22b33c44d',
+      auctionId: '1aa2bb3cc4dd',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
 
   const DEFAULT_BANNER_VALID_BID = [
     {
@@ -60,7 +183,9 @@ describe('IndexexchangeAdapter', function () {
             'video/mp4',
             'video/webm'
           ],
-          minduration: 0
+          minduration: 0,
+          maxduration: 60,
+          protocols: [2]
         },
         size: [400, 100]
       },
@@ -80,6 +205,66 @@ describe('IndexexchangeAdapter', function () {
     }
   ];
 
+  const DEFAULT_MULTIFORMAT_BANNER_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '123',
+        size: [300, 250]
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [600, 700]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '173f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
+  const DEFAULT_MULTIFORMAT_VIDEO_VALID_BID = [
+    {
+      bidder: 'ix',
+      params: {
+        siteId: '456',
+        video: {
+          skippable: false,
+          mimes: [
+            'video/mp4',
+            'video/webm'
+          ],
+          minduration: 0,
+          maxduration: 60,
+          protocols: [1]
+        },
+        size: [300, 250]
+      },
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [300, 250]
+        },
+        banner: {
+          sizes: [[300, 250], [300, 600]]
+        }
+      },
+      adUnitCode: 'div-gpt-ad-1460505748562-0',
+      transactionId: '273f49a8-7549-4218-a23c-e7ba59b47230',
+      bidId: '1a2b3c4e',
+      bidderRequestId: '11a22b33c44e',
+      auctionId: '1aa2bb3cc4de',
+      schain: SAMPLE_SCHAIN
+    }
+  ];
+
   const DEFAULT_BANNER_BID_RESPONSE = {
     cur: 'USD',
     id: '11a22b33c44d',
@@ -110,6 +295,35 @@ describe('IndexexchangeAdapter', function () {
     ]
   };
 
+  const DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN = {
+    cur: 'USD',
+    id: '11a22b33c44d',
+    seatbid: [
+      {
+        bid: [
+          {
+            crid: '12345',
+            adid: '14851455',
+            impid: '1a2b3c4d',
+            cid: '3051266',
+            price: 100,
+            w: 300,
+            h: 250,
+            id: '1',
+            ext: {
+              dspid: 50,
+              pricelevel: '_100',
+              advbrandid: 303325,
+              advbrand: 'OECTA'
+            },
+            adm: ''
+          }
+        ],
+        seat: '3970'
+      }
+    ]
+  };
+
   const DEFAULT_VIDEO_BID_RESPONSE = {
     cur: 'USD',
     id: '1aa2bb3cc4de',
@@ -190,6 +404,79 @@ describe('IndexexchangeAdapter', function () {
     v: 8.1
   };
 
+  const DEFAULT_USERID_DATA = {
+    idl_env: '1234-5678-9012-3456', // Liveramp
+    netId: 'testnetid123', // NetId
+    IDP: 'userIDP000', // IDP
+    fabrickId: 'fabrickId9000', // FabrickId
+    uid2: {id: 'testuid2'} // UID 2.0
+  };
+
+  const DEFAULT_USERIDASEIDS_DATA = createEidsArray(DEFAULT_USERID_DATA);
+
+  const DEFAULT_USERID_PAYLOAD = [
+    {
+      source: 'liveramp.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.idl_env,
+        ext: {
+          rtiPartner: 'idl'
+        }
+      }]
+    }, {
+      source: 'netid.de',
+      uids: [{
+        id: DEFAULT_USERID_DATA.netId,
+        ext: {
+          rtiPartner: 'NETID'
+        }
+      }]
+    }, {
+      source: 'neustar.biz',
+      uids: [{
+        id: DEFAULT_USERID_DATA.fabrickId,
+        ext: {
+          rtiPartner: 'fabrickId'
+        }
+      }]
+    }, {
+      source: 'zeotap.com',
+      uids: [{
+        id: DEFAULT_USERID_DATA.IDP,
+        ext: {
+          rtiPartner: 'zeotapIdPlus'
+        }
+      }]
+    }, {
+      source: 'uidapi.com',
+      uids: [{
+        // when calling createEidsArray, UID2's getValue func returns .id, which is then set in uids
+        id: DEFAULT_USERID_DATA.uid2.id,
+        ext: {
+          rtiPartner: 'UID2'
+        }
+      }]
+    }
+  ];
+
+  const DEFAULT_USERID_BID_DATA = {
+    lotamePanoramaId: 'bd738d136bdaa841117fe9b331bb4',
+    flocId: {id: '1234', version: 'chrome.1.2'}
+  };
+
+  const DEFAULT_FLOC_USERID_PAYLOAD = [
+    {
+      source: 'chrome.com',
+      uids: [{
+        id: DEFAULT_USERID_BID_DATA.flocId.id,
+        ext: {
+          rtiPartner: 'flocId',
+          ver: DEFAULT_USERID_BID_DATA.flocId.version
+        }
+      }]
+    }
+  ];
+
   describe('inherited functions', function () {
     it('should exists and is a function', function () {
       const adapter = newBidder(spec);
@@ -242,10 +529,10 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return false when size is missing', function () {
+    it('should return True when size is missing ', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       delete bid.params.size;
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return false when size array is wrong length', function () {
@@ -264,33 +551,47 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return false when mediaTypes is not banner or video', function () {
+    it('should return false when mediaTypes.banner does not have sizes', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.mediaTypes = {
-        native: {
-          sizes: [[300, 250]]
+        banner: {
+          size: [[300, 250]]
         }
       };
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return false when mediaTypes.banner does not have sizes', function () {
-      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+    it('should return false when mediaTypes.video.playerSize does not include params.size', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes = {
-        banner: {
-          size: [[300, 250]]
+        video: {
+          playerSize: [300, 250]
         }
       };
+      bid.params.size = [100, 200];
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
-    it('should return false when mediaTypes.video does not have sizes', function () {
+    it('should return true when mediaTypes.video.playerSize includes params.size', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes = {
         video: {
-          size: [[300, 250]]
+          playerSize: [[300, 250], [200, 300]]
         }
       };
+      bid.params.size = [[300, 250]];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true when bid.params.size is missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.size;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false when minduration is missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.minduration;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
 
@@ -325,6 +626,16 @@ describe('IndexexchangeAdapter', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true for banner bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true for video bid when there are multiple mediaTypes (banner, outstream)', function () {
+      const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
     it('should return false when there is only bidFloor', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.params.bidFloor = 50;
@@ -350,6 +661,71 @@ describe('IndexexchangeAdapter', function () {
       bid.params.bidFloorCur = 70;
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when required video properties are missing on both adunit & param levels', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should return true when required video properties are at the adunit level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocols exists but protocol doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocols;
+      bid.mediaTypes.video.protocols = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return true if protocol exists but protocols doesn\'t', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      bid.params.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+      delete bid.params.video.protocol;
+      bid.mediaTypes.video.protocol = 1;
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if both protocol/protocols are missing', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      delete bid.params.video.protocols;
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  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 = JSON.parse(request[0].data.r);
+        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(5);
+        expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      });
+    });
   });
 
   describe('buildRequestsIdentity', function () {
@@ -365,13 +741,16 @@ describe('IndexexchangeAdapter', function () {
       request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
       query = request.data;
     });
+
     afterEach(function () {
       delete window.headertag;
     });
+
     describe('buildRequestSingleRTI', function () {
       before(function () {
         testCopy = JSON.parse(JSON.stringify(DEFAULT_IDENTITY_RESPONSE));
       });
+
       it('payload should have correct format and value (single identity partner)', function () {
         const payload = JSON.parse(query.r);
 
@@ -400,6 +779,7 @@ describe('IndexexchangeAdapter', function () {
           }
         );
       });
+
       it('payload should have correct format and value (single identity w/ multi ids)', function () {
         const payload = JSON.parse(query.r);
 
@@ -443,6 +823,7 @@ describe('IndexexchangeAdapter', function () {
           }
         }
       });
+
       it('payload should have correct format and value (multiple identity partners)', function () {
         const payload = JSON.parse(query.r);
 
@@ -519,57 +900,428 @@ describe('IndexexchangeAdapter', function () {
     });
   });
 
-  describe('buildRequests', function () {
-    const request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
-    const requestUrl = request.url;
-    const requestMethod = request.method;
-    const query = request.data;
+  describe('buildRequestsUserId', function () {
+    let validIdentityResponse;
+    let validUserIdPayload;
 
-    const bidWithoutSchain = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-    delete bidWithoutSchain[0].schain;
-    const requestWithoutSchain = spec.buildRequests(bidWithoutSchain, DEFAULT_OPTION)[0];
-    const queryWithoutSchain = requestWithoutSchain.data;
+    beforeEach(function () {
+      window.headertag = {};
+      window.headertag.getIdentityInfo = function () {
+        return validIdentityResponse;
+      };
+    });
 
-    const bidWithoutMediaType = utils.deepClone(DEFAULT_BANNER_VALID_BID);
-    delete bidWithoutMediaType[0].mediaTypes;
-    bidWithoutMediaType[0].sizes = [[300, 250], [300, 600]];
-    const requestWithoutMediaType = spec.buildRequests(bidWithoutMediaType, DEFAULT_OPTION)[0];
-    const queryWithoutMediaType = requestWithoutMediaType.data;
+    afterEach(function () {
+      delete window.headertag;
+    });
 
-    it('request should be made to IX endpoint with GET method', function () {
-      expect(requestMethod).to.equal('GET');
-      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT);
+    it('IX adapter reads supported user modules from Prebid and adds it to Video', function () {
+      const cloneValidBid = utils.deepClone(DEFAULT_VIDEO_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(5);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
     });
 
-    it('query object (version, siteID and request) should be correct', function () {
-      expect(query.v).to.equal(BANNER_ENDPOINT_VERSION);
-      expect(query.s).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
-      expect(query.r).to.exist;
-      expect(query.ac).to.equal('j');
-      expect(query.sd).to.equal(1);
-      expect(query.nf).not.to.exist;
+    it('IX adapter reads floc id from prebid userId and adds it to eids when there is not other eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_BID_DATA);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(1);
+      expect(payload.user.eids).to.deep.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
     });
 
-    it('payload should have correct format and value', function () {
-      const payload = JSON.parse(query.r);
-      expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
-      expect(payload.site).to.exist;
-      expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.referer);
-      expect(payload.site.ref).to.equal(document.referrer);
-      expect(payload.ext).to.exist;
-      expect(payload.ext.source).to.equal('prebid');
-      expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
-      expect(payload.imp).to.exist;
-      expect(payload.imp).to.be.an('array');
-      expect(payload.imp).to.have.lengthOf(1);
+    it('IX adapter reads floc id from prebid userId and appends it to eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      cloneValidBid[0].userId = utils.deepClone(DEFAULT_USERID_BID_DATA);
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(6);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
     });
 
-    it('payload should not include schain when not provided', function () {
-      const payload = JSON.parse(queryWithoutSchain.r);
-      expect(payload.source).to.not.exist; // source object currently only written for schain
+    it('IX adapter reads empty floc obj from prebid userId it, floc is not added to eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      cloneValidBid[0].userId = {'flocId': {}}
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(5);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
+      expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
     });
 
-    it('impression should have correct format and value', function () {
+    it('IX adapter reads floc obj from prebid userId it version is missing, floc is not added to eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      cloneValidBid[0].userId = {'flocId': {'id': 'abcd'}}
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(5);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
+      expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
+    });
+
+    it('IX adapter reads floc obj from prebid userId it ID is missing, floc is not added to eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      cloneValidBid[0].userId = {'flocId': {'version': 'chrome.a.b.c'}}
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(5);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
+      expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
+    });
+
+    it('IX adapter reads floc id with empty id from prebid userId and it does not added to eids', function() {
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+      cloneValidBid[0].userId = {flocID: {id: '', ver: 'chrome.1.2.3'}};
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      expect(payload.user.eids).to.have.lengthOf(5);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[0]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[1]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[2]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[3]);
+      expect(payload.user.eids).to.deep.include(DEFAULT_USERID_PAYLOAD[4]);
+      expect(payload.user.eids).should.not.include(DEFAULT_FLOC_USERID_PAYLOAD[0]);
+    });
+
+    it('We continue to send in IXL identity info and Prebid takes precedence over IXL', function () {
+      validIdentityResponse = {
+        AdserverOrgIp: {
+          responsePending: false,
+          data: {
+            source: 'adserver.org',
+            uids: [
+              {
+                id: '1234-5678-9012-3456',
+                ext: {
+                  rtiPartner: 'TDID'
+                }
+              },
+              {
+                id: 'FALSE',
+                ext: {
+                  rtiPartner: 'TDID_LOOKUP'
+                }
+              },
+              {
+                id: '2020-06-24T14:43:48.860Z',
+                ext: {
+                  rtiPartner: 'TDID_CREATED_AT'
+                }
+              }
+            ]
+          }
+        },
+        MerkleIp: {
+          responsePending: false,
+          data: {
+            source: 'merkle.com',
+            uids: [{
+              id: '1234-5678-9012-3456',
+              ext: {
+                keyID: '1234-5678',
+                enc: 1
+              }
+            }]
+          }
+        },
+        LiveRampIp: {
+          source: 'liveramp.com',
+          uids: [
+            {
+              id: '0000-1234-4567-8901',
+              ext: {
+                rtiPartner: 'idl'
+              }
+            }
+          ]
+        },
+        NetIdIp: {
+          source: 'netid.de',
+          uids: [
+            {
+              id: 'testnetid',
+              ext: {
+                rtiPartner: 'NETID'
+              }
+            }
+          ]
+        },
+        NeustarIp: {
+          source: 'neustar.biz',
+          uids: [
+            {
+              id: 'testfabrick',
+              ext: {
+                rtiPartner: 'fabrickId'
+              }
+            }
+          ]
+        },
+        ZeotapIp: {
+          source: 'zeotap.com',
+          uids: [
+            {
+              id: 'testzeotap',
+              ext: {
+                rtiPartner: 'zeotapIdPlus'
+              }
+            }
+          ]
+        }
+      };
+
+      const cloneValidBid = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+      const payload = JSON.parse(request.data.r);
+
+      validUserIdPayload = utils.deepClone(DEFAULT_USERID_PAYLOAD);
+      validUserIdPayload.push({
+        source: 'merkle.com',
+        uids: [{
+          id: '1234-5678-9012-3456',
+          ext: {
+            keyID: '1234-5678',
+            enc: 1
+          }
+        }]
+      })
+      validUserIdPayload.push({
+        source: 'adserver.org',
+        uids: [
+          {
+            id: '1234-5678-9012-3456',
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          },
+          {
+            id: 'FALSE',
+            ext: {
+              rtiPartner: 'TDID_LOOKUP'
+            }
+          },
+          {
+            id: '2020-06-24T14:43:48.860Z',
+            ext: {
+              rtiPartner: 'TDID_CREATED_AT'
+            }
+          }
+        ]
+      })
+
+      expect(payload.user).to.exist;
+      expect(payload.user.eids).to.have.lengthOf(7);
+
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[0]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[1]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[2]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[3]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[4]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[5]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[6]);
+    });
+
+    it('IXL and Prebid are mutually exclusive', function () {
+      validIdentityResponse = {
+        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);
+      cloneValidBid[0].userIdAsEids = utils.deepClone(DEFAULT_USERIDASEIDS_DATA);
+
+      const request = spec.buildRequests(cloneValidBid, DEFAULT_OPTION)[0];
+
+      validUserIdPayload = utils.deepClone(DEFAULT_USERID_PAYLOAD);
+      validUserIdPayload.push({
+        source: 'liveintent.com',
+        uids: [{
+          id: '1234-5678-9012-3456',
+          ext: {
+            keyID: '1234-5678',
+            rtiPartner: 'LDID',
+            enc: 1
+          }
+        }]
+      });
+
+      const payload = JSON.parse(request.data.r);
+      expect(payload.user.eids).to.have.lengthOf(6);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[0]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[1]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[2]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[3]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[4]);
+      expect(payload.user.eids).to.deep.include(validUserIdPayload[5]);
+    });
+  });
+
+  describe('getUserIds', function () {
+    it('request should contain userId information if configured and within bid request', function () {
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            { name: 'lotamePanoramaId' },
+            { name: 'merkleId' },
+            { name: 'parrableId' },
+          ]
+        }
+      });
+
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.userId = DEFAULT_USERID_BID_DATA;
+
+      const request = spec.buildRequests([bid], DEFAULT_OPTION)[0];
+      const r = JSON.parse(request.data.r);
+
+      expect(r.ext.ixdiag.userIds).to.be.an('array');
+      expect(r.ext.ixdiag.userIds.should.include('lotamePanoramaId'));
+      expect(r.ext.ixdiag.userIds.should.not.include('merkleId'));
+      expect(r.ext.ixdiag.userIds.should.not.include('parrableId'));
+    });
+  });
+
+  describe('buildRequests', function () {
+    let request = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
+    const requestUrl = request.url;
+    const requestMethod = request.method;
+    const query = request.data;
+
+    const bidWithoutSchain = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+    delete bidWithoutSchain[0].schain;
+    const requestWithoutSchain = spec.buildRequests(bidWithoutSchain, DEFAULT_OPTION)[0];
+    const queryWithoutSchain = requestWithoutSchain.data;
+
+    const bidWithoutMediaType = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+    delete bidWithoutMediaType[0].mediaTypes;
+    bidWithoutMediaType[0].sizes = [[300, 250], [300, 600]];
+    const requestWithoutMediaType = spec.buildRequests(bidWithoutMediaType, DEFAULT_OPTION)[0];
+    const queryWithoutMediaType = requestWithoutMediaType.data;
+
+    it('request should be made to IX endpoint with GET method', function () {
+      expect(requestMethod).to.equal('GET');
+      expect(requestUrl).to.equal(IX_SECURE_ENDPOINT);
+    });
+
+    it('query object (version, siteID and request) should be correct', function () {
+      expect(query.v).to.equal(BANNER_ENDPOINT_VERSION);
+      expect(query.s).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId);
+      expect(query.r).to.exist;
+      expect(query.ac).to.equal('j');
+      expect(query.sd).to.equal(1);
+      expect(query.nf).not.to.exist;
+    });
+
+    it('should send dfp_adunit_code in request if ortb2Imp.ext.data.adserver.adslot exists', function () {
+      const AD_UNIT_CODE = '/19968336/some-adunit-path';
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      validBids[0].ortb2Imp = {
+        ext: {
+          data: {
+            adserver: {
+              name: 'gam',
+              adslot: AD_UNIT_CODE
+            }
+          }
+        }
+      };
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { dfp_ad_unit_code } = JSON.parse(requests[0].data.r).imp[0].ext;
+      expect(dfp_ad_unit_code).to.equal(AD_UNIT_CODE);
+    });
+
+    it('should not send dfp_adunit_code in request if ortb2Imp.ext.data.adserver.adslot does not exists', function () {
+      const validBids = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      const requests = spec.buildRequests(validBids, DEFAULT_OPTION);
+      const { dfp_ad_unit_code } = JSON.parse(requests[0].data.r).imp[0].ext;
+
+      expect(dfp_ad_unit_code).to.not.exist;
+    });
+
+    it('payload should have correct format and value', function () {
+      const payload = JSON.parse(query.r);
+      expect(payload.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidderRequestId);
+      expect(payload.id).to.be.a('string');
+      expect(payload.site).to.exist;
+      expect(payload.site.page).to.equal(DEFAULT_OPTION.refererInfo.referer);
+      expect(payload.site.ref).to.equal(document.referrer);
+      expect(payload.ext).to.exist;
+      expect(payload.ext.source).to.equal('prebid');
+      expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
+      expect(payload.imp).to.exist;
+      expect(payload.imp).to.be.an('array');
+      expect(payload.imp).to.have.lengthOf(2);
+    });
+
+    it('payload should have correct format and value for r.id when bidderRequestId is a number ', function () {
+      const bidWithIntId = utils.deepClone(DEFAULT_BANNER_VALID_BID);
+      bidWithIntId[0].bidderRequestId = 123456;
+
+      request = spec.buildRequests(bidWithIntId, DEFAULT_OPTION)[0];
+
+      const payload = JSON.parse(request.data.r);
+      expect(bidWithIntId[0].bidderRequestId).to.be.a('number');
+      expect(payload.id).to.equal(bidWithIntId[0].bidderRequestId.toString());
+      expect(payload.id).to.be.a('string');
+    });
+
+    it('payload should not include schain when not provided', function () {
+      const payload = JSON.parse(queryWithoutSchain.r);
+      expect(payload.source).to.not.exist; // source object currently only written for schain
+    });
+
+    it('impression should have correct format and value', function () {
       const impression = JSON.parse(query.r).imp[0];
       const sidValue = `${DEFAULT_BANNER_VALID_BID[0].params.size[0].toString()}x${DEFAULT_BANNER_VALID_BID[0].params.size[1].toString()}`;
 
@@ -584,6 +1336,84 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.ext.sid).to.equal(sidValue);
     });
 
+    it('video impression has #priceFloors floors', function () {
+      const bid = utils.deepClone(ONE_VIDEO[0]);
+      const flr = 5.5
+      const floorInfo = {floor: flr, currency: 'USD'};
+      bid.getFloor = function () {
+        return floorInfo;
+      }
+
+      // check if floors are in imp
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+      expect(imp1.bidfloor).to.equal(flr);
+      expect(imp1.bidfloorcur).to.equal('USD');
+      expect(imp1.ext.fl).to.equal('p');
+    });
+
+    it('banner imp has floors from #priceFloors module', function () {
+      const floor300x250 = 3.25
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0])
+
+      const floorInfo = { floor: floor300x250, currency: 'USD' };
+      bid.getFloor = function () {
+        return floorInfo;
+      };
+
+      // check if floors are in imp
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+
+      expect(imp1.bidfloorcur).to.equal('USD');
+      expect(imp1.bidfloor).to.equal(floor300x250);
+      expect(imp1.ext.fl).to.equal('p');
+    });
+
+    it('ix adapter floors chosen over #priceFloors ', function () {
+      const bid = utils.deepClone(ONE_BANNER[0]);
+
+      const floorhi = 4.5
+      const floorlow = 3.5
+
+      bid.params.bidFloor = floorhi
+      bid.params.bidFloorCur = 'USD'
+
+      const floorInfo = { floor: floorlow, currency: 'USD' };
+      bid.getFloor = function () {
+        return floorInfo;
+      };
+
+      // check if floors are in imp
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+      expect(imp1.bidfloor).to.equal(floorhi);
+      expect(imp1.bidfloorcur).to.equal(bid.params.bidFloorCur);
+      expect(imp1.ext.fl).to.equal('x');
+    });
+
+    it(' #priceFloors floors chosen over ix adapter floors', function () {
+      const bid = utils.deepClone(ONE_BANNER[0]);
+
+      const floorhi = 4.5
+      const floorlow = 3.5
+
+      bid.params.bidFloor = floorlow
+      bid.params.bidFloorCur = 'USD'
+
+      const floorInfo = { floor: floorhi, currency: 'USD' };
+      bid.getFloor = function () {
+        return floorInfo;
+      };
+
+      // check if floors are in imp
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+      expect(imp1.bidfloor).to.equal(floorhi);
+      expect(imp1.bidfloorcur).to.equal(bid.params.bidFloorCur);
+      expect(imp1.ext.fl).to.equal('p');
+    });
+
     it('impression should have bidFloor and bidFloorCur if configured', function () {
       const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
       bid.params.bidFloor = 50;
@@ -593,6 +1423,73 @@ describe('IndexexchangeAdapter', function () {
 
       expect(impression.bidfloor).to.equal(bid.params.bidFloor);
       expect(impression.bidfloorcur).to.equal(bid.params.bidFloorCur);
+      expect(impression.ext.fl).to.equal('x');
+    });
+
+    it('missing sizes #priceFloors ', function () {
+      const bid = utils.deepClone(ONE_BANNER[0]);
+      bid.mediaTypes.banner.sizes.push([500, 400])
+
+      const floorInfo = { floor: 3.25, currency: 'USD' };
+      bid.getFloor = function () {
+        return floorInfo;
+      };
+
+      sinon.spy(bid, 'getFloor');
+
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      // called getFloor with 300 x 250
+      expect(bid.getFloor.getCall(0).args[0].mediaType).to.equal('banner');
+      expect(bid.getFloor.getCall(0).args[0].size[0]).to.equal(300);
+      expect(bid.getFloor.getCall(0).args[0].size[1]).to.equal(250);
+
+      // called getFloor with 500 x 400
+      expect(bid.getFloor.getCall(1).args[0].mediaType).to.equal('banner');
+      expect(bid.getFloor.getCall(1).args[0].size[0]).to.equal(500);
+      expect(bid.getFloor.getCall(1).args[0].size[1]).to.equal(400);
+
+      // both will have same floors due to mock getFloor
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+      expect(imp1.bidfloor).to.equal(3.25);
+      expect(imp1.bidfloorcur).to.equal('USD');
+
+      const imp2 = JSON.parse(requestBidFloor.data.r).imp[1];
+      expect(imp2.bidfloor).to.equal(3.25);
+      expect(imp2.bidfloorcur).to.equal('USD');
+    });
+
+    it('#pricefloors inAdUnit, banner impressions should have floors', function () {
+      const bid = utils.deepClone(ONE_BANNER[0]);
+
+      const flr = 4.3
+      bid.floors = {
+        currency: 'USD',
+        schema: {
+          delimiter: '|',
+          fields: ['mediaType', 'size']
+        },
+        values: {
+          'banner|300x250': flr,
+          'banner|600x500': 6.5,
+          'banner|*': 7.5
+        }
+      };
+      const floorInfo = { floor: flr, currency: 'USD' };
+      bid.getFloor = function () {
+        return floorInfo;
+      };
+
+      sinon.spy(bid, 'getFloor');
+
+      const requestBidFloor = spec.buildRequests([bid])[0];
+      // called getFloor with 300 x 250
+      expect(bid.getFloor.getCall(0).args[0].mediaType).to.equal('banner');
+      expect(bid.getFloor.getCall(0).args[0].size[0]).to.equal(300);
+      expect(bid.getFloor.getCall(0).args[0].size[1]).to.equal(250);
+
+      const imp1 = JSON.parse(requestBidFloor.data.r).imp[0];
+      expect(imp1.bidfloor).to.equal(flr);
+      expect(imp1.bidfloorcur).to.equal('USD');
     });
 
     it('payload without mediaType should have correct format and value', function () {
@@ -632,7 +1529,7 @@ describe('IndexexchangeAdapter', function () {
 
       expect(impression.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(impression.banner).to.exist;
-      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
+      expect(impression.banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);// undefined - 300
       expect(impression.banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
       expect(impression.banner.topframe).to.exist;
       expect(impression.banner.topframe).to.be.oneOf([0, 1]);
@@ -672,7 +1569,6 @@ describe('IndexexchangeAdapter', function () {
       const requestWithFirstPartyData = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION)[0];
       const pageUrl = JSON.parse(requestWithFirstPartyData.data.r).site.page;
       const expectedPageUrl = DEFAULT_OPTION.refererInfo.referer + '?ab=123&cd=123%23ab&e%2Ff=456&h%3Fg=456%23cd';
-
       expect(pageUrl).to.equal(expectedPageUrl);
     });
 
@@ -735,6 +1631,7 @@ describe('IndexexchangeAdapter', function () {
       const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], DEFAULT_VIDEO_VALID_BID[0]]);
 
       const bannerImp = JSON.parse(request[0].data.r).imp[0];
+      expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(2);
       expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
       expect(bannerImp.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
       expect(bannerImp.id).to.equal(DEFAULT_BANNER_VALID_BID[0].bidId);
@@ -749,6 +1646,196 @@ describe('IndexexchangeAdapter', function () {
       expect(videoImp.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
       expect(videoImp.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
     });
+
+    it('single request under 8k size limit for large ad unit', function () {
+      const options = {};
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = div_many_sizes;
+      const requests = spec.buildRequests([bid1], options);
+
+      const reqSize = new Blob([`${requests[0].url}?${utils.parseQueryStringParameters(requests[0].data)}`]).size;
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(1);
+      expect(reqSize).to.be.lessThan(8000);
+    });
+
+    it('2 requests due to 2 ad units, one larger than url size', function () {
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = div_many_sizes;
+      bid1.params.siteId = '124';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = '152e36d1-1241-4242-t35e-y1dv34d12315';
+      bid1.bidId = '2f6g5s5e';
+
+      const requests = spec.buildRequests([bid1, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(2);
+      expect(requests[0].data.sn).to.be.equal(0);
+      expect(requests[1].data.sn).to.be.equal(1);
+    });
+
+    it('6 ad units should generate only 4 requests', function () {
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = div_many_sizes;
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+
+      const bid4 = utils.deepClone(bid1);
+      bid4.transactionId = 'tr4';
+
+      const bid5 = utils.deepClone(bid1);
+      bid5.transactionId = 'tr5';
+
+      const bid6 = utils.deepClone(bid1);
+      bid6.transactionId = 'tr6';
+
+      const requests = spec.buildRequests([bid1, bid2, bid3, bid4, bid5, bid6], DEFAULT_OPTION);
+
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(4);
+
+      // check if seq number increases
+      for (var i = 0; i < requests.length; i++) {
+        const reqSize = new Blob([`${requests[i].url}?${utils.parseQueryStringParameters(requests[i].data)}`]).size;
+        expect(reqSize).to.be.lessThan(8000);
+        let payload = JSON.parse(requests[i].data.r);
+        if (requests.length > 1) {
+          expect(requests[i].data.sn).to.equal(i);
+        }
+        expect(payload.source.ext.schain).to.deep.equal(SAMPLE_SCHAIN);
+      }
+    });
+
+    it('multiple ad units in one request', function () {
+      const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid1.mediaTypes.banner.sizes = [[300, 250], [300, 600], [100, 200]];
+      bid1.params.siteId = '121';
+      bid1.adUnitCode = 'div-gpt-1'
+      bid1.transactionId = 'tr1';
+      bid1.bidId = '2f6g5s5e';
+
+      const bid2 = utils.deepClone(bid1);
+      bid2.transactionId = 'tr2';
+      bid2.mediaTypes.banner.sizes = [[220, 221], [222, 223], [300, 250]];
+      const bid3 = utils.deepClone(bid1);
+      bid3.transactionId = 'tr3';
+      bid3.mediaTypes.banner.sizes = [[330, 331], [332, 333], [300, 250]];
+
+      const requests = spec.buildRequests([bid1, bid2, bid3], DEFAULT_OPTION);
+      expect(requests).to.be.an('array');
+      expect(requests).to.have.lengthOf(1);
+
+      const impressions = JSON.parse(requests[0].data.r).imp;
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(9);
+    });
+
+    it('request should contain the extra banner ad sizes that IX is not configured for using the first site id in the ad unit', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.sizes.push([336, 280], [970, 90]);
+      bid.mediaTypes.banner.sizes.push([336, 280], [970, 90]);
+      const bid2 = utils.deepClone(bid);
+      bid2.params.siteId = '124';
+      bid2.params.size = [300, 600];
+      bid2.params.bidId = '2b3c4d5e';
+
+      const request = spec.buildRequests([bid, bid2], DEFAULT_OPTION)[0];
+      const impressions = JSON.parse(request.data.r).imp;
+
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(4);
+
+      expect(impressions[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString())
+      expect(impressions[1].ext.siteID).to.equal(bid2.params.siteId)
+      expect(impressions[2].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString())
+      expect(impressions[3].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString())
+
+      expect(impressions[0].banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
+      expect(impressions[0].banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
+      expect(impressions[1].banner.w).to.equal(bid2.params.size[0]);
+      expect(impressions[1].banner.h).to.equal(bid2.params.size[1]);
+      expect(impressions[2].banner.w).to.equal(bid.mediaTypes.banner.sizes[2][0]);
+      expect(impressions[2].banner.h).to.equal(bid.mediaTypes.banner.sizes[2][1]);
+      expect(impressions[3].banner.w).to.equal(bid.mediaTypes.banner.sizes[3][0]);
+      expect(impressions[3].banner.h).to.equal(bid.mediaTypes.banner.sizes[3][1]);
+    });
+
+    it('request should contain the extra banner ad sizes and their corresponding site ids when there is multiple ad units', function () {
+      const bid = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+      bid.params.siteId = '124';
+      bid.adUnitCode = 'div-gpt-ad-156456451554-1'
+      bid.transactionId = '152e36d1-1241-4242-t35e-y1dv34d12315';
+      bid.bidId = '2f6g5s5e';
+      bid.params.size = [336, 280]
+      bid.sizes = [[336, 280], [970, 90]]
+      bid.mediaTypes.banner.sizes = [[336, 280], [970, 90]]
+
+      const request = spec.buildRequests([DEFAULT_BANNER_VALID_BID[0], bid], DEFAULT_OPTION)[0];
+
+      const impressions = JSON.parse(request.data.r).imp;
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(4);
+      expect(impressions[0].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
+      expect(impressions[1].ext.siteID).to.equal(bid.params.siteId);
+      expect(impressions[2].ext.siteID).to.equal(DEFAULT_BANNER_VALID_BID[0].params.siteId.toString());
+      expect(impressions[3].ext.siteID).to.equal(bid.params.siteId);
+
+      expect(impressions[0].banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[0]);
+      expect(impressions[0].banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].params.size[1]);
+
+      expect(impressions[1].banner.w).to.equal(bid.params.size[0]);
+      expect(impressions[1].banner.h).to.equal(bid.params.size[1]);
+
+      expect(impressions[2].banner.w).to.equal(DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[1][0]);
+      expect(impressions[2].banner.h).to.equal(DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[1][1]);
+
+      expect(impressions[3].banner.w).to.equal(bid.mediaTypes.banner.sizes[1][0]);
+      expect(impressions[3].banner.h).to.equal(bid.mediaTypes.banner.sizes[1][1]);
+
+      expect(impressions[0].ext.sid).to.equal(`${DEFAULT_BANNER_VALID_BID[0].params.size[0].toString()}x${DEFAULT_BANNER_VALID_BID[0].params.size[1].toString()}`);
+      expect(impressions[1].ext.sid).to.equal(`${bid.params.size[0].toString()}x${bid.params.size[1].toString()}`);
+
+      expect(impressions[2].ext.sid).to.equal(`${DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[1][0].toString()}x${DEFAULT_BANNER_VALID_BID[0].mediaTypes.banner.sizes[1][1].toString()}`);
+      expect(impressions[3].ext.sid).to.equal(`${bid.mediaTypes.banner.sizes[1][0].toString()}x${bid.mediaTypes.banner.sizes[1][1].toString()}`);
+    });
+
+    it('request should not contain the extra video ad sizes that IX is not configured for', function () {
+      const request = spec.buildRequests(DEFAULT_VIDEO_VALID_BID, DEFAULT_OPTION);
+      const impressions = JSON.parse(request[0].data.r).imp;
+
+      expect(impressions).to.be.an('array');
+      expect(impressions).to.have.lengthOf(1);
+    });
+
+    describe('detect missing sizes', function () {
+      beforeEach(function () {
+        config.setConfig({
+          ix: {
+            detectMissingSizes: false
+          }
+        });
+      })
+
+      it('request should not contain missing sizes if detectMissingSizes = false', function () {
+        const bid1 = utils.deepClone(DEFAULT_BANNER_VALID_BID[0]);
+        bid1.mediaTypes.banner.sizes = div_many_sizes;
+
+        const requests = spec.buildRequests([bid1, DEFAULT_BANNER_VALID_BID[0]], DEFAULT_OPTION);
+
+        const impressions = JSON.parse(requests[0].data.r).imp;
+
+        expect(impressions).to.be.an('array');
+        expect(impressions).to.have.lengthOf(2);
+      });
+    });
   });
 
   describe('buildRequestVideo', function () {
@@ -783,37 +1870,132 @@ describe('IndexexchangeAdapter', function () {
       expect(impression.video.skippable).to.equal(false);
       expect(impression.ext).to.exist;
       expect(impression.ext.siteID).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
+      expect(impression.ext.sid).to.equal(sidValue); // TODO undefined - 400x600
     });
 
-    it('impression should have correct format when mediaType is specified.', function () {
+    it('should set correct placement if context is outstream', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
-      delete bid.mediaTypes;
-      bid.mediaType = 'video';
-      const requestBidFloor = spec.buildRequests([bid])[0];
-      const impression = JSON.parse(requestBidFloor.data.r).imp[0];
-      const sidValue = `${DEFAULT_VIDEO_VALID_BID[0].params.size[0].toString()}x${DEFAULT_VIDEO_VALID_BID[0].params.size[1].toString()}`;
+      bid.mediaTypes.video.context = 'outstream';
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
 
       expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
       expect(impression.video).to.exist;
-      expect(impression.video.w).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[0]);
-      expect(impression.video.h).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.size[1]);
-      expect(impression.video.placement).to.not.exist;
-      expect(impression.ext).to.exist;
-      expect(impression.ext.siteID).to.equal(DEFAULT_VIDEO_VALID_BID[0].params.siteId.toString());
-      expect(impression.ext.sid).to.equal(sidValue);
+      expect(impression.video.placement).to.exist;
+      expect(impression.video.placement).to.equal(4);
     });
 
-    it('should set correct placement if context is outstream', function () {
+    it('should handle unexpected context', function() {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'VaccineJanssen';
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+      expect(impression.video.placement).to.be.undefined;
+    });
+
+    it('should not override video properties if they are already configured at the params video level', function () {
       const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
       bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.protocols = [1];
+      bid.mediaTypes.video.mimes = ['video/override'];
       const request = spec.buildRequests([bid])[0];
       const impression = JSON.parse(request.data.r).imp[0];
 
-      expect(impression.id).to.equal(DEFAULT_VIDEO_VALID_BID[0].bidId);
-      expect(impression.video).to.exist;
-      expect(impression.video.placement).to.exist;
-      expect(impression.video.placement).to.equal(4);
+      expect(impression.video.protocols[0]).to.equal(2);
+      expect(impression.video.mimes[0]).to.not.equal('video/override');
+    });
+
+    it('should not add video adunit level properties in imp object if they are not allowlisted', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      bid.mediaTypes.video.random = true;
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.video.random).to.not.exist;
+    });
+
+    it('should add allowlisted adunit level video properties in imp object if they are not configured at params level', function () {
+      const bid = utils.deepClone(DEFAULT_VIDEO_VALID_BID[0]);
+      bid.mediaTypes.video.context = 'outstream';
+      delete bid.params.video.protocols;
+      delete bid.params.video.mimes;
+      bid.mediaTypes.video.protocols = [6];
+      bid.mediaTypes.video.mimes = ['video/mp4'];
+      bid.mediaTypes.video.api = 2;
+      const request = spec.buildRequests([bid])[0];
+      const impression = JSON.parse(request.data.r).imp[0];
+
+      expect(impression.video.protocols[0]).to.equal(6);
+      expect(impression.video.api).to.equal(2);
+      expect(impression.video.mimes[0]).to.equal('video/mp4');
+    });
+  });
+
+  describe('buildRequestMultiFormat', function () {
+    describe('only banner bidder params set', function () {
+      const request = spec.buildRequests(DEFAULT_MULTIFORMAT_BANNER_VALID_BID)
+
+      const bannerImp = JSON.parse(request[0].data.r).imp[0];
+      expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(2);
+      expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+      expect(bannerImp.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
+      expect(bannerImp.banner).to.exist;
+      expect(bannerImp.banner.w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
+      expect(bannerImp.banner.h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
+    });
+
+    describe('only video bidder params set', function () {
+      it('should generate video impression', function () {
+        const request = spec.buildRequests(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID);
+        const videoImp = JSON.parse(request[1].data.r).imp[0];
+        expect(JSON.parse(request[1].data.r).imp).to.have.lengthOf(1);
+        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+        expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImp.video).to.exist;
+        expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[0]);
+        expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].params.size[1]);
+      });
+      it('should get missing sizes count 0 when params.size not used', function () {
+        const bid = utils.deepClone(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]);
+        delete bid.params.size;
+        const request = spec.buildRequests([bid]);
+        const diagObj = JSON.parse(request[0].data.r).ext.ixdiag;
+        expect(diagObj.msd).to.equal(0);
+        expect(diagObj.msi).to.equal(0);
+      });
+    });
+    describe('both banner and video bidder params set', function () {
+      const request = spec.buildRequests([DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0], DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0]]);
+
+      it('should return valid banner and video requests', function () {
+        const bannerImp = JSON.parse(request[0].data.r).imp[0];
+        expect(JSON.parse(request[0].data.r).imp).to.have.lengthOf(4);
+        expect(JSON.parse(request[0].data.v)).to.equal(BANNER_ENDPOINT_VERSION);
+        expect(bannerImp.id).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].bidId);
+        expect(bannerImp.banner).to.exist;
+        expect(bannerImp.banner.w).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[0]);
+        expect(bannerImp.banner.h).to.equal(DEFAULT_MULTIFORMAT_BANNER_VALID_BID[0].params.size[1]);
+
+        const videoImp = JSON.parse(request[1].data.r).imp[0];
+        expect(JSON.parse(request[1].data.r).imp).to.have.lengthOf(1);
+        expect(JSON.parse(request[1].data.v)).to.equal(VIDEO_ENDPOINT_VERSION);
+        expect(videoImp.id).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].bidId);
+        expect(videoImp.video).to.exist;
+        expect(videoImp.video.w).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[0]);
+        expect(videoImp.video.h).to.equal(DEFAULT_MULTIFORMAT_VIDEO_VALID_BID[0].mediaTypes.video.playerSize[1]);
+      });
+
+      it('should contain all correct IXdiag properties', function () {
+        const diagObj = JSON.parse(request[0].data.r).ext.ixdiag;
+        expect(diagObj.iu).to.equal(0);
+        expect(diagObj.nu).to.equal(0);
+        expect(diagObj.ou).to.equal(2);
+        expect(diagObj.ren).to.equal(false);
+        expect(diagObj.mfu).to.equal(2);
+        expect(diagObj.allu).to.equal(2);
+        expect(diagObj.version).to.equal('$prebid.version$');
+      });
     });
   });
 
@@ -831,11 +2013,11 @@ describe('IndexexchangeAdapter', function () {
           currency: 'USD',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
@@ -843,6 +2025,30 @@ describe('IndexexchangeAdapter', function () {
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
+    it('should get correct bid response for banner ad with missing adomain', 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'
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE_WITHOUT_ADOMAIN }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      expect(result[0]).to.deep.equal(expectedParse[0]);
+    });
+
     it('should set creativeId to default value if not provided', function () {
       const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
       delete bidResponse.seatbid[0].bid[0].crid;
@@ -858,11 +2064,11 @@ describe('IndexexchangeAdapter', function () {
           currency: 'USD',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
@@ -884,11 +2090,11 @@ describe('IndexexchangeAdapter', function () {
           currency: 'JPY',
           ttl: 300,
           netRevenue: true,
-          dealId: undefined,
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
           }
         }
       ];
@@ -896,9 +2102,10 @@ describe('IndexexchangeAdapter', function () {
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
-    it('should set dealId correctly', function () {
+    it('should prioritize bid[].dealid over bid[].ext.dealid ', function () {
       const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
-      bidResponse.seatbid[0].bid[0].ext.dealid = 'deal';
+      bidResponse.seatbid[0].bid[0].ext.dealid = 'ext-deal';
+      bidResponse.seatbid[0].bid[0].dealid = 'outter-deal';
       const expectedParse = [
         {
           requestId: '1a2b3c4d',
@@ -911,11 +2118,39 @@ describe('IndexexchangeAdapter', function () {
           currency: 'USD',
           ttl: 300,
           netRevenue: true,
-          dealId: 'deal',
+          dealId: 'outter-deal',
           meta: {
             networkId: 50,
             brandId: 303325,
-            brandName: 'OECTA'
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+
+      expect(result[0].dealId).to.equal(expectedParse[0].dealId);
+    });
+
+    it('should not set bid[].dealid if dealid is not present', function () {
+      const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      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']
           }
         }
       ];
@@ -923,6 +2158,34 @@ describe('IndexexchangeAdapter', function () {
       expect(result[0]).to.deep.equal(expectedParse[0]);
     });
 
+    it('should use set bid[].ext.dealid if bid[].dealid is not present', function () {
+      const bidResponse = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      bidResponse.seatbid[0].bid[0].ext.dealid = 'ext-deal';
+      const expectedParse = [
+        {
+          requestId: '1a2b3c4d',
+          cpm: 1,
+          creativeId: '12345',
+          width: 300,
+          height: 250,
+          mediaType: 'banner',
+          ad: '',
+          currency: 'USD',
+          ttl: 300,
+          dealId: 'ext-deal',
+          netRevenue: true,
+          meta: {
+            networkId: 50,
+            brandId: 303325,
+            brandName: 'OECTA',
+            advertiserDomains: ['www.abc.com']
+          }
+        }
+      ];
+      const result = spec.interpretResponse({ body: bidResponse }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      expect(result[0].dealId).to.deep.equal(expectedParse[0].dealId);
+    });
+
     it('should get correct bid response for video ad', function () {
       const expectedParse = [
         {
@@ -935,12 +2198,12 @@ describe('IndexexchangeAdapter', function () {
           currency: 'USD',
           ttl: 3600,
           netRevenue: true,
-          dealId: undefined,
           vastUrl: 'www.abcd.com/vast',
           meta: {
             networkId: 51,
             brandId: 303326,
-            brandName: 'OECTB'
+            brandName: 'OECTB',
+            advertiserDomains: ['www.abcd.com']
           }
         }
       ];
@@ -980,6 +2243,26 @@ describe('IndexexchangeAdapter', function () {
       expect(requestWithoutreferInfo.site.page).to.equal(options.refererInfo.referer);
       expect(validBidWithoutreferInfo[0].url).to.equal(IX_SECURE_ENDPOINT);
     });
+
+    it('should set bid[].ttl to seatbid[].bid[].exp value from response', function () {
+      const BANNER_RESPONSE_WITH_EXP = utils.deepClone(DEFAULT_BANNER_BID_RESPONSE);
+      const VIDEO_RESPONSE_WITH_EXP = utils.deepClone(DEFAULT_VIDEO_BID_RESPONSE);
+      VIDEO_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 200;
+      BANNER_RESPONSE_WITH_EXP.seatbid[0].bid[0].exp = 100;
+      const bannerResult = spec.interpretResponse({ body: BANNER_RESPONSE_WITH_EXP }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const videoResult = spec.interpretResponse({ body: VIDEO_RESPONSE_WITH_EXP }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+
+      expect(bannerResult[0].ttl).to.equal(100);
+      expect(videoResult[0].ttl).to.equal(200);
+    });
+
+    it('should default bid[].ttl if seat[].bid[].exp is not in the resposne', function () {
+      const bannerResult = spec.interpretResponse({ body: DEFAULT_BANNER_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+      const videoResult = spec.interpretResponse({ body: DEFAULT_VIDEO_BID_RESPONSE }, { data: DEFAULT_BIDDER_REQUEST_DATA });
+
+      expect(bannerResult[0].ttl).to.equal(300);
+      expect(videoResult[0].ttl).to.equal(3600);
+    });
   });
 
   describe('bidrequest consent', function () {
@@ -1059,5 +2342,54 @@ describe('IndexexchangeAdapter', function () {
       expect(requestWithConsent.regs.ext.gdpr).to.equal(1);
       expect(requestWithConsent.regs.ext.us_privacy).to.equal('1YYN');
     });
+
+    it('should contain `consented_providers_settings.consented_providers` & consent on user.ext when both are provided', function () {
+      const options = {
+        gdprConsent: {
+          consentString: '3huaa11=qu3198ae',
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      expect(requestWithConsent.user.ext.consented_providers_settings.consented_providers).to.equal('1~1.35.41.101');
+      expect(requestWithConsent.user.ext.consent).to.equal('3huaa11=qu3198ae');
+    });
+
+    it('should not contain `consented_providers_settings.consented_providers` on user.ext when consent is not provided', function () {
+      const options = {
+        gdprConsent: {
+          addtlConsent: '1~1.35.41.101',
+        }
+      };
+
+      const validBidWithConsent = spec.buildRequests(DEFAULT_BANNER_VALID_BID, options);
+      const requestWithConsent = JSON.parse(validBidWithConsent[0].data.r);
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consented_providers_settings')).to.not.exist;
+      expect(utils.deepAccess(requestWithConsent, 'user.ext.consent')).to.not.exist;
+    });
+
+    it('should set coppa to 1 in config when enabled', () => {
+      config.setConfig({ coppa: true })
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = JSON.parse(bid[0].data.r);
+
+      expect(r.regs.coppa).to.equal(1);
+    });
+    it('should not set coppa in config when disabled', () => {
+      config.setConfig({ coppa: false })
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = JSON.parse(bid[0].data.r);
+
+      expect(r.regs.coppa).to.be.undefined;
+    });
+    it('should not set coppa when not specified in config', () => {
+      config.resetConfig();
+      const bid = spec.buildRequests(DEFAULT_BANNER_VALID_BID, DEFAULT_OPTION);
+      const r = JSON.parse(bid[0].data.r);
+
+      expect(r.regs.coppa).to.be.undefined;
+    });
   });
 });
diff --git a/test/spec/modules/jixieBidAdapter_spec.js b/test/spec/modules/jixieBidAdapter_spec.js
new file mode 100644
index 00000000000..ae58da30f64
--- /dev/null
+++ b/test/spec/modules/jixieBidAdapter_spec.js
@@ -0,0 +1,604 @@
+import { expect } from 'chai';
+import { spec, internal as jixieaux, storage } from 'modules/jixieBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+
+describe('jixie Adapter', function () {
+  const pageurl_ = 'https://testdomain.com/testpage.html';
+  const domain_ = 'https://testdomain.com';
+  const device_ = 'desktop';
+  const timeout_ = 1000;
+  const currency_ = 'USD';
+
+  /**
+   * Basic
+   */
+  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');
+    });
+  });
+
+  /**
+   * isBidRequestValid
+   */
+  describe('isBidRequestValid', function () {
+    let bid = {
+      'bidder': 'jixie',
+      'params': {
+        'unit': 'prebidsampleunit'
+      },
+      '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 false when required params obj does not exist', function () {
+      let bid0 = Object.assign({}, bid);
+      delete bid0.params;
+      expect(spec.isBidRequestValid(bid0)).to.equal(false);
+    });
+
+    it('should return false when params obj does not contain unit property', function () {
+      let bid1 = Object.assign({}, bid);
+      bid1.params = { rubbish: '' };
+      expect(spec.isBidRequestValid(bid1)).to.equal(false);
+    });
+  });// describe
+
+  /**
+   * buildRequests
+   */
+  describe('buildRequests', function () {
+    const adUnitCode0_ = 'adunit-code-0';
+    const adUnitCode1_ = 'adunit-code-1';
+    const adUnitCode2_ = 'adunit-code-2';
+
+    const bidId0_ = '22a9eb5004cf082';
+    const bidId1_ = '230fceb12fd754f';
+    const bidId2_ = '24dbe5c4fb80ed8';
+
+    const bidderRequestId_ = '2131ce076eeaa1b';
+    const auctionId_ = '26d68819-d6ce-4a2c-a4d3-f1a97b159d66';
+
+    const clientIdTest1_ = '1aba6a40-f711-11e9-868c-53a2ae972xxx';
+    const sessionIdTest1_ = '1594782644-1aba6a40-f711-11e9-868c-53a2ae972xxx';
+
+    // to serve as the object that prebid will call jixie buildRequest with: (param2)
+    const bidderRequest_ = {
+      refererInfo: {referer: pageurl_},
+      auctionId: auctionId_,
+      timeout: timeout_
+    };
+    // to serve as the object that prebid will call jixie buildRequest with: (param1)
+    let bidRequests_ = [
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'adUnitCode': adUnitCode0_,
+        'bidId': bidId0_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      },
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': adUnitCode1_,
+        'bidId': bidId1_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      },
+      {
+        'bidder': 'jixie',
+        'params': {
+          'unit': 'prebidsampleunit'
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'adUnitCode': adUnitCode2_,
+        'bidId': bidId2_,
+        'bidderRequestId': bidderRequestId_,
+        'auctionId': auctionId_
+      }
+    ];
+
+    // To serve as a reference to check against the bids array portion of the blob that the call to
+    // buildRequest returns
+    const refBids_ = [
+      {
+        'bidId': bidId0_,
+        'adUnitCode': adUnitCode0_,
+        'sizes': [[300, 250], [300, 600]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      },
+      {
+        'bidId': bidId1_,
+        'adUnitCode': adUnitCode1_,
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'sizes': [[300, 250]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      },
+      {
+        'bidId': bidId2_,
+        'adUnitCode': adUnitCode2_,
+        'mediaTypes': {
+          'video': {
+            'playerSize': [640, 360]
+          },
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'sizes': [[300, 250], [300, 600]],
+        'params': {
+          'unit': 'prebidsampleunit'
+        }
+      }
+    ];
+
+    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)
+      // The next next below we check
+      const request = spec.buildRequests(bidRequests_, bidderRequest_);
+      it('sends bid request to ENDPOINT via POST', function () {
+        expect(request.method).to.equal('POST')
+      })
+      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_);
+    });// it
+
+    it('should attach valid params to the adserver endpoint (2)', function () {
+      // similar to above test case but here we force some clientid sessionid values
+      // and domain, pageurl
+      // get the interceptors ready:
+      let getCookieStub = sinon.stub(storage, 'getCookie');
+      let getLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+      getCookieStub
+        .withArgs('_jx')
+        .returns(clientIdTest1_);
+      getCookieStub
+        .withArgs('_jxs')
+        .returns(sessionIdTest1_);
+      getLocalStorageStub
+        .withArgs('_jx')
+        .returns(clientIdTest1_);
+      getLocalStorageStub
+        .withArgs('_jxs')
+        .returns(sessionIdTest1_
+        );
+      let miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
+      miscDimsStub
+        .returns({ device: device_, pageurl: pageurl_, domain: domain_ });
+
+      // actual api call:
+      const request = spec.buildRequests(bidRequests_, bidderRequest_);
+      it('sends bid request to ENDPOINT via POST', function () {
+        expect(request.method).to.equal('POST')
+      })
+      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_);
+      expect(payload).to.have.property('session_id_ls', sessionIdTest1_);
+      expect(payload).to.have.property('device', device_);
+      expect(payload).to.have.property('domain', domain_);
+      expect(payload).to.have.property('pageurl', pageurl_);
+      expect(payload).to.have.property('timeout', timeout_);
+      expect(payload).to.have.property('currency', currency_);
+      expect(payload).to.have.property('bids').that.deep.equals(refBids_);
+
+      // unwire interceptors
+      getCookieStub.restore();
+      getLocalStorageStub.restore();
+      miscDimsStub.restore();
+    });// it
+  });// describe
+
+  /**
+   * interpretResponse:
+   */
+  const JX_OTHER_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.io/dummyscript.js';
+  const JX_OUTSTREAM_RENDERER_URL = 'https://scripts.jixie.io/jxhboutstream.js';
+
+  const mockVastXml_ = `JXADSERVERAlway%20Live%20Prebid%20CreativeHybrid in-stream00:00:10`;
+  const responseBody_ = {
+    'bids': [
+      // video (vast tag url) returned here
+      {
+        'trackingUrlBase': 'https://tr.jixie.io/sync/ad?',
+        'jxBidId': '62847e4c696edcb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '62847e4c696edcb',
+        'cpm': 2.19,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'adUnitCode': 'demoslot3-div',
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie522',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'VIDEO'
+        },
+        'vastUrl': 'https://ad.jixie.io/v1/video?creativeid=522'
+      },
+      // display ad returned here: This one there is advertiserDomains
+      // in the response . Will be checked in the unit tests below
+      {
+        'trackingUrlBase': 'https://tr.jixie.io/sync/ad?',
+        'jxBidId': '600c9ae6fda1acb-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '600c9ae6fda1acb',
+        'cpm': 1.999,
+        'width': 300,
+        'height': 250,
+        'ttl': 300,
+        'adUnitCode': 'demoslot1-div',
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie520',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'advertiserDomains': [
+            'advdom1',
+            'advdom2',
+            'advdom3'
+          ],
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'BANNER'
+        },
+        'ad': '
   
'
+      },
+      // outstream, jx non-default renderer specified:
+      {
+        'trackingUrlBase': 'https://tr.jixie.io/sync/ad?',
+        'jxBidId': '99bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '99bc539c81b00ce',
+        'cpm': 2.99,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie521',
+        'adUnitCode': 'demoslot4-div',
+        'osplayer': 'jixie',
+        'osparams': {
+          'script': JX_OTHER_OUTSTREAM_RENDERER_URL
+        },
+        'vastXml': mockVastXml_
+      },
+      // outstream, jx default renderer:
+      {
+        'trackingUrlBase': 'https://tr.jixie.io/sync/ad?',
+        'jxBidId': '61bc539c81b00ce-028d5dee-2c83-44e3-bed1-b75002475cdf',
+        'requestId': '61bc539c81b00ce',
+        'cpm': 1.99,
+        'width': 640,
+        'height': 360,
+        'ttl': 300,
+        'netRevenue': true,
+        'currency': 'USD',
+        'creativeId': 'jixie521',
+        'meta': {
+          'networkId': 123,
+          'networkName': 'network123',
+          'agencyId': 123,
+          'agencyName': 'agency123',
+          'advertiserId': 123,
+          'advertiserName': 'advertiser123',
+          'brandId': 123,
+          'brandName': 'brand123',
+          'primaryCatId': 1,
+          'secondaryCatIds': [
+            2,
+            3,
+            4
+          ],
+          'mediaType': 'VIDEO'
+        },
+        'adUnitCode': 'demoslot2-div',
+        'osplayer': 'jixie',
+        'osparams': {},
+        'vastXml': mockVastXml_
+      }
+    ],
+    'setids': {
+      'client_id': '43aacc10-f643-11ea-8a10-c5fe2d394e7e',
+      'session_id': '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e'
+    },
+  };
+  const requestObj_ =
+  {
+    'method': 'POST',
+    'url': 'http://localhost:8080/v2/hbpost',
+    'data': '{"auctionid":"028d5dee-2c83-44e3-bed1-b75002475cdf","timeout":1000,"currency":"USD","timestamp":1600057934665,"device":"desktop","domain":"mock.com","pageurl":"https://mock.com/tests/jxprebidtest_pbjs.html","bids":[{"bidId":"600c9ae6fda1acb","adUnitCode":"demoslot1-div","mediaTypes":{"banner":{"sizes":[[300,250],[300,600],[728,90]]}},"params":{"unit":"prebidsampleunit"}},{"bidId":"61bc539c81b00ce","adUnitCode":"demoslot2-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"outstream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"99bc539c81b00ce","adUnitCode":"demoslot4-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"outstream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"62847e4c696edcb","adUnitCode":"demoslot3-div","mediaTypes":{"video":{"playerSize":[[640,360]],"context":"instream"}},"params":{"unit":"prebidsampleunit"}},{"bidId":"6360235ab01d2cd","adUnitCode":"woo-div","mediaTypes":{"video":{"context":"outstream","playerSize":[[640,360]]}},"params":{"unit":"80b76fc951e161d7c019d21b6639e408"}},{"bidId":"64d9724c7a5e512","adUnitCode":"test-div","mediaTypes":{"video":{"context":"outstream","playerSize":[[300,250]]}},"params":{"unit":"80b76fc951e161d7c019d21b6639e408"}},{"bidId":"65bea7e80fed44b","adUnitCode":"test-div","mediaTypes":{"banner":{"sizes":[[300,250],[300,600],[728,90]]}},"params":{"unit":"7854f723e932b951b6c51fc80b23a410"}},{"bidId":"6642054c4ba1b7f","adUnitCode":"div-banner-native-1","mediaTypes":{"banner":{"sizes":[[640,360]]},"video":{"context":"outstream","sizes":[[640,361]],"playerSize":[[640,360]]},"native":{"type":"image"}},"params":{"unit":"632e7695f0910ce0fa74c19859060a04"}},{"bidId":"675ecf4b44db228","adUnitCode":"div-banner-native-2","mediaTypes":{"banner":{"sizes":[[300,250]]},"native":{"title":{"required":true},"image":{"required":true},"sponsoredBy":{"required":true}}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"68f2dbf5dc23f94","adUnitCode":"div-Top-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,250],[300,100],[320,50]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"6991cf107bb7f1a","adUnitCode":"div-Middle-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,250],[300,100],[320,50]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}},{"bidId":"706be1b011eac83","adUnitCode":"div-Inside-MediumRectangle","mediaTypes":{"banner":{"sizes":[[300,600],[300,250],[300,100],[320,480]]}},"params":{"unit":"1000008-b1Q2UMQfZx"}}],"client_id_c":"ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95","client_id_ls":"ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95","session_id_c":"","session_id_ls":"1600005388-ebd0dea0-f5c8-11ea-a2c7-a5b37aa7fe95"}',
+    'currency': 'USD'
+  };
+
+  describe('interpretResponse', function () {
+    it('handles nobid responses', function () {
+      expect(spec.interpretResponse({body: {}}, {validBidRequests: []}).length).to.equal(0)
+      expect(spec.interpretResponse({body: []}, {validBidRequests: []}).length).to.equal(0)
+    });
+
+    it('should get correct bid response', function () {
+      let setCookieSpy = sinon.spy(storage, 'setCookie');
+      let setLocalStorageSpy = sinon.spy(storage, 'setDataInLocalStorage');
+      const result = spec.interpretResponse({body: responseBody_}, requestObj_)
+      expect(setLocalStorageSpy.calledWith('_jx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setLocalStorageSpy.calledWith('_jxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jxs', '1600057934-43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+      expect(setCookieSpy.calledWith('_jx', '43aacc10-f643-11ea-8a10-c5fe2d394e7e')).to.equal(true);
+
+      // video ad with vastUrl returned by adserver
+      expect(result[0].requestId).to.equal('62847e4c696edcb')
+      expect(result[0].cpm).to.equal(2.19)
+      expect(result[0].width).to.equal(640)
+      expect(result[0].height).to.equal(360)
+      expect(result[0].creativeId).to.equal('jixie522')
+      expect(result[0].currency).to.equal('USD')
+      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)
+
+      // display ad
+      expect(result[1].requestId).to.equal('600c9ae6fda1acb')
+      expect(result[1].cpm).to.equal(1.999)
+      expect(result[1].width).to.equal(300)
+      expect(result[1].height).to.equal(250)
+      expect(result[1].creativeId).to.equal('jixie520')
+      expect(result[1].currency).to.equal('USD')
+      expect(result[1].netRevenue).to.equal(true)
+      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')
+      expect(result[2].cpm).to.equal(2.99)
+      expect(result[2].width).to.equal(640)
+      expect(result[2].height).to.equal(360)
+      expect(result[2].creativeId).to.equal('jixie521')
+      expect(result[2].currency).to.equal('USD')
+      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);
+
+      // should know to use default outstream renderer
+      expect(result[3].requestId).to.equal('61bc539c81b00ce')
+      expect(result[3].cpm).to.equal(1.99)
+      expect(result[3].width).to.equal(640)
+      expect(result[3].height).to.equal(360)
+      expect(result[3].creativeId).to.equal('jixie521')
+      expect(result[3].currency).to.equal('USD')
+      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)
+
+      setLocalStorageSpy.restore();
+      setCookieSpy.restore();
+    });// it
+  });// describe
+
+  /**
+   * onBidWon
+   */
+  describe('onBidWon', function() {
+    let ajaxStub;
+    let miscDimsStub;
+    beforeEach(function() {
+      miscDimsStub = sinon.stub(jixieaux, 'getMiscDims');
+      ajaxStub = sinon.stub(jixieaux, 'ajax');
+
+      miscDimsStub
+        .returns({ device: device_, pageurl: pageurl_, domain: domain_ });
+    })
+
+    afterEach(function() {
+      miscDimsStub.restore();
+      ajaxStub.restore();
+    })
+
+    let TRACKINGURL_ = 'https://abc.com/sync?action=bidwon';
+
+    it('Should fire if the adserver trackingUrl flag says so', 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_ });
+    })
+
+    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);
+    })
+
+    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();
+    })
+
+    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();
+    })
+  });// describe
+});
diff --git a/test/spec/modules/justpremiumBidAdapter_spec.js b/test/spec/modules/justpremiumBidAdapter_spec.js
index c162b785aed..cb3648cba44 100644
--- a/test/spec/modules/justpremiumBidAdapter_spec.js
+++ b/test/spec/modules/justpremiumBidAdapter_spec.js
@@ -21,7 +21,9 @@ describe('justpremium adapter', function () {
       },
       userId: {
         tdid: '1111111',
-        id5id: '2222222',
+        id5id: {
+          uid: '2222222'
+        },
         digitrustid: {
           data: {
             id: '3333333'
@@ -84,7 +86,7 @@ describe('justpremium adapter', function () {
       expect(jpxRequest.version.jp_adapter).to.equal('1.7')
       expect(jpxRequest.pubcid).to.equal('0000000')
       expect(jpxRequest.uids.tdid).to.equal('1111111')
-      expect(jpxRequest.uids.id5id).to.equal('2222222')
+      expect(jpxRequest.uids.id5id.uid).to.equal('2222222')
       expect(jpxRequest.uids.digitrustid.data.id).to.equal('3333333')
       expect(jpxRequest.us_privacy).to.equal('1YYN')
     })
@@ -101,7 +103,8 @@ describe('justpremium adapter', function () {
             'width': 970,
             'price': 0.52,
             'format': 'lb',
-            'adm': 'creative code'
+            'adm': 'creative code',
+            'adomain': ['justpremium.com']
           }]
         },
         'pass': {
@@ -121,7 +124,10 @@ describe('justpremium adapter', function () {
           netRevenue: true,
           currency: 'USD',
           ttl: 60000,
-          format: 'lb'
+          format: 'lb',
+          meta: {
+            advertiserDomains: ['justpremium.com']
+          },
         }
       ]
 
@@ -138,6 +144,7 @@ describe('justpremium adapter', function () {
       expect(result[0].creativeId).to.equal(3213123)
       expect(result[0].netRevenue).to.equal(true)
       expect(result[0].format).to.equal('lb')
+      expect(result[0].meta.advertiserDomains[0]).to.equal('justpremium.com')
     })
 
     it('Verify wrong server response', function () {
diff --git a/test/spec/modules/jwplayerRtdProvider_spec.js b/test/spec/modules/jwplayerRtdProvider_spec.js
new file mode 100644
index 00000000000..458e45e8ae7
--- /dev/null
+++ b/test/spec/modules/jwplayerRtdProvider_spec.js
@@ -0,0 +1,751 @@
+import { fetchTargetingForMediaId, getVatFromCache, extractPublisherParams,
+  formatTargetingResponse, getVatFromPlayer, enrichAdUnits, addTargetingToBid,
+  fetchTargetingInformation, jwplayerSubmodule } from 'modules/jwplayerRtdProvider.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('jwplayerRtdProvider', function() {
+  const testIdForSuccess = 'test_id_for_success';
+  const testIdForFailure = 'test_id_for_failure';
+  const validSegments = ['test_seg_1', 'test_seg_2'];
+  const responseHeader = {'Content-Type': 'application/json'};
+
+  describe('Fetch targeting for mediaID tests', function () {
+    let request;
+
+    describe('Fetch succeeds', function () {
+      beforeEach(function () {
+        fetchTargetingForMediaId(testIdForSuccess);
+        request = server.requests[0];
+      });
+
+      afterEach(function () {
+        server.respond();
+      });
+
+      it('should reach out to media endpoint', function () {
+        expect(request.url).to.be.eq(`https://cdn.jwplayer.com/v2/media/${testIdForSuccess}`);
+      });
+
+      it('should write to cache when successful', function () {
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            playlist: [
+              {
+                file: 'test.mp4',
+                jwpseg: validSegments
+              }
+            ]
+          })
+        );
+
+        const targetingInfo = getVatFromCache(testIdForSuccess);
+
+        const validTargeting = {
+          segments: validSegments,
+          mediaID: testIdForSuccess
+        };
+
+        expect(targetingInfo).to.deep.equal(validTargeting);
+      });
+    });
+
+    describe('Fetch fails', function () {
+      beforeEach(function () {
+        fetchTargetingForMediaId(testIdForFailure);
+        request = server.requests[0]
+      });
+
+      it('should not write to cache when response is malformed', function() {
+        request.respond('{]');
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when playlist is absent', function() {
+        request.respond({});
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when segments are absent', function() {
+        request.respond(
+          200,
+          responseHeader,
+          JSON.stringify({
+            playlist: [
+              {
+                file: 'test.mp4'
+              }
+            ]
+          })
+        );
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+
+      it('should not write to cache when request errors', function() {
+        request.error();
+        const targetingInfo = getVatFromCache(testIdForFailure);
+        expect(targetingInfo).to.be.null;
+      });
+    });
+  });
+
+  describe('Format targeting response', function () {
+    it('should exclude segment key when absent', function () {
+      const targeting = formatTargetingResponse({ mediaID: 'test' });
+      expect(targeting).to.not.have.property('segments');
+    });
+
+    it('should exclude content block when mediaId is absent', function () {
+      const targeting = formatTargetingResponse({ segments: ['test'] });
+      expect(targeting).to.not.have.property('content');
+    });
+
+    it('should return proper format', function () {
+      const segments = ['123'];
+      const mediaID = 'test';
+      const expectedContentId = 'jw_' + mediaID;
+      const expectedContent = {
+        id: expectedContentId
+      };
+      const targeting = formatTargetingResponse({
+        segments,
+        mediaID
+      });
+      expect(targeting).to.have.deep.property('segments', segments);
+      expect(targeting).to.have.deep.property('content', expectedContent);
+    });
+  });
+
+  describe('Get VAT from player', function () {
+    const mediaIdWithSegment = 'media_ID_1';
+    const mediaIdNoSegment = 'media_ID_2';
+    const mediaIdForCurrentItem = 'media_ID_current';
+    const mediaIdNotCached = 'media_test_ID';
+
+    const validPlayerID = 'player_test_ID_valid';
+    const invalidPlayerID = 'player_test_ID_invalid';
+
+    it('returns null when jwplayer.js is absent from page', function () {
+      const targeting = getVatFromPlayer(invalidPlayerID, mediaIdNotCached);
+      expect(targeting).to.be.null;
+    });
+
+    describe('When jwplayer.js is on page', function () {
+      const playlistItemWithSegmentMock = {
+        mediaid: mediaIdWithSegment,
+        jwpseg: validSegments
+      };
+
+      const targetingForMediaWithSegment = {
+        segments: validSegments,
+        mediaID: mediaIdWithSegment
+      };
+
+      const playlistItemNoSegmentMock = {
+        mediaid: mediaIdNoSegment
+      };
+
+      const currentItemSegments = ['test_seg_3', 'test_seg_4'];
+      const currentPlaylistItemMock = {
+        mediaid: mediaIdForCurrentItem,
+        jwpseg: currentItemSegments
+      };
+      const targetingForCurrentItem = {
+        segments: currentItemSegments,
+        mediaID: mediaIdForCurrentItem
+      };
+
+      const playerInstanceMock = {
+        getPlaylist: function () {
+          return [playlistItemWithSegmentMock, playlistItemNoSegmentMock];
+        },
+
+        getPlaylistItem: function () {
+          return currentPlaylistItemMock;
+        }
+      };
+
+      const jwplayerMock = function(playerID) {
+        if (playerID === validPlayerID) {
+          return playerInstanceMock;
+        } else {
+          return {};
+        }
+      };
+
+      beforeEach(function () {
+        window.jwplayer = jwplayerMock;
+      });
+
+      it('returns null when player ID does not match player on page', function () {
+        const targeting = getVatFromPlayer(invalidPlayerID, mediaIdNotCached);
+        expect(targeting).to.be.null;
+      });
+
+      it('returns segments when media ID matches a playlist item with segments', 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 () {
+        getVatFromPlayer(validPlayerID, mediaIdWithSegment);
+        const vat = getVatFromCache(mediaIdWithSegment);
+        expect(vat.segments).to.deep.equal(validSegments);
+      });
+
+      it('returns segments 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 () {
+        getVatFromPlayer(validPlayerID);
+
+        window.jwplayer = null;
+        const targeting = getVatFromCache(mediaIdForCurrentItem);
+        expect(targeting).to.deep.equal(targetingForCurrentItem);
+      });
+
+      it('returns undefined segments when segments are absent', function () {
+        const targeting = getVatFromPlayer(validPlayerID, mediaIdNoSegment);
+        expect(targeting).to.deep.equal({
+          mediaID: mediaIdNoSegment,
+          segments: undefined
+        });
+      });
+
+      describe('Get Bid Request Data', function () {
+        it('executes immediately while request is active if player has item', function () {
+          const bidRequestSpy = sinon.spy();
+          const fakeServer = sinon.createFakeServer();
+          fakeServer.respondImmediately = false;
+          fakeServer.autoRespond = false;
+
+          fetchTargetingForMediaId(mediaIdWithSegment);
+
+          const bid = {};
+          const adUnit = {
+            ortb2Imp: {
+              ext: {
+                data: {
+                  jwTargeting: {
+                    mediaID: mediaIdWithSegment,
+                    playerID: 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);
+          fakeServer.respond();
+          expect(bidRequestSpy.calledOnce).to.be.true;
+        });
+      });
+    });
+  });
+
+  describe('Enrich ad units', function () {
+    const contentIdForSuccess = 'jw_' + testIdForSuccess;
+    const expectedTargetingForSuccess = {
+      segments: validSegments,
+      content: {
+        id: contentIdForSuccess
+      }
+    };
+    let bidRequestSpy;
+    let fakeServer;
+    let clock;
+
+    beforeEach(function () {
+      bidRequestSpy = sinon.spy();
+
+      fakeServer = sinon.createFakeServer();
+      fakeServer.respondImmediately = false;
+      fakeServer.autoRespond = false;
+
+      clock = sinon.useFakeTimers();
+    });
+
+    afterEach(function () {
+      clock.restore();
+      fakeServer.respond();
+    });
+
+    it('adds targeting when pending request succeeds', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1).to.not.have.property('rtd');
+      expect(bid2).to.not.have.property('rtd');
+
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+    });
+
+    it('immediately adds cached targeting', function () {
+      fetchTargetingForMediaId(testIdForSuccess);
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForSuccess
+              }
+            }
+          }
+        },
+        bids
+      };
+      const request = fakeServer.requests[0];
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          playlist: [
+            {
+              file: 'test.mp4',
+              jwpseg: validSegments
+            }
+          ]
+        })
+      );
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForSuccess);
+    });
+
+    it('adds content block when segments are absent and no request is pending', function () {
+      const expectedTargetingForFailure = {
+        content: {
+          id: 'jw_' + testIdForFailure
+        }
+      };
+      const bids = [
+        {
+          id: 'bid1'
+        },
+        {
+          id: 'bid2'
+        }
+      ];
+      const adUnit = {
+        ortb2Imp: {
+          ext: {
+            data: {
+              jwTargeting: {
+                mediaID: testIdForFailure
+              }
+            }
+          }
+        },
+        bids
+      };
+
+      enrichAdUnits([adUnit]);
+      const bid1 = bids[0];
+      const bid2 = bids[1];
+      expect(bid1.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForFailure);
+      expect(bid2.rtd.jwplayer).to.have.deep.property('targeting', expectedTargetingForFailure);
+    });
+  });
+
+  describe(' Extract Publisher Params', function () {
+    const config = { mediaID: 'test' };
+
+    it('should exclude adUnits that do not support instream video and do not specify jwTargeting', function () {
+      const oustreamAdUnit = { mediaTypes: { video: { context: 'outstream' } } };
+      const oustreamTargeting = extractPublisherParams(oustreamAdUnit, config);
+      expect(oustreamTargeting).to.be.undefined;
+
+      const bannerAdUnit = { mediaTypes: { banner: {} } };
+      const bannerTargeting = extractPublisherParams(bannerAdUnit, config);
+      expect(bannerTargeting).to.be.undefined;
+
+      const targeting = extractPublisherParams({}, config);
+      expect(targeting).to.be.undefined;
+    });
+
+    it('should include ad unit when media type is video and is instream', function () {
+      const adUnit = { mediaTypes: { video: { context: 'instream' } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include banner ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { banner: {} }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should include outstream ad units that specify jwTargeting', function() {
+      const adUnit = { mediaTypes: { video: { context: 'outstream' } }, ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    it('should fallback to config when empty jwTargeting is defined in ad unit', function () {
+      const adUnit = { ortb2Imp: { ext: { data: { jwTargeting: {} } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.deep.equal(config);
+    });
+
+    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 adUnit = { ortb2Imp: { ext: { data: { jwTargeting: { mediaID: expectedMediaID, playerID: expectedPlayerID } } } } };
+      const targeting = extractPublisherParams(adUnit, config);
+      expect(targeting).to.have.property('mediaID', expectedMediaID);
+      expect(targeting).to.have.property('playerID', 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 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);
+    });
+
+    it('should return undefined when Publisher Params are absent', function () {
+      const targeting = extractPublisherParams({}, null);
+      expect(targeting).to.be.undefined;
+    })
+  });
+
+  describe('Add Targeting to Bid', function () {
+    const targeting = {foo: 'bar'};
+
+    it('creates realTimeData when absent from Bid', function () {
+      const targeting = {foo: 'bar'};
+      const bid = {};
+      addTargetingToBid(bid, targeting);
+      expect(bid).to.have.property('rtd');
+      expect(bid).to.have.nested.property('rtd.jwplayer.targeting', targeting);
+    });
+
+    it('adds to existing realTimeData', function () {
+      const otherRtd = {
+        targeting: {
+          seg: 'rtd seg'
+        }
+      };
+
+      const bid = {
+        rtd: {
+          otherRtd
+        }
+      };
+
+      addTargetingToBid(bid, targeting);
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+
+      expect(rtd).to.have.deep.property('otherRtd', otherRtd);
+    });
+
+    it('adds to existing realTimeData.jwplayer', function () {
+      const otherInfo = { seg: 'rtd seg' };
+      const bid = {
+        rtd: {
+          jwplayer: {
+            otherInfo
+          }
+        }
+      };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.otherInfo', otherInfo);
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+
+    it('overrides existing jwplayer.targeting', function () {
+      const otherInfo = { seg: 'rtd seg' };
+      const bid = {
+        rtd: {
+          jwplayer: {
+            targeting: {
+              otherInfo
+            }
+          }
+        }
+      };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+
+    it('creates jwplayer when absent from realTimeData', function () {
+      const bid = { rtd: {} };
+      addTargetingToBid(bid, targeting);
+
+      expect(bid).to.have.property('rtd');
+      const rtd = bid.rtd;
+      expect(rtd).to.have.property('jwplayer');
+      expect(rtd).to.have.nested.property('jwplayer.targeting', targeting);
+    });
+  });
+
+  describe('jwplayerSubmodule', function () {
+    it('successfully instantiates', function () {
+      expect(jwplayerSubmodule.init()).to.equal(true);
+    });
+
+    describe('Get Bid Request Data', function () {
+      const validMediaIDs = ['media_ID_1', 'media_ID_2', 'media_ID_3'];
+      let bidRequestSpy;
+      let fakeServer;
+      let clock;
+      let bidReqConfig;
+
+      beforeEach(function () {
+        bidReqConfig = {
+          adUnits: [
+            {
+              ortb2Imp: {
+                ext: {
+                  data: {
+                    jwTargeting: {
+                      mediaID: validMediaIDs[0]
+                    }
+                  }
+                }
+              },
+              bids: [
+                {}, {}
+              ]
+            },
+            {
+              ortb2Imp: {
+                ext: {
+                  data: {
+                    jwTargeting: {
+                      mediaID: validMediaIDs[1]
+                    }
+                  }
+                }
+              },
+              bids: [
+                {}, {}
+              ]
+            }
+          ]
+        };
+
+        bidRequestSpy = sinon.spy();
+
+        fakeServer = sinon.createFakeServer();
+        fakeServer.respondImmediately = false;
+        fakeServer.autoRespond = false;
+
+        clock = sinon.useFakeTimers();
+      });
+
+      afterEach(function () {
+        clock.restore();
+        fakeServer.respond();
+      });
+
+      it('executes callback immediately when ad units are missing', function () {
+        jwplayerSubmodule.getBidRequestData({ adUnits: [] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('executes callback immediately when no requests are pending', function () {
+        fetchTargetingInformation({
+          mediaIDs: []
+        });
+        jwplayerSubmodule.getBidRequestData(bidReqConfig, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('executes callback only after requests in adUnit complete', function() {
+        fetchTargetingInformation({
+          mediaIDs: validMediaIDs
+        });
+        jwplayerSubmodule.getBidRequestData(bidReqConfig, bidRequestSpy);
+        expect(bidRequestSpy.notCalled).to.be.true;
+
+        const req1 = fakeServer.requests[0];
+        const req2 = fakeServer.requests[1];
+        const req3 = fakeServer.requests[2];
+
+        req1.respond();
+        expect(bidRequestSpy.notCalled).to.be.true;
+
+        req2.respond();
+        expect(bidRequestSpy.calledOnce).to.be.true;
+
+        req3.respond();
+        expect(bidRequestSpy.calledOnce).to.be.true;
+      });
+
+      it('sets targeting data in proper structure', function () {
+        const bid = {};
+        const adUnitWithMediaId = {
+          ortb2Imp: {
+            ext: {
+              data: {
+                jwTargeting: {
+                  mediaID: testIdForSuccess
+                }
+              }
+            }
+          },
+          bids: [
+            bid
+          ]
+        };
+        const adUnitEmpty = {
+          code: 'test_ad_unit_empty'
+        };
+        const expectedContentId = 'jw_' + testIdForSuccess;
+        const expectedTargeting = {
+          segments: validSegments,
+          content: {
+            id: expectedContentId
+          }
+        };
+        jwplayerSubmodule.getBidRequestData({ adUnits: [adUnitWithMediaId, adUnitEmpty] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+      });
+
+      it('excludes segments when absent', function () {
+        const adUnitCode = 'test_ad_unit';
+        const bid = {};
+        const adUnit = {
+          ortb2Imp: {
+            ext: {
+              data: {
+                jwTargeting: {
+                  mediaID: testIdForFailure
+                }
+              }
+            }
+          },
+          bids: [ bid ]
+        };
+        const expectedContentId = 'jw_' + adUnit.ortb2Imp.ext.data.jwTargeting.mediaID;
+        const expectedTargeting = {
+          content: {
+            id: expectedContentId
+          }
+        };
+
+        jwplayerSubmodule.getBidRequestData({ adUnits: [ adUnit ] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid.rtd.jwplayer.targeting).to.not.have.property('segments');
+        expect(bid.rtd.jwplayer.targeting).to.not.have.property('segments');
+        expect(bid.rtd.jwplayer).to.have.deep.property('targeting', expectedTargeting);
+      });
+
+      it('does not modify bid when jwTargeting block is absent', function () {
+        const adUnitCode = 'test_ad_unit';
+        const bid1 = {};
+        const bid2 = {};
+        const bid3 = {};
+        const adUnitWithMediaId = {
+          code: adUnitCode,
+          mediaID: testIdForSuccess,
+          bids: [ bid1 ]
+        };
+        const adUnitEmpty = {
+          code: 'test_ad_unit_empty',
+          bids: [ bid2 ]
+        };
+
+        const adUnitEmptyfpd = {
+          code: 'test_ad_unit_empty_fpd',
+          ortb2Imp: {
+            ext: {
+              id: 'sthg'
+            }
+          },
+          bids: [ bid3 ]
+        };
+
+        jwplayerSubmodule.getBidRequestData({ adUnits: [adUnitWithMediaId, adUnitEmpty, adUnitEmptyfpd] }, bidRequestSpy);
+        expect(bidRequestSpy.calledOnce).to.be.true;
+        expect(bid1).to.not.have.property('rtd');
+        expect(bid2).to.not.have.property('rtd');
+        expect(bid3).to.not.have.property('rtd');
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/kargoBidAdapter_spec.js b/test/spec/modules/kargoBidAdapter_spec.js
index be73e140839..43968bbef5a 100644
--- a/test/spec/modules/kargoBidAdapter_spec.js
+++ b/test/spec/modules/kargoBidAdapter_spec.js
@@ -134,6 +134,21 @@ describe('kargo adapter tests', function () {
       noAdServerCurrency = true;
     }
 
+    function generateGDPR(applies, haveConsent) {
+      var data = {
+        consentString: 'gdprconsentstring',
+        gdprApplies: applies,
+      };
+      return data;
+    }
+
+    function generateGDPRExpect(applies, haveConsent) {
+      return {
+        consent: 'gdprconsentstring',
+        applies: applies,
+      };
+    }
+
     function initializeKruxUser() {
       setLocalStorageItem('kxkar_user', 'rsgr9pnij');
     }
@@ -221,7 +236,7 @@ describe('kargo adapter tests', function () {
       return spec._getSessionId();
     }
 
-    function getExpectedKrakenParams(excludeUserIds, excludeKrux, expectedRawCRB, expectedRawCRBCookie) {
+    function getExpectedKrakenParams(excludeUserIds, excludeKrux, expectedRawCRB, expectedRawCRBCookie, expectedGDPR) {
       var base = {
         timeout: 200,
         requestCount: requestCount++,
@@ -299,6 +314,10 @@ describe('kargo adapter tests', function () {
         rawCRBLocalStorage: expectedRawCRB
       };
 
+      if (expectedGDPR) {
+        base.userIDs['gdpr'] = expectedGDPR;
+      }
+
       if (excludeUserIds === true) {
         base.userIDs = {
           crbIDs: {},
@@ -317,12 +336,16 @@ describe('kargo adapter tests', function () {
       return base;
     }
 
-    function testBuildRequests(excludeTdid, expected) {
+    function testBuildRequests(excludeTdid, expected, gdpr) {
       var clonedBids = JSON.parse(JSON.stringify(bids));
       if (excludeTdid) {
         delete clonedBids[0].userId.tdid;
       }
-      var request = spec.buildRequests(clonedBids, {timeout: 200, uspConsent: '1---', foo: 'bar'});
+      var payload = { timeout: 200, uspConsent: '1---', foo: 'bar' };
+      if (gdpr) {
+        payload['gdprConsent'] = gdpr
+      }
+      var request = spec.buildRequests(clonedBids, payload);
       expected.sessionId = getSessionId();
       sessionIds.push(expected.sessionId);
       var krakenParams = JSON.parse(decodeURIComponent(request.data.slice(5)));
@@ -431,6 +454,15 @@ describe('kargo adapter tests', function () {
       initializeKrgCrb();
       testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle()));
     });
+
+    it('sends gdpr consent', function () {
+      initializeKruxUser();
+      initializeKruxSegments();
+      initializeKrgCrb();
+      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(true, true)), generateGDPR(true, true));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(false, true)), generateGDPR(false, true));
+      testBuildRequests(false, getExpectedKrakenParams(undefined, undefined, getKrgCrb(), getKrgCrbOldStyle(), generateGDPRExpect(false, false)), generateGDPR(false, false));
+    });
   });
 
   describe('response handler', function() {
@@ -505,7 +537,8 @@ describe('kargo adapter tests', function () {
         netRevenue: true,
         currency: 'USD',
         meta: {
-          clickUrl: 'https://foobar.com'
+          clickUrl: 'https://foobar.com',
+          advertiserDomains: ['https://foobar.com']
         }
       }, {
         requestId: '3',
@@ -557,8 +590,8 @@ describe('kargo adapter tests', function () {
       });
     });
 
-    function getUserSyncsWhenAllowed() {
-      return spec.getUserSyncs({iframeEnabled: true});
+    function getUserSyncsWhenAllowed(gdprConsent, usPrivacy) {
+      return spec.getUserSyncs({iframeEnabled: true}, null, gdprConsent, usPrivacy);
     }
 
     function getUserSyncsWhenForbidden() {
@@ -573,17 +606,17 @@ describe('kargo adapter tests', function () {
       shouldSimulateOutdatedBrowser = true;
     }
 
-    function getSyncUrl(index) {
+    function getSyncUrl(index, gdprApplies, gdprConsentString, usPrivacy) {
       return {
         type: 'iframe',
-        url: `https://crb.kargo.com/api/v1/initsyncrnd/${clientId}?seed=3205e885-8d37-4139-b47e-f82cff268000&idx=${index}`
+        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}`
       };
     }
 
-    function getSyncUrls() {
+    function getSyncUrls(gdprApplies, gdprConsentString, usPrivacy) {
       var syncs = [];
       for (var i = 0; i < 5; i++) {
-        syncs[i] = getSyncUrl(i);
+        syncs[i] = getSyncUrl(i, gdprApplies || 0, gdprConsentString || '', usPrivacy || '');
       }
       return syncs;
     }
@@ -605,6 +638,21 @@ describe('kargo adapter tests', function () {
       safelyRun(() => expect(getUserSyncsWhenAllowed()).to.be.an('array').that.is.empty);
     });
 
+    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('pass through us privacy consent', function() {
+      turnOnClientId();
+      safelyRun(() => expect(getUserSyncsWhenAllowed(null, '1YNY')).to.deep.equal(getSyncUrls(0, '', '1YNY')));
+    });
+
+    it('pass through gdpr consent', function() {
+      turnOnClientId();
+      safelyRun(() => expect(getUserSyncsWhenAllowed({ gdprApplies: true, consentString: 'consentstring' })).to.deep.equal(getSyncUrls(1, 'consentstring', '')));
+    });
+
     it('no user syncs when there is outdated browser', function() {
       turnOnClientId();
       simulateOutdatedBrowser();
diff --git a/test/spec/modules/koblerBidAdapter_spec.js b/test/spec/modules/koblerBidAdapter_spec.js
new file mode 100644
index 00000000000..76c2c287989
--- /dev/null
+++ b/test/spec/modules/koblerBidAdapter_spec.js
@@ -0,0 +1,705 @@
+import {expect} from 'chai';
+import {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) {
+  return {
+    auctionId: auctionId || 'c1243d83-0bed-4fdb-8c76-42b456be17d0',
+    timeout: timeout || 2000,
+    refererInfo: {
+      referer: pageUrl || 'example.com'
+    }
+  };
+}
+
+function createValidBidRequest(params, bidId, sizes) {
+  return {
+    adUnitCode: 'adunit-code',
+    bidId: bidId || '22c4871113f461',
+    bidder: 'kobler',
+    bidderRequestId: '15246a574e859f',
+    bidRequestsCount: 1,
+    bidderRequestsCount: 1,
+    mediaTypes: {
+      banner: {
+        sizes: sizes || [[300, 250], [320, 100]]
+      }
+    },
+    params: params || {
+      placementId: 'tpw58278'
+    },
+    transactionTd: '04314114-15bd-4638-8664-bdb8bdc60bff'
+  };
+}
+
+describe('KoblerAdapter', function () {
+  describe('inherited functions', function () {
+    it('exists and is a function', function () {
+      const adapter = newBidder(spec);
+      expect(adapter.callBids).to.exist.and.to.be.a('function');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should not accept a request without bidId as valid', function () {
+      const bid = {
+        params: {
+          someParam: 'abc'
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without params as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589'
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should not accept a request without placementId as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        params: {
+          someParam: 'abc'
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.false;
+    });
+
+    it('should accept a request with bidId and placementId as valid', function () {
+      const bid = {
+        bidId: 'e11768e8-3b71-4453-8698-0a2feb866589',
+        params: {
+          someParam: 'abc',
+          placementId: '8bde0923-1409-4253-9594-495b58d931ba'
+        }
+      };
+
+      const result = spec.isBidRequestValid(bid);
+
+      expect(result).to.be.true;
+    });
+  });
+
+  describe('buildRequests', function () {
+    it('should read data from bidder request', function () {
+      const testUrl = 'kobler.no';
+      const auctionId = '8319af54-9795-4642-ba3a-6f57d6ff9100';
+      const timeout = 5000;
+      const validBidRequests = [createValidBidRequest()];
+      const bidderRequest = createBidderRequest(auctionId, timeout, testUrl);
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.tmax).to.be.equal(timeout);
+      expect(openRtbRequest.id).to.be.equal(auctionId);
+      expect(openRtbRequest.site.page).to.be.equal(testUrl);
+    });
+
+    it('should read data from valid bid requests', function () {
+      const firstSize = [400, 800];
+      const secondSize = [450, 950];
+      const sizes = [firstSize, secondSize];
+      const placementId = 'tsjs86325';
+      const bidId = '3a56a019-4835-4f75-811c-76fac6853a2c';
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: placementId
+          },
+          bidId,
+          sizes
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].id).to.be.equal(bidId);
+      expect(openRtbRequest.imp[0].tagid).to.be.equal(placementId);
+      expect(openRtbRequest.imp[0].banner.w).to.be.equal(firstSize[0]);
+      expect(openRtbRequest.imp[0].banner.h).to.be.equal(firstSize[1]);
+      expect(openRtbRequest.imp[0].banner.format.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].banner.format[0].w).to.be.equal(firstSize[0]);
+      expect(openRtbRequest.imp[0].banner.format[0].h).to.be.equal(firstSize[1]);
+      expect(openRtbRequest.imp[0].banner.format[1].w).to.be.equal(secondSize[0]);
+      expect(openRtbRequest.imp[0].banner.format[1].h).to.be.equal(secondSize[1]);
+    });
+
+    it('should use 0x0 as default size', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          undefined,
+          undefined,
+          []
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].banner.w).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.h).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.format.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].banner.format[0].w).to.be.equal(0);
+      expect(openRtbRequest.imp[0].banner.format[0].h).to.be.equal(0);
+    });
+
+    it('should use 0 as default position', function () {
+      const validBidRequests = [createValidBidRequest()];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].banner.ext.kobler.pos).to.be.equal(0);
+    });
+
+    it('should read zip from valid bid requests', function () {
+      const zip = '700 02';
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: 'nmah8324234',
+            zip: zip
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.device.geo.zip).to.be.equal(zip);
+    });
+
+    it('should read test from valid bid requests', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: 'zwop842799',
+            test: true
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.test).to.be.equal(1);
+    });
+
+    it('should read floorPrice from valid bid requests', function () {
+      const floorPrice = 4.343;
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: 'oqr3224234',
+            floorPrice: floorPrice
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].bidfloor).to.be.equal(floorPrice);
+    });
+
+    it('should read position from valid bid requests', function () {
+      const placementId = 'yzksf234592';
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: placementId,
+            position: 1
+          }
+        ),
+        createValidBidRequest(
+          {
+            placementId: placementId,
+            position: 2
+          }
+        ),
+        createValidBidRequest(
+          {
+            placementId: placementId,
+            position: 3
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(3);
+      expect(openRtbRequest.imp[0].banner.ext.kobler.pos).to.be.equal(1);
+      expect(openRtbRequest.imp[0].tagid).to.be.equal(placementId);
+      expect(openRtbRequest.imp[1].banner.ext.kobler.pos).to.be.equal(2);
+      expect(openRtbRequest.imp[1].tagid).to.be.equal(placementId);
+      expect(openRtbRequest.imp[2].banner.ext.kobler.pos).to.be.equal(3);
+      expect(openRtbRequest.imp[2].tagid).to.be.equal(placementId);
+    });
+
+    it('should read dealIds from valid bid requests', function () {
+      const dealIds1 = ['78214682234823'];
+      const dealIds2 = ['89913861235234', '27368423545328640'];
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: 'rsl1239823',
+            dealIds: dealIds1
+          }
+        ),
+        createValidBidRequest(
+          {
+            placementId: 'pqw234232',
+            dealIds: dealIds2
+          }
+        )
+      ];
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].pmp.deals.length).to.be.equal(1);
+      expect(openRtbRequest.imp[0].pmp.deals[0].id).to.be.equal(dealIds1[0]);
+      expect(openRtbRequest.imp[1].pmp.deals.length).to.be.equal(2);
+      expect(openRtbRequest.imp[1].pmp.deals[0].id).to.be.equal(dealIds2[0]);
+      expect(openRtbRequest.imp[1].pmp.deals[1].id).to.be.equal(dealIds2[1]);
+    });
+
+    it('should read timeout from config', function () {
+      const timeout = 4000;
+      const validBidRequests = [createValidBidRequest()];
+      // No timeout field
+      const bidderRequest = {
+        auctionId: 'c1243d83-0bed-4fdb-8c76-42b456be17d0',
+        refererInfo: {
+          referer: 'example.com'
+        }
+      };
+      config.setConfig({
+        bidderTimeout: timeout
+      });
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.tmax).to.be.equal(timeout);
+    });
+
+    it('should read floor price using floors module', function () {
+      const floorPriceFor580x400 = 6.5148;
+      const floorPriceForAnySize = 4.2343;
+      const validBidRequests = [
+        createValidBidRequest(undefined, '98efe127-f926-4dde-b988-db8e5dba5a76', [[580, 400]]),
+        createValidBidRequest(undefined, 'c7698d4a-94f4-4a6b-a928-7e1facfbf752', [])
+      ];
+      validBidRequests.forEach(validBidRequest => {
+        validBidRequest.getFloor = function (params) {
+          let floorPrice;
+          if (utils.isArray(params.size) && params.size[0] === 580 && params.size[1] === 400) {
+            floorPrice = floorPriceFor580x400;
+          } else if (params.size === '*') {
+            floorPrice = floorPriceForAnySize
+          } else {
+            floorPrice = 0
+          }
+          return {
+            currency: params.currency,
+            floor: floorPrice
+          }
+        }
+      })
+      const bidderRequest = createBidderRequest();
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      expect(openRtbRequest.imp.length).to.be.equal(2);
+      expect(openRtbRequest.imp[0].id).to.be.equal('98efe127-f926-4dde-b988-db8e5dba5a76');
+      expect(openRtbRequest.imp[0].bidfloor).to.be.equal(floorPriceFor580x400);
+      expect(openRtbRequest.imp[1].id).to.be.equal('c7698d4a-94f4-4a6b-a928-7e1facfbf752');
+      expect(openRtbRequest.imp[1].bidfloor).to.be.equal(floorPriceForAnySize);
+    });
+
+    it('should create whole OpenRTB request', function () {
+      const validBidRequests = [
+        createValidBidRequest(
+          {
+            placementId: 'pcha322364',
+            zip: '0015',
+            floorPrice: 5.6234,
+            position: 1,
+            dealIds: ['623472534328234']
+          },
+          '953ee65d-d18a-484f-a840-d3056185a060',
+          [[400, 600]]
+        ),
+        createValidBidRequest(
+          {
+            placementId: 'sdfgoi32y4',
+            floorPrice: 3.2543,
+            position: 2,
+            dealIds: ['92368234753283', '263845832942']
+          },
+          '8320bf79-9d90-4a17-87c6-5d505706a921',
+          [[400, 500], [200, 250], [300, 350]]
+        ),
+        createValidBidRequest(
+          {
+            placementId: 'gwms2738647',
+            position: 3
+          },
+          'd0de713b-32e3-4191-a2df-a007f08ffe72',
+          [[800, 900]]
+        )
+      ];
+      const bidderRequest = createBidderRequest(
+        '9ff580cf-e10e-4b66-add7-40ac0c804e21',
+        4500,
+        'bid.kobler.no'
+      );
+
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const openRtbRequest = JSON.parse(result.data);
+
+      const expectedOpenRtbRequest = {
+        id: '9ff580cf-e10e-4b66-add7-40ac0c804e21',
+        at: 1,
+        tmax: 4500,
+        cur: ['USD'],
+        imp: [
+          {
+            id: '953ee65d-d18a-484f-a840-d3056185a060',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 600
+                }
+              ],
+              w: 400,
+              h: 600,
+              ext: {
+                kobler: {
+                  pos: 1
+                }
+              }
+            },
+            tagid: 'pcha322364',
+            bidfloor: 5.6234,
+            bidfloorcur: 'USD',
+            pmp: {
+              deals: [
+                {
+                  id: '623472534328234'
+                }
+              ]
+            }
+          },
+          {
+            id: '8320bf79-9d90-4a17-87c6-5d505706a921',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 500
+                },
+                {
+                  w: 200,
+                  h: 250
+                },
+                {
+                  w: 300,
+                  h: 350
+                }
+              ],
+              w: 400,
+              h: 500,
+              ext: {
+                kobler: {
+                  pos: 2
+                }
+              }
+            },
+            tagid: 'sdfgoi32y4',
+            bidfloor: 3.2543,
+            bidfloorcur: 'USD',
+            pmp: {
+              deals: [
+                {
+                  id: '92368234753283'
+                },
+                {
+                  id: '263845832942'
+                }
+              ]
+            }
+          },
+          {
+            id: 'd0de713b-32e3-4191-a2df-a007f08ffe72',
+            banner: {
+              format: [
+                {
+                  w: 800,
+                  h: 900
+                }
+              ],
+              w: 800,
+              h: 900,
+              ext: {
+                kobler: {
+                  pos: 3
+                }
+              }
+            },
+            tagid: 'gwms2738647',
+            bidfloor: 0,
+            bidfloorcur: 'USD',
+            pmp: {}
+          }
+        ],
+        device: {
+          devicetype: 2,
+          geo: {
+            zip: '0015'
+          }
+        },
+        site: {
+          page: 'bid.kobler.no'
+        },
+        test: 0
+      };
+
+      expect(openRtbRequest).to.deep.equal(expectedOpenRtbRequest);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('should handle empty body', function () {
+      const responseWithEmptyBody = {
+        body: undefined
+      };
+      const bids = spec.interpretResponse(responseWithEmptyBody)
+
+      expect(bids.length).to.be.equal(0);
+    });
+
+    it('should generate bids from OpenRTB response', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'NOK'
+        }
+      });
+      const responseWithTwoBids = {
+        body: {
+          seatbid: [
+            {
+              bid: [
+                {
+                  impid: '6194ddef-89a4-404f-9efd-6b718fc23308',
+                  price: 7.981,
+                  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}',
+                  crid: 'edea9b03-3a57-41aa-9c00-abd673e22006',
+                  dealid: '',
+                  w: 320,
+                  h: 250,
+                  adm: '',
+                  adomain: [
+                    'https://kobler.no'
+                  ]
+                },
+                {
+                  impid: '2ec0b40f-d3ca-4ba5-8ce3-48290565690f',
+                  price: 6.71234,
+                  nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=nbashgufvishdafjk23432&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+                  crid: 'fa2d5af7-2678-4204-9023-44c526160742',
+                  dealid: '2783483223432342',
+                  w: 580,
+                  h: 400,
+                  adm: '',
+                  adomain: [
+                    'https://bid.kobler.no'
+                  ]
+                }
+              ]
+            }
+          ],
+          cur: 'USD'
+        }
+      };
+      const bids = spec.interpretResponse(responseWithTwoBids)
+
+      const expectedBids = [
+        {
+          requestId: '6194ddef-89a4-404f-9efd-6b718fc23308',
+          cpm: 7.981,
+          currency: 'USD',
+          width: 320,
+          height: 250,
+          creativeId: 'edea9b03-3a57-41aa-9c00-abd673e22006',
+          dealId: '',
+          netRevenue: true,
+          ttl: 600,
+          ad: '',
+          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}',
+          meta: {
+            advertiserDomains: [
+              'https://kobler.no'
+            ]
+          }
+        },
+        {
+          requestId: '2ec0b40f-d3ca-4ba5-8ce3-48290565690f',
+          cpm: 6.71234,
+          currency: 'USD',
+          width: 580,
+          height: 400,
+          creativeId: 'fa2d5af7-2678-4204-9023-44c526160742',
+          dealId: '2783483223432342',
+          netRevenue: true,
+          ttl: 600,
+          ad: '',
+          nurl: 'https://atag.essrtb.com/serve/prebid_win_notification?payload=nbashgufvishdafjk23432&sp=${AUCTION_PRICE}&sp_cur=${AUCTION_PRICE_CURRENCY}&asp=${AD_SERVER_PRICE}&asp_cur=${AD_SERVER_PRICE_CURRENCY}',
+          meta: {
+            advertiserDomains: [
+              'https://bid.kobler.no'
+            ]
+          }
+        }
+      ];
+      expect(bids).to.deep.equal(expectedBids);
+    });
+  });
+
+  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.called).to.be.false;
+    });
+
+    it('Should not trigger pixel if nurl is empty', function () {
+      spec.onBidWon({
+        nurl: ''
+      });
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should trigger pixel with replaced nurl if nurl is not empty', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'NOK'
+        }
+      });
+      spec.onBidWon({
+        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: {
+          hb_pb: 8
+        }
+      });
+
+      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'
+      );
+    });
+  });
+
+  describe('onTimeout', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('Should not trigger pixel if timeout data is not array', function () {
+      spec.onTimeout(null);
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should not trigger pixel if timeout data is empty', function () {
+      spec.onTimeout([]);
+
+      expect(utils.triggerPixel.called).to.be.false;
+    });
+
+    it('Should trigger pixel with query parameters if timeout data not empty', function () {
+      spec.onTimeout([
+        {
+          adUnitCode: 'adunit-code',
+          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
+          bidId: 'ef236c6c-e934-406b-a877-d7be8e8a839a',
+          timeout: 100,
+          params: [
+            {
+              placementId: 'xrwg62731',
+            }
+          ],
+        },
+        {
+          adUnitCode: 'adunit-code-2',
+          auctionId: 'a1fba829-dd41-409f-acfb-b7b0ac5f30c6',
+          bidId: 'ca4121c8-9a4a-46ba-a624-e9b64af206f2',
+          timeout: 100,
+          params: [
+            {
+              placementId: 'bc482234',
+            }
+          ],
+        }
+      ]);
+
+      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&' +
+        'placement_id=xrwg62731&page_url=' + encodeURIComponent(getRefererInfo().referer)
+      );
+      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&' +
+        'placement_id=bc482234&page_url=' + encodeURIComponent(getRefererInfo().referer)
+      );
+    });
+  });
+});
diff --git a/test/spec/modules/krushmediaBidAdapter_spec.js b/test/spec/modules/krushmediaBidAdapter_spec.js
new file mode 100644
index 00000000000..3af9ed64c43
--- /dev/null
+++ b/test/spec/modules/krushmediaBidAdapter_spec.js
@@ -0,0 +1,329 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/krushmediaBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('KrushmediabBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'krushmedia',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      key: 783,
+      traffic: BANNER
+    }
+  };
+
+  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.key;
+      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://ads4.krushmedia.com/?c=rtb&m=hb');
+    });
+    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');
+      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');
+      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');
+    });
+
+    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');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      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');
+      expect(placement.traffic).to.equal(NATIVE);
+      expect(placement.native).to.equal(native);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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('iframe')
+      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')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      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('https://cs.krushmedia.com/html?src=pbjs&ccpa_consent=1NNN')
+    });
+  });
+});
diff --git a/test/spec/modules/kubientBidAdapter_spec.js b/test/spec/modules/kubientBidAdapter_spec.js
new file mode 100644
index 00000000000..1df4370b2ba
--- /dev/null
+++ b/test/spec/modules/kubientBidAdapter_spec.js
@@ -0,0 +1,259 @@
+import { expect, assert } from 'chai';
+import { spec } from 'modules/kubientBidAdapter.js';
+
+describe('KubientAdapter', function () {
+  let bid = {
+    bidId: '2dd581a2b6281d',
+    bidder: 'kubient',
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      zoneid: '5678',
+      floor: 0.05,
+    },
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]]
+      }
+    },
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62',
+    schain: {
+      ver: '1.0',
+      complete: 1,
+      nodes: [
+        {
+          asi: 'example.com',
+          sid: '0',
+          hp: 1,
+          rid: 'bidrequestid',
+          domain: 'example.com'
+        }
+      ]
+    }
+  };
+  let consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
+  let uspConsentData = '1YCC';
+  let bidderRequest = {
+    bidderCode: 'kubient',
+    auctionId: 'fffffff-ffff-ffff-ffff-ffffffffffff',
+    bidderRequestId: 'ffffffffffffff',
+    start: 1472239426002,
+    auctionStart: 1472239426000,
+    timeout: 5000,
+    refererInfo: {
+      referer: 'http://www.example.com',
+      reachedTop: true,
+    },
+    gdprConsent: {
+      consentString: consentString,
+      gdprApplies: true
+    },
+    uspConsent: uspConsentData,
+    bids: [bid]
+  };
+  describe('buildRequests', function () {
+    let serverRequests = spec.buildRequests([bid], bidderRequest);
+    it('Creates a ServerRequest object with method, URL and data', function () {
+      expect(serverRequests).to.be.an('array');
+    });
+    for (let i = 0; i < serverRequests.length; i++) {
+      let serverRequest = serverRequests[i];
+      it('Creates a ServerRequest object with method, URL and data', function () {
+        expect(serverRequest.method).to.be.a('string');
+        expect(serverRequest.url).to.be.a('string');
+        expect(serverRequest.data).to.be.a('string');
+      });
+      it('Returns POST method', function () {
+        expect(serverRequest.method).to.equal('POST');
+      });
+      it('Returns valid URL', function () {
+        expect(serverRequest.url).to.equal('https://kssp.kbntx.ch/pbjs');
+      });
+      it('Returns valid data if array of bids is valid', function () {
+        let data = JSON.parse(serverRequest.data);
+        expect(data).to.be.an('object');
+        expect(data).to.have.all.keys('v', 'requestId', 'adSlots', 'gdpr', 'referer', 'tmax', 'consent', 'consentGiven', 'uspConsent');
+        expect(data.v).to.exist.and.to.be.a('string');
+        expect(data.requestId).to.exist.and.to.be.a('string');
+        expect(data.referer).to.be.a('string');
+        expect(data.tmax).to.exist.and.to.be.a('number');
+        expect(data.gdpr).to.exist.and.to.be.within(0, 1);
+        expect(data.consent).to.equal(consentString);
+        expect(data.uspConsent).to.exist.and.to.equal(uspConsentData);
+        for (let j = 0; j < data['adSlots'].length; j++) {
+          let adSlot = data['adSlots'][i];
+          expect(adSlot).to.have.all.keys('bidId', 'zoneId', 'floor', 'sizes', 'schain', 'mediaTypes');
+          expect(adSlot.bidId).to.be.a('string');
+          expect(adSlot.zoneId).to.be.a('string');
+          expect(adSlot.floor).to.be.a('number');
+          expect(adSlot.sizes).to.be.an('array');
+          expect(adSlot.schain).to.be.an('object');
+          expect(adSlot.mediaTypes).to.be.an('object');
+        }
+      });
+    }
+  });
+
+  describe('isBidRequestValid', function () {
+    it('Should return true when required params are found', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false when required params are not found', function () {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false when params are not found', function () {
+      delete bid.params;
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('interpretResponse', function () {
+    it('Should interpret response', function () {
+      const serverResponse = {
+        body:
+          {
+            seatbid: [
+              {
+                bid: [
+                  {
+                    bidId: '000',
+                    price: 1.5,
+                    adm: '
test
',
+                    creativeId: 'creativeId',
+                    w: 300,
+                    h: 250,
+                    cur: 'USD',
+                    netRevenue: false,
+                    ttl: 360
+                  }
+                ]
+              }
+            ]
+          }
+      };
+      let bannerResponses = spec.interpretResponse(serverResponse);
+      expect(bannerResponses).to.be.an('array').that.is.not.empty;
+      let dataItem = bannerResponses[0];
+      expect(dataItem).to.have.all.keys('requestId', 'cpm', 'ad', 'creativeId', 'width', 'height', 'currency', 'netRevenue', 'ttl');
+      expect(dataItem.requestId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].bidId);
+      expect(dataItem.cpm).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].price);
+      expect(dataItem.ad).to.exist.and.to.be.a('string').and.to.have.string(serverResponse.body.seatbid[0].bid[0].adm);
+      expect(dataItem.creativeId).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].creativeId);
+      expect(dataItem.width).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].w);
+      expect(dataItem.height).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].h);
+      expect(dataItem.currency).to.exist.and.to.be.a('string').and.to.equal(serverResponse.body.seatbid[0].bid[0].cur);
+      expect(dataItem.netRevenue).to.exist.and.to.be.a('boolean').and.to.equal(serverResponse.body.seatbid[0].bid[0].netRevenue);
+      expect(dataItem.ttl).to.exist.and.to.be.a('number').and.to.equal(serverResponse.body.seatbid[0].bid[0].ttl);
+    });
+
+    it('Should return no ad when not given a server response', function () {
+      const ads = spec.interpretResponse(null);
+      expect(ads).to.be.an('array').and.to.have.length(0);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    it('should register the sync iframe without gdpr', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&consent_given=0');
+    });
+    it('should register the sync iframe with gdpr', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&gdpr=1&consent_given=0');
+    });
+    it('should register the sync iframe with gdpr vendor', function () {
+      let syncOptions = {
+        iframeEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString,
+        apiVersion: 1,
+        vendorData: {
+          vendorConsents: {
+            794: 1
+          }
+        }
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.html?consent_str=' + consentString + '&gdpr=1&consent_given=1');
+    });
+    it('should register the sync image without gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&consent_given=0');
+    });
+    it('should register the sync image with gdpr', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&gdpr=1&consent_given=0');
+    });
+    it('should register the sync image with gdpr vendor', function () {
+      let syncOptions = {
+        pixelEnabled: true
+      };
+      let serverResponses = null;
+      let gdprConsent = {
+        gdprApplies: true,
+        consentString: consentString,
+        apiVersion: 2,
+        vendorData: {
+          vendor: {
+            consents: {
+              794: 1
+            }
+          }
+        }
+      };
+      let uspConsent = null;
+      let syncs = spec.getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent);
+      expect(syncs).to.be.an('array').and.to.have.length(1);
+      expect(syncs[0].type).to.equal('image');
+      expect(syncs[0].url).to.equal('https://kdmp.kbntx.ch/init.png?consent_str=' + consentString + '&gdpr=1&consent_given=1');
+    });
+  })
+});
diff --git a/test/spec/modules/lemmaBidAdapter_spec.js b/test/spec/modules/lemmaBidAdapter_spec.js
index a236ac17d71..a3a70a39731 100644
--- a/test/spec/modules/lemmaBidAdapter_spec.js
+++ b/test/spec/modules/lemmaBidAdapter_spec.js
@@ -23,6 +23,7 @@ describe('lemmaBidAdapter', function() {
         pubId: 1001,
         adunitId: 1,
         currency: 'AUD',
+        bidFloor: 1.3,
         geo: {
           lat: '12.3',
           lon: '23.7',
@@ -46,6 +47,7 @@ describe('lemmaBidAdapter', function() {
       params: {
         pubId: 1001,
         adunitId: 1,
+        bidFloor: 1.3,
         video: {
           mimes: ['video/mp4', 'video/x-flv'],
           skippable: true,
@@ -161,6 +163,7 @@ describe('lemmaBidAdapter', function() {
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.pubId.toString()); // publisher Id
         expect(data.imp[0].tagid).to.equal('1'); // tagid
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
+        expect(data.imp[0].bidfloor).to.equal(bidRequests[0].params.bidFloor);
       });
       it('Request params check without mediaTypes object', function() {
         var bidRequests = [{
@@ -192,6 +195,7 @@ describe('lemmaBidAdapter', function() {
         expect(data.site.publisher.id).to.equal(bidRequests[0].params.pubId.toString()); // publisher Id
         expect(data.imp[0].tagid).to.equal(undefined); // tagid
         expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
+        expect(data.imp[0].bidfloor).to.equal(bidRequests[0].params.bidFloor);
       });
       it('Request params multi size format object check', function() {
         var bidRequests = [{
@@ -309,6 +313,77 @@ describe('lemmaBidAdapter', function() {
         expect(data.imp[0]['video']['w']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[0]);
         expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
       });
+      describe('setting imp.floor using floorModule', function() {
+        /*
+        Use the minimum value among floor from floorModule per mediaType
+        If params.bidFloor is set then take max(floor, min(floors from floorModule))
+        set imp.bidfloor only if it is more than 0
+        */
+
+        let newRequest;
+        let floorModuleTestData;
+        let getFloor = function(req) {
+          return floorModuleTestData[req.mediaType];
+        };
+
+        beforeEach(() => {
+          floorModuleTestData = {
+            'banner': {
+              'currency': 'AUD',
+              'floor': 1.50
+            },
+            'video': {
+              'currency': 'AUD',
+              'floor': 2.00
+            }
+          };
+          newRequest = utils.deepClone(bidRequests);
+          newRequest[0].getFloor = getFloor;
+        });
+
+        it('bidfloor should be undefined if calculation is <= 0', function() {
+          floorModuleTestData.banner.floor = 0; // lowest of them all
+          newRequest[0].params.bidFloor = undefined;
+          let request = spec.buildRequests(newRequest);
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.bidfloor).to.equal(undefined);
+        });
+
+        it('ignore floormodule o/p if floor is not number', function() {
+          floorModuleTestData.banner.floor = 'INR';
+          newRequest[0].params.bidFloor = undefined;
+          let request = spec.buildRequests(newRequest);
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.bidfloor).to.equal(undefined); // video will be lowest now
+        });
+
+        it('ignore floormodule o/p if currency is not matched', function() {
+          floorModuleTestData.banner.currency = 'INR';
+          newRequest[0].params.bidFloor = undefined;
+          let request = spec.buildRequests(newRequest);
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.bidfloor).to.equal(undefined); // video will be lowest now
+        });
+
+        it('bidFloor is not passed, use minimum from floorModule', function() {
+          newRequest[0].params.bidFloor = undefined;
+          let request = spec.buildRequests(newRequest);
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.bidfloor).to.equal(1.5);
+        });
+
+        it('bidFloor is passed as 1, use min of floorModule as it is highest', function() {
+          newRequest[0].params.bidFloor = '1.0';// yes, we want it as a string
+          let request = spec.buildRequests(newRequest);
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.bidfloor).to.equal(1.5);
+        });
+      });
       describe('Response checking', function() {
         it('should check for valid response values', function() {
           var request = spec.buildRequests(bidRequests);
@@ -331,5 +406,21 @@ describe('lemmaBidAdapter', function() {
         });
       });
     });
+    describe('getUserSyncs', function() {
+      const syncurl_iframe = 'https://sync.lemmatechnologies.com/js/usersync.html?pid=1001';
+      let sandbox;
+      beforeEach(function() {
+        sandbox = sinon.sandbox.create();
+      });
+      afterEach(function() {
+        sandbox.restore();
+      });
+
+      it('execute as per config', function() {
+        expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, undefined)).to.deep.equal([{
+          type: 'iframe', url: syncurl_iframe
+        }]);
+      });
+    });
   });
 });
diff --git a/test/spec/modules/liveIntentIdMinimalSystem_spec.js b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
new file mode 100644
index 00000000000..b0f97ae0300
--- /dev/null
+++ b/test/spec/modules/liveIntentIdMinimalSystem_spec.js
@@ -0,0 +1,188 @@
+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';
+
+const PUBLISHER_ID = '89899';
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('LiveIntentMinimalId', function() {
+  let logErrorStub;
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
+  let getCookieStub;
+  let getDataFromLocalStorageStub;
+  let imgStub;
+
+  beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    imgStub = sinon.stub(utils, 'triggerPixel');
+    getCookieStub = sinon.stub(storage, 'getCookie');
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    logErrorStub = sinon.stub(utils, 'logError');
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
+  });
+
+  afterEach(function() {
+    imgStub.restore();
+    getCookieStub.restore();
+    getDataFromLocalStorageStub.restore();
+    logErrorStub.restore();
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
+    liveIntentIdSubmodule.setModuleMode('minimal');
+    resetLiveIntentIdSubmodule();
+  });
+  it('should not fire an event when getId', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    expect(server.requests[0]).to.eql(undefined)
+  });
+
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
+    expect(result).to.be.undefined;
+  });
+
+  it('should initialize LiveConnect and send no data', function() {
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    liveIntentIdSubmodule.decode({}, defaultConfigParams);
+    expect(server.requests.length).to.be.eq(0);
+  });
+
+  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;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function() {
+    getCookieStub.returns(null);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
+      ...{
+        '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');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  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;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  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;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
+    request.respond(
+      503,
+      responseHeader,
+      'Unavailable'
+    );
+    expect(logErrorStub.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    let callBackSpy = sinon.spy();
+    let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
+    submoduleCallback(callBackSpy);
+    let request = server.requests[0];
+    expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include the LiveConnect identifier and additional Identifiers to resolve', function() {
+    const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
+    getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    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`);
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+
+  it('should include an additional identifier value to resolve even if it is an object', function() {
+    getCookieStub.returns(null);
+    getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
+    const configParams = { params: {
+      ...defaultConfigParams.params,
+      ...{
+        'identifiersToResolve': ['_thirdPC']
+      }
+    }};
+    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');
+    request.respond(
+      200,
+      responseHeader,
+      JSON.stringify({})
+    );
+    expect(callBackSpy.calledOnce).to.be.true;
+  });
+});
diff --git a/test/spec/modules/liveIntentIdSystem_spec.js b/test/spec/modules/liveIntentIdSystem_spec.js
index b19d38d5859..f1de2f3bf93 100644
--- a/test/spec/modules/liveIntentIdSystem_spec.js
+++ b/test/spec/modules/liveIntentIdSystem_spec.js
@@ -1,62 +1,85 @@
-import {liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage} from 'modules/liveIntentIdSystem.js';
+import { liveIntentIdSubmodule, reset as resetLiveIntentIdSubmodule, storage } from 'modules/liveIntentIdSystem.js';
 import * as utils from 'src/utils.js';
-import {uspDataHandler} from '../../../src/adapterManager.js';
-import {server} from 'test/mocks/xhr.js';
-
+import { gdprDataHandler, uspDataHandler } from '../../../src/adapterManager.js';
+import { server } from 'test/mocks/xhr.js';
+resetLiveIntentIdSubmodule();
+liveIntentIdSubmodule.setModuleMode('standard')
 const PUBLISHER_ID = '89899';
-const defaultConfigParams = {publisherId: PUBLISHER_ID};
+const defaultConfigParams = { params: {publisherId: PUBLISHER_ID} };
 const responseHeader = {'Content-Type': 'application/json'}
 
-describe('LiveIntentId', function () {
-  let pixel = {};
+describe('LiveIntentId', function() {
   let logErrorStub;
-  let consentDataStub;
+  let uspConsentDataStub;
+  let gdprConsentDataStub;
   let getCookieStub;
   let getDataFromLocalStorageStub;
   let imgStub;
 
-  beforeEach(function () {
-    imgStub = sinon.stub(window, 'Image').returns(pixel);
+  beforeEach(function() {
+    liveIntentIdSubmodule.setModuleMode('standard');
+    imgStub = sinon.stub(utils, 'triggerPixel');
     getCookieStub = sinon.stub(storage, 'getCookie');
     getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
     logErrorStub = sinon.stub(utils, 'logError');
-    consentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    gdprConsentDataStub = sinon.stub(gdprDataHandler, 'getConsentData');
   });
 
-  afterEach(function () {
-    pixel = {};
+  afterEach(function() {
     imgStub.restore();
     getCookieStub.restore();
     getDataFromLocalStorageStub.restore();
     logErrorStub.restore();
-    consentDataStub.restore();
+    uspConsentDataStub.restore();
+    gdprConsentDataStub.restore();
     resetLiveIntentIdSubmodule();
   });
 
-  it('should initialize LiveConnect with a us privacy string when getId, and include it in all requests', function () {
-    consentDataStub.returns('1YNY');
+  it('should initialize LiveConnect with a privacy string when getId, and include it in the resolution request', function () {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
-    expect(pixel.src).to.match(/.*us_privacy=1YNY/);
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
-    expect(request.url).to.match(/.*us_privacy=1YNY/);
+    let request = server.requests[1];
+    expect(request.url).to.match(/.*us_privacy=1YNY.*&gdpr=1&gdpr_consent=consentDataString.*/);
+    const response = {
+      unifiedId: 'a_unified_id',
+      segments: [123, 234]
+    }
     request.respond(
       200,
       responseHeader,
-      JSON.stringify({})
+      JSON.stringify(response)
     );
-    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnceWith(response)).to.be.true;
   });
 
-  it('should fire an event when getId', function () {
+  it('should fire an event when getId', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: true,
+      consentString: 'consentDataString'
+    })
     liveIntentIdSubmodule.getId(defaultConfigParams);
-    expect(pixel.src).to.match(/https:\/\/rp.liadm.com\/p\?wpn=prebid.*/)
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?wpn=prebid.*us_privacy=1YNY.*&gdpr=1&gdpr_consent=consentDataString.*/);
   });
 
-  it('should initialize LiveConnect with the config params when decode and emit an event', function () {
-    liveIntentIdSubmodule.decode({}, {
+  it('should fire an event when getId and a hash is provided', function() {
+    liveIntentIdSubmodule.getId({ params: {
       ...defaultConfigParams,
+      emailHash: '58131bc547fb87af94cebdaf3102321f'
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/)
+  });
+
+  it('should initialize LiveConnect with the config params when decode and emit an event', function () {
+    liveIntentIdSubmodule.decode({}, { params: {
+      ...defaultConfigParams.params,
       ...{
         url: 'https://dummy.liveintent.com',
         liCollectConfig: {
@@ -64,61 +87,72 @@ describe('LiveIntentId', function () {
           collectorUrl: 'https://collector.liveintent.com'
         }
       }
-    });
-    expect(pixel.src).to.match(/https:\/\/collector.liveintent.com\/p\?aid=a-0001&wpn=prebid.*/)
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/collector.liveintent.com\/j\?aid=a-0001&wpn=prebid.*/);
   });
 
-  it('should initialize LiveConnect and emit an event with a us privacy string when decode', function () {
-    consentDataStub.returns('1YNY');
+  it('should initialize LiveConnect and emit an event with a privacy string when decode', function() {
+    uspConsentDataStub.returns('1YNY');
+    gdprConsentDataStub.returns({
+      gdprApplies: false,
+      consentString: 'consentDataString'
+    })
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(pixel.src).to.match(/.*us_privacy=1YNY/);
+    expect(server.requests[0].url).to.match(/.*us_privacy=1YNY.*&gdpr=0&gdpr_consent=consentDataString.*/);
   });
 
-  it('should not return a decoded identifier when the unifiedId is not present in the value', function () {
-    const result = liveIntentIdSubmodule.decode({additionalData: 'data'});
+  it('should fire an event when decode and a hash is provided', function() {
+    liveIntentIdSubmodule.decode({}, { params: {
+      ...defaultConfigParams.params,
+      emailHash: '58131bc547fb87af94cebdaf3102321f'
+    }});
+    expect(server.requests[0].url).to.match(/https:\/\/rp.liadm.com\/j\?.*e=58131bc547fb87af94cebdaf3102321f.+/);
+  });
+
+  it('should not return a decoded identifier when the unifiedId is not present in the value', function() {
+    const result = liveIntentIdSubmodule.decode({ additionalData: 'data' });
     expect(result).to.be.undefined;
   });
 
-  it('should fire an event when decode', function () {
+  it('should fire an event when decode', function() {
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(pixel.src).to.be.not.null
+    expect(server.requests[0].url).to.be.not.null
   });
 
-  it('should initialize LiveConnect and send data only once', function () {
+  it('should initialize LiveConnect and send data only once', function() {
     liveIntentIdSubmodule.getId(defaultConfigParams);
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
     liveIntentIdSubmodule.getId(defaultConfigParams);
     liveIntentIdSubmodule.decode({}, defaultConfigParams);
-    expect(imgStub.calledOnce).to.be.true;
+    expect(server.requests.length).to.be.eq(1);
   });
 
-  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function () {
+  it('should call the Custom URL of the LiveIntent Identity Exchange endpoint', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId({...defaultConfigParams, ...{'url': 'https://dummy.liveintent.com/idex'}}).callback;
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {...defaultConfigParams.params, ...{'url': 'https://dummy.liveintent.com/idex'}} }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/prebid/89899');
     request.respond(
-      200,
-      responseHeader,
-      JSON.stringify({})
+      204,
+      responseHeader
     );
-    expect(callBackSpy.calledOnce).to.be.true;
+    expect(callBackSpy.calledOnceWith({})).to.be.true;
   });
 
-  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function () {
+  it('should call the default url of the LiveIntent Identity Exchange endpoint, with a partner', function() {
     getCookieStub.returns(null);
     let callBackSpy = sinon.spy();
-    let submoduleCallback = liveIntentIdSubmodule.getId({
-      ...defaultConfigParams,
+    let submoduleCallback = liveIntentIdSubmodule.getId({ params: {
+      ...defaultConfigParams.params,
       ...{
         'url': 'https://dummy.liveintent.com/idex',
         'partner': 'rubicon'
       }
-    }).callback;
+    } }).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq('https://dummy.liveintent.com/idex/rubicon/89899');
     request.respond(
       200,
@@ -128,12 +162,12 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should call the LiveIntent Identity Exchange endpoint, with no additional query params', 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;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
     request.respond(
       200,
@@ -143,12 +177,12 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should log an error and continue to callback if ajax request errors', 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;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899');
     request.respond(
       503,
@@ -159,13 +193,13 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function () {
+  it('should include the LiveConnect identifier when calling the LiveIntent Identity Exchange endpoint', function() {
     const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
     getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(defaultConfigParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}`);
     request.respond(
       200,
@@ -175,20 +209,20 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include the LiveConnect identifier and additional Identifiers to resolve', function () {
+  it('should include the LiveConnect identifier and additional Identifiers to resolve', function() {
     const oldCookie = 'a-xxxx--123e4567-e89b-12d3-a456-426655440000'
     getDataFromLocalStorageStub.withArgs('_li_duid').returns(oldCookie);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns('third-pc');
-    const configParams = {
-      ...defaultConfigParams,
+    const configParams = { params: {
+      ...defaultConfigParams.params,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
-    };
+    }};
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq(`https://idx.liadm.com/idex/prebid/89899?duid=${oldCookie}&_thirdPC=third-pc`);
     request.respond(
       200,
@@ -198,19 +232,19 @@ describe('LiveIntentId', function () {
     expect(callBackSpy.calledOnce).to.be.true;
   });
 
-  it('should include an additional identifier value to resolve even if it is an object', function () {
+  it('should include an additional identifier value to resolve even if it is an object', function() {
     getCookieStub.returns(null);
     getDataFromLocalStorageStub.withArgs('_thirdPC').returns({'key': 'value'});
-    const configParams = {
-      ...defaultConfigParams,
+    const configParams = { params: {
+      ...defaultConfigParams.params,
       ...{
         'identifiersToResolve': ['_thirdPC']
       }
-    };
+    }};
     let callBackSpy = sinon.spy();
     let submoduleCallback = liveIntentIdSubmodule.getId(configParams).callback;
     submoduleCallback(callBackSpy);
-    let request = server.requests[0];
+    let request = server.requests[1];
     expect(request.url).to.be.eq('https://idx.liadm.com/idex/prebid/89899?_thirdPC=%7B%22key%22%3A%22value%22%7D');
     request.respond(
       200,
@@ -219,4 +253,10 @@ describe('LiveIntentId', function () {
     );
     expect(callBackSpy.calledOnce).to.be.true;
   });
+
+  it('should send an error when the cookie jar throws an unexpected error', function() {
+    getCookieStub.throws('CookieError', 'A message');
+    liveIntentIdSubmodule.getId(defaultConfigParams);
+    expect(imgStub.getCall(0).args[0]).to.match(/.*ae=.+/);
+  });
 });
diff --git a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
index 4e05d1a31ff..ba9430e0b95 100644
--- a/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
+++ b/test/spec/modules/livewrappedAnalyticsAdapter_spec.js
@@ -120,6 +120,8 @@ const MOCK = {
 
 const ANALYTICS_MESSAGE = {
   publisherId: 'CC411485-42BC-4F92-8389-42C503EE38D7',
+  gdpr: [{}],
+  auctionIds: ['25c6d7f5-699a-4bfc-87c9-996f915341fa'],
   bidAdUnits: [
     {
       adUnit: 'panorama_d_1',
@@ -134,17 +136,23 @@ const ANALYTICS_MESSAGE = {
     {
       adUnit: 'panorama_d_1',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_1',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       adUnit: 'box_d_2',
       bidder: 'livewrapped',
-      timeStamp: 1519149562216
+      timeStamp: 1519149562216,
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   responses: [
@@ -157,7 +165,9 @@ const ANALYTICS_MESSAGE = {
       cpm: 1.1,
       ttr: 200,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
@@ -168,14 +178,18 @@ const ANALYTICS_MESSAGE = {
       cpm: 2.2,
       ttr: 300,
       IsBid: true,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
       adUnit: 'box_d_2',
       bidder: 'livewrapped',
       ttr: 200,
-      IsBid: false
+      IsBid: false,
+      gdpr: 0,
+      auctionId: 0
     }
   ],
   timeouts: [],
@@ -187,7 +201,9 @@ const ANALYTICS_MESSAGE = {
       width: 980,
       height: 240,
       cpm: 1.1,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     },
     {
       timeStamp: 1519149562216,
@@ -196,7 +212,9 @@ const ANALYTICS_MESSAGE = {
       width: 300,
       height: 250,
       cpm: 2.2,
-      mediaType: 1
+      mediaType: 1,
+      gdpr: 0,
+      auctionId: 0
     }
   ]
 };
@@ -321,6 +339,148 @@ describe('Livewrapped analytics adapter', function () {
 
       expect(message.rcv).to.equal(true);
     });
+
+    it('should forward GDPR data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+          },
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'box_d_1',
+            'bidId': '3ecff0db240757',
+          }
+        ],
+        'start': 1519149562216,
+        'gdprConsent': {
+          'gdprApplies': true,
+          'consentString': 'consentstring'
+        }
+      },
+      );
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      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.gdpr.length).to.equal(1);
+      expect(message.gdpr[0].gdprApplies).to.equal(true);
+      expect(message.gdpr[0].gdprConsent).to.equal('consentstring');
+      expect(message.requests.length).to.equal(2);
+      expect(message.requests[0].gdpr).to.equal(0);
+      expect(message.requests[1].gdpr).to.equal(0);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].gdpr).to.equal(0);
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].gdpr).to.equal(0);
+    });
+
+    it('should forward floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+            'floorData': {
+              'floorValue': 1.1,
+              'floorCurrency': 'SEK'
+            }
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      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.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(1);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[0].floorCur).to.equal('SEK');
+
+      expect(message.wins.length).to.equal(1);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[0].floorCur).to.equal('SEK');
+    });
+
+    it('should forward Livewrapped floor data', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, {
+        'bidder': 'livewrapped',
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'bidderRequestId': '1be65d7958826a',
+        'bids': [
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'panorama_d_1',
+            'bidId': '2ecff0db240757',
+            'lwflr': {
+              'flr': 1.1
+            }
+          },
+          {
+            'bidder': 'livewrapped',
+            'adUnitCode': 'box_d_1',
+            'bidId': '3ecff0db240757',
+            'lwflr': {
+              'flr': 1.1,
+              'bflrs': {'livewrapped': 2.2}
+            }
+          }
+        ],
+        'start': 1519149562216
+      });
+
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[1]);
+      events.emit(BID_WON, MOCK.BID_WON[0]);
+      events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+
+      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.gdpr.length).to.equal(1);
+
+      expect(message.responses.length).to.equal(2);
+      expect(message.responses[0].floor).to.equal(1.1);
+      expect(message.responses[1].floor).to.equal(2.2);
+
+      expect(message.wins.length).to.equal(2);
+      expect(message.wins[0].floor).to.equal(1.1);
+      expect(message.wins[1].floor).to.equal(2.2);
+    });
   });
 
   describe('when given other endpoint', function () {
diff --git a/test/spec/modules/livewrappedBidAdapter_spec.js b/test/spec/modules/livewrappedBidAdapter_spec.js
index fb676f75343..130de42e950 100644
--- a/test/spec/modules/livewrappedBidAdapter_spec.js
+++ b/test/spec/modules/livewrappedBidAdapter_spec.js
@@ -2,7 +2,7 @@ import {expect} from 'chai';
 import {spec, storage} from 'modules/livewrappedBidAdapter.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
-import { BANNER, NATIVE } from 'src/mediaTypes.js';
+import { BANNER, NATIVE, VIDEO } from 'src/mediaTypes.js';
 
 describe('Livewrapped adapter tests', function () {
   let sandbox,
@@ -102,7 +102,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -139,7 +139,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -177,7 +177,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -208,7 +208,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -238,7 +238,7 @@ describe('Livewrapped adapter tests', function () {
       let expectedQuery = {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -270,7 +270,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         deviceId: 'deviceid',
@@ -303,7 +303,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         tid: 'tracking id',
@@ -335,7 +335,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -366,7 +366,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -397,7 +397,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -428,7 +428,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -445,6 +445,37 @@ describe('Livewrapped adapter tests', function () {
       expect(data).to.deep.equal(expectedQuery);
     });
 
+    it('should make a well-formed single request object with video only parameters', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+      let testbidRequest = clone(bidderRequest);
+      delete testbidRequest.bids[0].params.userId;
+      delete testbidRequest.bids[0].params.seats;
+      delete testbidRequest.bids[0].params.adUnitId;
+      testbidRequest.bids[0].mediaTypes = {'video': {'videodata': 'content parsed serverside only'}};
+      let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
+      let data = JSON.parse(result.data);
+
+      let expectedQuery = {
+        auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
+        publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
+        url: 'https://www.domain.com',
+        version: '1.4',
+        width: 100,
+        height: 100,
+        cookieSupport: true,
+        adRequests: [{
+          callerAdUnitId: 'panorama_d_1',
+          bidId: '2ffb201a808da7',
+          transactionId: '3D1C8CF7-D288-4D7F-8ADD-97C553056C3D',
+          formats: [{width: 980, height: 240}, {width: 980, height: 120}],
+          video: {'videodata': 'content parsed serverside only'}
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
     it('should use app objects', function() {
       sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
       sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
@@ -474,7 +505,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://appdomain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 300,
         height: 200,
         ifa: 'ifa',
@@ -507,7 +538,7 @@ describe('Livewrapped adapter tests', function () {
         auctionId: 'F7557995-65F5-4682-8782-7D5D34D82A8C',
         publisherId: '26947112-2289-405D-88C1-A7340C57E63E',
         url: 'https://www.domain.com',
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -541,7 +572,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -577,7 +608,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -594,6 +625,79 @@ describe('Livewrapped adapter tests', function () {
       expect(data).to.deep.equal(expectedQuery);
     });
 
+    it('should pass us privacy parameter', function() {
+      sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
+      sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
+      let testRequest = clone(bidderRequest);
+      testRequest.uspConsent = '1---';
+      let result = spec.buildRequests(testRequest.bids, testRequest);
+      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,
+        usPrivacy: '1---',
+        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}]
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
+    it('should pass coppa parameter', 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 === 'coppa') {
+          return true;
+        }
+        return origGetConfig.apply(config, arguments);
+      });
+
+      let result = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      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,
+        coppa: true,
+        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}]
+        }]
+      };
+
+      expect(data).to.deep.equal(expectedQuery);
+    });
+
     it('should pass no cookie support', function() {
       sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => false);
       sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
@@ -608,7 +712,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: false,
@@ -638,7 +742,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: false,
@@ -701,7 +805,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'pubcid 123',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -733,7 +837,7 @@ describe('Livewrapped adapter tests', function () {
         userId: 'user id',
         url: 'https://www.domain.com',
         seats: {'dsp': ['seat 1']},
-        version: '1.3',
+        version: '1.4',
         width: 100,
         height: 100,
         cookieSupport: true,
@@ -750,39 +854,61 @@ describe('Livewrapped adapter tests', function () {
     });
   });
 
-  it('should make use of Id5-Id if available', function() {
+  it('should make use of user ids if available', function() {
     sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
     sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
     let testbidRequest = clone(bidderRequest);
     delete testbidRequest.bids[0].params.userId;
-    testbidRequest.bids[0].userId = {};
-    testbidRequest.bids[0].userId.id5id = 'id5-user-id';
+    testbidRequest.bids[0].userIdAsEids = [
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-id',
+          'atype': 1,
+          'ext': {
+            'linkType': 2
+          }
+        }]
+      },
+      {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': 'publisher-common-id',
+          'atype': 1
+        }]
+      },
+      {
+        'source': 'sharedid.org',
+        'uids': [{
+          'id': 'sharedid',
+          'atype': 1,
+          'ext': {
+            'third': 'sharedid'
+          }
+        }]
+      }
+    ];
+
     let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
     let data = JSON.parse(result.data);
 
-    expect(data.rtbData.user.ext.eids).to.deep.equal([{
-      'source': 'id5-sync.com',
-      'uids': [{
-        'id': 'id5-user-id',
-        'atype': 1
-      }]
-    }]);
+    expect(data.rtbData.user.ext.eids).to.deep.equal(testbidRequest.bids[0].userIdAsEids);
   });
 
-  it('should make use of publisher common Id if available', function() {
+  it('should make use of criteoId if available', function() {
     sandbox.stub(utils, 'isSafariBrowser').callsFake(() => false);
     sandbox.stub(storage, 'cookiesAreEnabled').callsFake(() => true);
     let testbidRequest = clone(bidderRequest);
     delete testbidRequest.bids[0].params.userId;
     testbidRequest.bids[0].userId = {};
-    testbidRequest.bids[0].userId.pubcid = 'publisher-common-id';
+    testbidRequest.bids[0].userId.criteoId = 'criteo-id';
     let result = spec.buildRequests(testbidRequest.bids, testbidRequest);
     let data = JSON.parse(result.data);
 
     expect(data.rtbData.user.ext.eids).to.deep.equal([{
-      'source': 'pubcommon',
+      'source': 'criteo.com',
       'uids': [{
-        'id': 'publisher-common-id',
+        'id': 'criteo-id',
         'atype': 1
       }]
     }]);
@@ -895,6 +1021,48 @@ describe('Livewrapped adapter tests', function () {
       expect(bids).to.deep.equal(expectedResponse);
     })
 
+    it('should handle single video success response', function() {
+      let lwResponse = {
+        ads: [
+          {
+            id: '28e5ddf4-3c01-11e8-86a7-0a44794250d4',
+            callerId: 'site_outsider_0',
+            tag: 'VAST XML',
+            video: {},
+            width: 300,
+            height: 250,
+            cpmBid: 2.565917,
+            bidId: '32e50fad901ae89',
+            auctionId: '13e674db-d4d8-4e19-9d28-ff38177db8bf',
+            creativeId: '52cbd598-2715-4c43-a06f-229fc170f945:427077',
+            ttl: 120,
+            meta: undefined
+          }
+        ],
+        currency: 'USD'
+      };
+
+      let expectedResponse = [{
+        requestId: '32e50fad901ae89',
+        bidderCode: 'livewrapped',
+        cpm: 2.565917,
+        width: 300,
+        height: 250,
+        ad: 'VAST XML',
+        ttl: 120,
+        creativeId: '52cbd598-2715-4c43-a06f-229fc170f945:427077',
+        netRevenue: true,
+        currency: 'USD',
+        meta: undefined,
+        vastXml: 'VAST XML',
+        mediaType: VIDEO
+      }];
+
+      let bids = spec.interpretResponse({body: lwResponse});
+
+      expect(bids).to.deep.equal(expectedResponse);
+    })
+
     it('should handle multiple success response', function() {
       let lwResponse = {
         ads: [
diff --git a/test/spec/modules/lkqdBidAdapter_spec.js b/test/spec/modules/lkqdBidAdapter_spec.js
index f10d936a28b..1cd33d9ec59 100644
--- a/test/spec/modules/lkqdBidAdapter_spec.js
+++ b/test/spec/modules/lkqdBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { spec } from 'modules/lkqdBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
-const { expect } = require('chai');
+import { config } from 'src/config.js';
+import { expect } from 'chai';
 
 describe('LKQD Bid Adapter Test', () => {
   const adapter = newBidder(spec);
@@ -47,7 +48,9 @@ describe('LKQD Bid Adapter Test', () => {
         'bidder': 'lkqd',
         'params': {
           'siteId': '662921',
-          'placementId': '263'
+          'placementId': '263',
+          'c1': 'newWindow',
+          'c20': 'lkqdCustom'
         },
         'adUnitCode': 'lkqd',
         'sizes': [[300, 250], [640, 480]],
@@ -75,6 +78,10 @@ describe('LKQD Bid Adapter Test', () => {
     ];
 
     it('should populate available parameters', () => {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+
       const requests = spec.buildRequests(bidRequests);
       expect(requests.length).to.equal(2);
       const r1 = requests[0].data;
@@ -82,14 +89,26 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r1).to.have.string('&sid=662921&');
       expect(r1).to.have.string('&width=300&');
       expect(r1).to.have.string('&height=250&');
+      expect(r1).to.have.string('&coppa=1&');
+      expect(r1).to.have.string('&c1=newWindow&');
+      expect(r1).to.have.string('&c20=lkqdCustom');
       const r2 = requests[1].data;
       expect(r2).to.have.string('pid=263&');
       expect(r2).to.have.string('&sid=662921&');
       expect(r2).to.have.string('&width=640&');
       expect(r2).to.have.string('&height=480&');
+      expect(r2).to.have.string('&coppa=1&');
+      expect(r2).to.have.string('&c1=newWindow&');
+      expect(r2).to.have.string('&c20=lkqdCustom');
+
+      config.getConfig.restore();
     });
 
     it('should not populate unspecified parameters', () => {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(false);
+
       const requests = spec.buildRequests(bidRequests);
       expect(requests.length).to.equal(2);
       const r1 = requests[0].data;
@@ -99,6 +118,8 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r1).to.not.have.string('&contentlength=');
       expect(r1).to.not.have.string('&contenturl=');
       expect(r1).to.not.have.string('&schain=');
+      expect(r1).to.not.have.string('&c10=');
+      expect(r1).to.not.have.string('coppa');
       const r2 = requests[1].data;
       expect(r2).to.not.have.string('&dnt=');
       expect(r2).to.not.have.string('&contentid=');
@@ -106,6 +127,10 @@ describe('LKQD Bid Adapter Test', () => {
       expect(r2).to.not.have.string('&contentlength=');
       expect(r2).to.not.have.string('&contenturl=');
       expect(r2).to.not.have.string('&schain=');
+      expect(r2).to.not.have.string('&c39=');
+      expect(r2).to.not.have.string('coppa');
+
+      config.getConfig.restore();
     });
 
     it('should handle single size request', () => {
diff --git a/test/spec/modules/lockerdomeBidAdapter_spec.js b/test/spec/modules/lockerdomeBidAdapter_spec.js
index 42e3f52e533..9e3d7981300 100644
--- a/test/spec/modules/lockerdomeBidAdapter_spec.js
+++ b/test/spec/modules/lockerdomeBidAdapter_spec.js
@@ -180,7 +180,8 @@ describe('LockerDomeAdapter', function () {
             currency: 'USD',
             netRevenue: true,
             ad: '',
-            ttl: 300
+            ttl: 300,
+            adomain: ['example.com']
           },
           {
             requestId: '4510f2834773ce',
@@ -191,7 +192,8 @@ describe('LockerDomeAdapter', function () {
             currency: 'USD',
             netRevenue: true,
             ad: '',
-            ttl: 300
+            ttl: 300,
+            adomain: ['example.com']
           }]
         }
       };
@@ -217,6 +219,9 @@ describe('LockerDomeAdapter', function () {
       expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.bids[0].netRevenue);
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.bids[0].ad);
       expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.bids[0].ttl);
+      expect(interpretedResponse[0]).to.have.property('meta');
+      expect(interpretedResponse[0].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[0].meta.advertiserDomains).to.deep.equal(serverResponse.body.bids[0].adomain);
 
       expect(interpretedResponse[1].requestId).to.equal(serverResponse.body.bids[1].requestId);
       expect(interpretedResponse[1].cpm).to.equal(serverResponse.body.bids[1].cpm);
@@ -227,6 +232,9 @@ describe('LockerDomeAdapter', function () {
       expect(interpretedResponse[1].netRevenue).to.equal(serverResponse.body.bids[1].netRevenue);
       expect(interpretedResponse[1].ad).to.equal(serverResponse.body.bids[1].ad);
       expect(interpretedResponse[1].ttl).to.equal(serverResponse.body.bids[1].ttl);
+      expect(interpretedResponse[1]).to.have.property('meta');
+      expect(interpretedResponse[1].meta).to.have.property('advertiserDomains');
+      expect(interpretedResponse[1].meta.advertiserDomains).to.deep.equal(serverResponse.body.bids[1].adomain);
     });
   });
 });
diff --git a/test/spec/modules/loganBidAdapter_spec.js b/test/spec/modules/loganBidAdapter_spec.js
new file mode 100644
index 00000000000..96029294df0
--- /dev/null
+++ b/test/spec/modules/loganBidAdapter_spec.js
@@ -0,0 +1,329 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/loganBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('LoganBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'logan',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  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://USeast2.logan.ai/?c=o&m=multi');
+    });
+    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');
+      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');
+    });
+
+    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');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      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);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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('iframe')
+      expect(syncData[0].url).to.be.a('string')
+      expect(syncData[0].url).to.equal('https://ssp-cookie.logan.ai/html?src=pbjs&gdpr=1&gdpr_consent=ALL')
+    });
+    it('Should return array of objects with proper sync config , include CCPA', function() {
+      const syncData = spec.getUserSyncs({}, {}, {}, {
+        consentString: '1NNN'
+      });
+      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('https://ssp-cookie.logan.ai/html?src=pbjs&ccpa_consent=1NNN')
+    });
+  });
+});
diff --git a/test/spec/modules/logicadBidAdapter_spec.js b/test/spec/modules/logicadBidAdapter_spec.js
index eddcaecac7b..6eb8dc1c043 100644
--- a/test/spec/modules/logicadBidAdapter_spec.js
+++ b/test/spec/modules/logicadBidAdapter_spec.js
@@ -19,7 +19,65 @@ describe('LogicadAdapter', function () {
       banner: {
         sizes: [[300, 250], [300, 600]]
       }
-    }
+    },
+    userId: {
+      sharedid: {
+        id: 'fakesharedid',
+        third: 'fakesharedid'
+      }
+    },
+    userIdAsEids: [{
+      source: 'sharedid.org',
+      uids: [{
+        id: 'fakesharedid',
+        atype: 1,
+        ext: {
+          third: 'fakesharedid'
+        }
+      }]
+    }]
+  }];
+  const nativeBidRequests = [{
+    bidder: 'logicad',
+    bidId: '51ef8751f9aead',
+    params: {
+      tid: 'bgjD1',
+      page: 'https://www.logicad.com/'
+    },
+    adUnitCode: 'div-gpt-ad-1460505748561-1',
+    transactionId: 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+    sizes: [[1, 1]],
+    bidderRequestId: '418b37f85e772c',
+    auctionId: '18fd8b8b0bd757',
+    mediaTypes: {
+      native: {
+        title: {
+          required: true
+        },
+        image: {
+          required: true
+        },
+        sponsoredBy: {
+          required: true
+        }
+      }
+    },
+    userId: {
+      sharedid: {
+        id: 'fakesharedid',
+        third: 'fakesharedid'
+      }
+    },
+    userIdAsEids: [{
+      source: 'sharedid.org',
+      uids: [{
+        id: 'fakesharedid',
+        atype: 1,
+        ext: {
+          third: 'fakesharedid'
+        }
+      }]
+    }]
   }];
   const bidderRequest = {
     refererInfo: {
@@ -52,6 +110,40 @@ describe('LogicadAdapter', function () {
       }
     }
   };
+  const nativeServerResponse = {
+    body: {
+      seatbid:
+        [{
+          bid: {
+            requestId: '51ef8751f9aead',
+            cpm: 101.0234,
+            width: 1,
+            height: 1,
+            creativeId: '2019',
+            currency: 'JPY',
+            netRevenue: true,
+            ttl: 60,
+            native: {
+              clickUrl: 'https://www.logicad.com',
+              image: {
+                url: 'https://cd.ladsp.com/img.png',
+                width: '1200',
+                height: '628'
+              },
+              impressionTrackers: [
+                'https://example.com'
+              ],
+              sponsoredBy: 'Logicad',
+              title: 'Native Creative',
+            }
+          }
+        }],
+      userSync: {
+        type: 'image',
+        url: 'https://cr-p31.ladsp.jp/cookiesender/31'
+      }
+    }
+  };
 
   describe('isBidRequestValid', function () {
     it('should return true if the tid parameter is present', function () {
@@ -69,6 +161,10 @@ describe('LogicadAdapter', function () {
       delete bidRequest[0].params;
       expect(spec.isBidRequestValid(bidRequest)).to.be.false;
     });
+
+    it('should return true if the tid parameter is present for native request', function () {
+      expect(spec.isBidRequestValid(nativeBidRequests[0])).to.be.true;
+    });
   });
 
   describe('buildRequests', function () {
@@ -77,6 +173,11 @@ describe('LogicadAdapter', function () {
       expect(request.method).to.equal('POST');
       expect(request.url).to.equal('https://pb.ladsp.com/adrequest/prebid');
       expect(request.data).to.exist;
+
+      const data = JSON.parse(request.data);
+      expect(data.auctionId).to.equal('18fd8b8b0bd757');
+      expect(data.eids[0].source).to.equal('sharedid.org');
+      expect(data.eids[0].uids[0].id).to.equal('fakesharedid');
     });
   });
 
@@ -101,6 +202,27 @@ describe('LogicadAdapter', function () {
       expect(interpretedResponse[0].netRevenue).to.equal(serverResponse.body.seatbid[0].bid.netRevenue);
       expect(interpretedResponse[0].ad).to.equal(serverResponse.body.seatbid[0].bid.ad);
       expect(interpretedResponse[0].ttl).to.equal(serverResponse.body.seatbid[0].bid.ttl);
+
+      // native
+      const nativeRequest = spec.buildRequests(nativeBidRequests, bidderRequest)[0];
+      const interpretedResponseForNative = spec.interpretResponse(nativeServerResponse, nativeRequest);
+
+      expect(interpretedResponseForNative).to.have.lengthOf(1);
+
+      expect(interpretedResponseForNative[0].requestId).to.equal(nativeServerResponse.body.seatbid[0].bid.requestId);
+      expect(interpretedResponseForNative[0].cpm).to.equal(nativeServerResponse.body.seatbid[0].bid.cpm);
+      expect(interpretedResponseForNative[0].width).to.equal(nativeServerResponse.body.seatbid[0].bid.width);
+      expect(interpretedResponseForNative[0].height).to.equal(nativeServerResponse.body.seatbid[0].bid.height);
+      expect(interpretedResponseForNative[0].creativeId).to.equal(nativeServerResponse.body.seatbid[0].bid.creativeId);
+      expect(interpretedResponseForNative[0].currency).to.equal(nativeServerResponse.body.seatbid[0].bid.currency);
+      expect(interpretedResponseForNative[0].netRevenue).to.equal(nativeServerResponse.body.seatbid[0].bid.netRevenue);
+      expect(interpretedResponseForNative[0].ttl).to.equal(nativeServerResponse.body.seatbid[0].bid.ttl);
+      expect(interpretedResponseForNative[0].native.clickUrl).to.equal(nativeServerResponse.body.seatbid[0].bid.native.clickUrl);
+      expect(interpretedResponseForNative[0].native.image.url).to.equal(nativeServerResponse.body.seatbid[0].bid.native.image.url);
+      expect(interpretedResponseForNative[0].native.image.width).to.equal(nativeServerResponse.body.seatbid[0].bid.native.image.width);
+      expect(interpretedResponseForNative[0].native.impressionTrackers).to.equal(nativeServerResponse.body.seatbid[0].bid.native.impressionTrackers);
+      expect(interpretedResponseForNative[0].native.sponsoredBy).to.equal(nativeServerResponse.body.seatbid[0].bid.native.sponsoredBy);
+      expect(interpretedResponseForNative[0].native.title).to.equal(nativeServerResponse.body.seatbid[0].bid.native.title);
     });
   });
 
diff --git a/test/spec/modules/lotamePanoramaIdSystem_spec.js b/test/spec/modules/lotamePanoramaIdSystem_spec.js
index c6d3383374a..5bbec1ec26f 100644
--- a/test/spec/modules/lotamePanoramaIdSystem_spec.js
+++ b/test/spec/modules/lotamePanoramaIdSystem_spec.js
@@ -440,10 +440,289 @@ describe('LotameId', function() {
     });
   });
 
-  it('should retrieve the id when decode is called', function() {
-    var id = lotamePanoramaIdSubmodule.decode('1234');
-    expect(id).to.be.eql({
-      'lotamePanoramaId': '1234'
+  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(
+        'https://id.crwdcntrl.net/id?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(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true&gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when gdpr applies but no consent string is available', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData = {
+      gdprApplies: true,
+      consentString: undefined
+    };
+
+    beforeEach(function () {
+      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 not include the gdpr consent string on the url', function() {
+      expect(request.url).to.be.eq(
+        'https://id.crwdcntrl.net/id?gdpr_applies=true'
+      );
+    });
+  });
+
+  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(
+        'https://id.crwdcntrl.net/id?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(
+        'https://id.crwdcntrl.net/id?gdpr_consent=consentGiven'
+      );
+    });
+  });
+
+  describe('when no consentData and no cookies', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+    let consentData;
+
+    beforeEach(function () {
+      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('https://id.crwdcntrl.net/id');
+    });
+  });
+
+  describe('with an empty cache, ignore profile id for error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          profile_id: '4ec137245858469eb94a4e248f238694',
+          expiry_ts: 10,
+          errors: [111],
+          core_id:
+            'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a',
+        })
+      );
+    });
+
+    it('should not save the first party id', function () {
+      sinon.assert.neverCalledWith(
+        setLocalStorageStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '4ec137245858469eb94a4e248f238694'
+      );
+    });
+
+    it('should save the expiry', function () {
+      sinon.assert.calledWith(setLocalStorageStub, 'panoramaId_expiry', 10);
+
+      sinon.assert.calledWith(setCookieStub, 'panoramaId_expiry', 10);
+    });
+
+    it('should save the id', function () {
+      sinon.assert.calledWith(
+        setLocalStorageStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87a'
+      );
+    });
+  });
+
+  describe('receives an optout request with an error 111', function () {
+    let request;
+    let callBackSpy = sinon.spy();
+
+    beforeEach(function () {
+      getCookieStub.withArgs('panoramaId_expiry').returns('1000');
+      getCookieStub
+        .withArgs('panoramaId')
+        .returns(
+          'ca22992567e3cd4d116a5899b88a55d0d857a23610db939ae6ac13ba2335d87d'
+        );
+
+      let submoduleCallback = lotamePanoramaIdSubmodule.getId({}).callback;
+      submoduleCallback(callBackSpy);
+
+      request = server.requests[0];
+
+      request.respond(
+        200,
+        responseHeader,
+        JSON.stringify({
+          errors: [111],
+          expiry_ts: Date.now() + 30 * 24 * 60 * 60 * 1000,
+        })
+      );
+    });
+
+    it('should call the remote server when getId is called', function () {
+      expect(callBackSpy.calledOnce).to.be.true;
+    });
+
+    it('should clear the panorama id', function () {
+      sinon.assert.calledWith(removeFromLocalStorageStub, 'panoramaId');
+
+      sinon.assert.calledWith(
+        setCookieStub,
+        'panoramaId',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
+    });
+
+    it('should not clear the profile id', function () {
+      sinon.assert.neverCalledWith(removeFromLocalStorageStub, '_cc_id');
+
+      sinon.assert.neverCalledWith(
+        setCookieStub,
+        '_cc_id',
+        '',
+        'Thu, 01 Jan 1970 00:00:00 GMT',
+        'Lax'
+      );
     });
   });
 });
diff --git a/test/spec/modules/lunamediaBidAdapter_spec.js b/test/spec/modules/lunamediaBidAdapter_spec.js
index fc8648bf8a0..c0809071419 100755
--- a/test/spec/modules/lunamediaBidAdapter_spec.js
+++ b/test/spec/modules/lunamediaBidAdapter_spec.js
@@ -7,9 +7,9 @@ describe('lunamediaBidAdapter', function () {
   let bidRequestsVid;
 
   beforeEach(function () {
-    bidRequests = [{'bidder': 'lunamedia', 'params': {'pubid': '0cf8d6d643e13d86a5b6374148a4afac', 'floor': 0.5, 'placement': 1234}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': 'f72931e6-2b0e-4e37-a2bc-1ea912141f81', 'sizes': [[300, 250]], 'bidId': '2aa73f571eaf29', 'bidderRequestId': '1bac84515a7af3', 'auctionId': '5dbc60fa-1aa1-41ce-9092-e6bbd4d478f7', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
+    bidRequests = [{'bidder': 'lunamedia', 'params': {'pubid': '0cf8d6d643e13d86a5b6374148a4afac', 'floor': 0.5, 'placement': 1234, size: '320x250'}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': 'f72931e6-2b0e-4e37-a2bc-1ea912141f81', 'sizes': [[300, 250]], 'bidId': '2aa73f571eaf29', 'bidderRequestId': '1bac84515a7af3', 'auctionId': '5dbc60fa-1aa1-41ce-9092-e6bbd4d478f7', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
 
-    bidRequestsVid = [{'bidder': 'lunamedia', 'params': {'pubid': '8537f00948fc37cc03c5f0f88e198a76', 'floor': 1.0, 'placement': 1234, 'video': {'id': 123, 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream'}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
+    bidRequestsVid = [{'bidder': 'lunamedia', 'params': {'pubid': '8537f00948fc37cc03c5f0f88e198a76', 'floor': 1.0, 'placement': 1234, size: '320x480', 'video': {'id': 123, 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream'}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
   });
 
   describe('spec.isBidRequestValid', function () {
diff --git a/test/spec/modules/lunamediahbBidAdapter_spec.js b/test/spec/modules/lunamediahbBidAdapter_spec.js
new file mode 100644
index 00000000000..e9f88935ed5
--- /dev/null
+++ b/test/spec/modules/lunamediahbBidAdapter_spec.js
@@ -0,0 +1,304 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/lunamediahbBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('LunamediaHBBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'lunamediahb',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  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://balancer.lmgssp.com/?c=o&m=multi');
+    });
+    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');
+      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');
+    });
+
+    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');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      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);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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/luponmediaBidAdapter_spec.js b/test/spec/modules/luponmediaBidAdapter_spec.js
index 39c915e38b8..8aeecc87c98 100644
--- a/test/spec/modules/luponmediaBidAdapter_spec.js
+++ b/test/spec/modules/luponmediaBidAdapter_spec.js
@@ -364,4 +364,49 @@ 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/malltvBidAdapter_spec.js b/test/spec/modules/malltvBidAdapter_spec.js
new file mode 100644
index 00000000000..c31e91992f7
--- /dev/null
+++ b/test/spec/modules/malltvBidAdapter_spec.js
@@ -0,0 +1,185 @@
+import { expect } from 'chai';
+import { spec } from 'modules/malltvBidAdapter';
+
+describe('malltvAdapterTest', () => {
+  describe('bidRequestValidity', () => {
+    it('bidRequest with propertyId and placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          propertyId: '{propertyId}',
+          placementId: '{placementId}'
+        }
+      })).to.equal(true);
+    });
+
+    it('bidRequest without propertyId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          placementId: '{placementId}'
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {
+          propertyId: '{propertyId}',
+        }
+      })).to.equal(false);
+    });
+
+    it('bidRequest without propertyId or placementId', () => {
+      expect(spec.isBidRequestValid({
+        bidder: 'malltv',
+        params: {}
+      })).to.equal(false);
+    });
+  });
+
+  describe('bidRequest', () => {
+    const bidRequests = [{
+      'bidder': 'malltv',
+      'params': {
+        'propertyId': '{propertyId}',
+        'placementId': '{placementId}',
+        'data': {
+          'catalogs': [{
+            'catalogId': 1,
+            'items': ['1', '2', '3']
+          }],
+          'inventory': {
+            'category': ['category1', 'category2'],
+            'query': ['query']
+          }
+        }
+      },
+      'adUnitCode': 'hb-leaderboard',
+      'transactionId': 'b6b889bb-776c-48fd-bc7b-d11a1cf0425e',
+      'sizes': [[300, 250]],
+      'bidId': '10bdc36fe0b48c8',
+      'bidderRequestId': '70deaff71c281d',
+      'auctionId': 'f9012acc-b6b7-4748-9098-97252914f9dc'
+    }];
+
+    it('bidRequest HTTP method', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.method).to.equal('POST');
+      });
+    });
+
+    it('bidRequest url', () => {
+      const endpointUrl = 'https://central.mall.tv/bid';
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.url).to.match(new RegExp(`${endpointUrl}`));
+      });
+    });
+
+    it('bidRequest data', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data).to.exist;
+      });
+    });
+
+    it('bidRequest sizes', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach(function (requestItem) {
+        expect(requestItem.data.placements).to.exist;
+        expect(requestItem.data.placements.length).to.equal(1);
+        expect(requestItem.data.placements[0].sizes).to.equal('300x250');
+      });
+    });
+
+    it('bidRequest data param', () => {
+      const requests = spec.buildRequests(bidRequests);
+      requests.forEach((requestItem) => {
+        expect(requestItem.data.data).to.exist;
+        expect(requestItem.data.data.catalogs).to.exist;
+        expect(requestItem.data.data.inventory).to.exist;
+        expect(requestItem.data.data.catalogs.length).to.equal(1);
+        expect(requestItem.data.data.catalogs[0].items.length).to.equal(3);
+        expect(Object.keys(requestItem.data.data.inventory).length).to.equal(2);
+        expect(requestItem.data.data.inventory.category.length).to.equal(2);
+        expect(requestItem.data.data.inventory.query.length).to.equal(1);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const bidRequest = {
+      'method': 'POST',
+      'url': 'https://central.mall.tv/bid',
+      'data': {
+        'sizes': '300x250',
+        'adUnitId': 'rectangle',
+        'placementId': '{placementId}',
+        'propertyId': '{propertyId}',
+        'pageViewGuid': '{pageViewGuid}',
+        'url': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'requestid': '26ee8fe87940da7',
+        'bidid': '2962dbedc4768bf'
+      }
+    };
+
+    const bidResponse = {
+      body: [{
+        'CPM': 1,
+        'Width': 300,
+        'Height': 250,
+        'Referrer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+        'Ad': '
Test ad
',
+        'CreativeId': '123abc',
+        'NetRevenue': false,
+        'Currency': 'EUR',
+        'TTL': 360,
+        'ADomain': ['somedomain.com']
+      }],
+      headers: {}
+    };
+
+    it('all keys present', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      let keys = [
+        'requestId',
+        'cpm',
+        'width',
+        'height',
+        'creativeId',
+        'currency',
+        'netRevenue',
+        'ttl',
+        'referrer',
+        'ad',
+        'vastUrl',
+        'mediaType',
+        'meta'
+      ];
+
+      let resultKeys = Object.keys(result[0]);
+      resultKeys.forEach(function (key) {
+        expect(keys.indexOf(key) !== -1).to.equal(true);
+      });
+    })
+
+    it('all values correct', () => {
+      const result = spec.interpretResponse(bidResponse, bidRequest);
+
+      expect(result[0].cpm).to.equal(1);
+      expect(result[0].width).to.equal(300);
+      expect(result[0].height).to.equal(250);
+      expect(result[0].creativeId).to.equal('123abc');
+      expect(result[0].currency).to.equal('EUR');
+      expect(result[0].netRevenue).to.equal(false);
+      expect(result[0].ttl).to.equal(360);
+      expect(result[0].referrer).to.equal('http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true');
+      expect(result[0].ad).to.equal('
Test ad
');
+      expect(result[0].meta.advertiserDomains).to.deep.equal(['somedomain.com']);
+    })
+  });
+});
diff --git a/test/spec/modules/mantisBidAdapter_spec.js b/test/spec/modules/mantisBidAdapter_spec.js
index 1dad60f5d98..579f41e620d 100644
--- a/test/spec/modules/mantisBidAdapter_spec.js
+++ b/test/spec/modules/mantisBidAdapter_spec.js
@@ -1,9 +1,20 @@
 import {expect} from 'chai';
-import {spec} from 'modules/mantisBidAdapter.js';
+import {spec, storage} from 'modules/mantisBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {sfPostMessage, iframePostMessage} from 'modules/mantisBidAdapter';
 
 describe('MantisAdapter', function () {
   const adapter = newBidder(spec);
+  const sandbox = sinon.sandbox.create();
+  let clock;
+
+  beforeEach(function () {
+    clock = sandbox.useFakeTimers();
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  });
 
   describe('isBidRequestValid', function () {
     let bid = {
@@ -31,6 +42,68 @@ describe('MantisAdapter', function () {
     });
   });
 
+  describe('viewability', function() {
+    it('iframe (viewed)', () => {
+      let viewed = false;
+
+      sandbox.stub(document, 'getElementsByTagName').withArgs('iframe').returns([
+        {
+          name: 'mantis',
+          getBoundingClientRect: () => ({
+            top: 10,
+            bottom: 260,
+            left: 10,
+            right: 190,
+            width: 300,
+            height: 250
+          })
+        }
+      ]);
+
+      iframePostMessage({innerHeight: 500, innerWidth: 500}, 'mantis', () => viewed = true);
+
+      sandbox.clock.runAll();
+
+      expect(viewed).to.equal(true);
+    });
+
+    it('safeframe (viewed)', () => {
+      let viewed = false;
+
+      sfPostMessage({
+        ext: {
+          register: (width, height, callback) => {
+            expect(width).to.equal(100);
+            expect(height).to.equal(200);
+
+            callback();
+          },
+          inViewPercentage: () => 60
+        }
+      }, 100, 200, () => viewed = true);
+
+      expect(viewed).to.equal(true);
+    });
+
+    it('safeframe (unviewed)', () => {
+      let viewed = false;
+
+      sfPostMessage({
+        ext: {
+          register: (width, height, callback) => {
+            expect(width).to.equal(100);
+            expect(height).to.equal(200);
+
+            callback();
+          },
+          inViewPercentage: () => 30
+        }
+      }, 100, 200, () => viewed = true);
+
+      expect(viewed).to.equal(false);
+    });
+  });
+
   describe('buildRequests', function () {
     let bidRequests = [
       {
@@ -47,6 +120,24 @@ describe('MantisAdapter', function () {
       }
     ];
 
+    it('gdpr consent not required', function () {
+      const request = spec.buildRequests(bidRequests, {gdprConsent: {gdprApplies: false}});
+
+      expect(request.url).not.to.include('consent=false');
+    });
+
+    it('gdpr consent required', function () {
+      const request = spec.buildRequests(bidRequests, {gdprConsent: {gdprApplies: true}});
+
+      expect(request.url).to.include('consent=false');
+    });
+
+    it('usp consent', function () {
+      const request = spec.buildRequests(bidRequests, {uspConsent: 'foobar'});
+
+      expect(request.url).to.include('usp=foobar');
+    });
+
     it('domain override', function () {
       window.mantis_domain = 'https://foo';
       const request = spec.buildRequests(bidRequests);
@@ -79,13 +170,12 @@ describe('MantisAdapter', function () {
     });
 
     it('use storage uuid', function () {
-      window.localStorage.setItem('mantis:uuid', 'bar');
+      sandbox.stub(storage, 'hasLocalStorage').callsFake(() => true);
+      sandbox.stub(storage, 'getDataFromLocalStorage').withArgs('mantis:uuid').returns('bar');
 
       const request = spec.buildRequests(bidRequests);
 
       expect(request.url).to.include('uuid=bar');
-
-      window.localStorage.removeItem('mantis:uuid');
     });
 
     it('detect amp', function () {
@@ -157,6 +247,9 @@ describe('MantisAdapter', function () {
           ad: '',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: []
+          },
           currency: 'USD'
         }
       ];
@@ -176,6 +269,7 @@ describe('MantisAdapter', function () {
               bid: 'bid',
               cpm: 1,
               view: 'view',
+              domains: ['foobar.com'],
               width: 300,
               height: 250,
               html: ''
@@ -194,6 +288,9 @@ describe('MantisAdapter', function () {
           ad: '',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: ['foobar.com']
+          },
           currency: 'USD'
         }
       ];
@@ -213,6 +310,7 @@ describe('MantisAdapter', function () {
               cpm: 1,
               view: 'view',
               width: 300,
+              domains: ['foobar.com'],
               height: 250,
               html: ''
             }
@@ -230,15 +328,22 @@ describe('MantisAdapter', function () {
           ad: '',
           creativeId: 'view',
           netRevenue: true,
+          meta: {
+            advertiserDomains: ['foobar.com']
+          },
           currency: 'USD'
         }
       ];
       let bidderRequest;
 
+      sandbox.stub(storage, 'hasLocalStorage').returns(true);
+      const spy = sandbox.spy(storage, 'setDataInLocalStorage');
+
       let result = spec.interpretResponse(response, {bidderRequest});
+
+      expect(spy.calledWith('mantis:uuid', 'uuid'));
       expect(result[0]).to.deep.equal(expectedResponse[0]);
       expect(window.mantis_uuid).to.equal(response.body.uuid);
-      expect(window.localStorage.getItem('mantis:uuid')).to.equal(response.body.uuid);
     });
 
     it('no ads returned', function () {
diff --git a/test/spec/modules/marsmediaBidAdapter_spec.js b/test/spec/modules/marsmediaBidAdapter_spec.js
index b4c2fe68f34..61e6f175f72 100644
--- a/test/spec/modules/marsmediaBidAdapter_spec.js
+++ b/test/spec/modules/marsmediaBidAdapter_spec.js
@@ -1,11 +1,41 @@
-import {spec} from '../../../modules/marsmediaBidAdapter.js';
-import * as utils from '../../../src/utils.js';
-import * as sinon from 'sinon';
+import { spec } from 'modules/marsmediaBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
 
-var r1adapter = spec;
+var marsAdapter = spec;
 
 describe('marsmedia adapter tests', function () {
+  let element, win;
+  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
+    };
     this.defaultBidderRequest = {
       'refererInfo': {
         'referer': 'Reference Page',
@@ -15,28 +45,40 @@ describe('marsmedia adapter tests', function () {
         ]
       }
     };
+
+    this.defaultBidRequestList = [
+      {
+        'bidder': 'marsmedia',
+        'params': {
+          'zoneId': 9999
+        },
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
+        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+        'bidderRequestId': '418b37f85e772c',
+        'auctionId': '18fd8b8b0bd757',
+        'bidRequestsCount': 1,
+        'bidId': '51ef8751f9aead'
+      }
+    ];
+
+    sandbox = sinon.sandbox.create();
+    sandbox.stub(document, 'getElementById').withArgs('Unit-Code').returns(element);
+    sandbox.stub(utils, 'getWindowTop').returns(win);
+    sandbox.stub(utils, 'getWindowSelf').returns(win);
+  });
+
+  afterEach(function() {
+    sandbox.restore();
   });
 
   describe('Verify 1.0 POST Banner Bid Request', function () {
     it('buildRequests works', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -52,11 +94,11 @@ describe('marsmedia adapter tests', function () {
       expect(openrtbRequest.imp[0].ext.bidder.zoneId).to.equal(9999);
     });
 
-    it('interpretResponse works', function() {
+    /* it('interpretResponse works', function() {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-0',
+            'impid': 'Unit-Code',
             'w': 300,
             'h': 250,
             'adm': '
My Compelling Ad
',
@@ -67,7 +109,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var bannerBids = r1adapter.interpretResponse(bidList);
+      var bannerBids = marsAdapter.interpretResponse(bidList);
 
       expect(bannerBids.length).to.equal(1);
       const bid = bannerBids[0];
@@ -78,7 +120,7 @@ describe('marsmedia adapter tests', function () {
       expect(bid.netRevenue).to.equal(true);
       expect(bid.cpm).to.equal(1.0);
       expect(bid.ttl).to.equal(350);
-    });
+    }); */
   });
 
   describe('Verify POST Video Bid Request', function() {
@@ -95,7 +137,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'sizes': [
             [300, 250]
           ],
@@ -107,7 +149,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       expect(bidRequest.url).to.have.string('https://hb.go2speed.media/bidder/?bid=3mhdom&zoneId=9999&hbv=');
       expect(bidRequest.method).to.equal('POST');
@@ -132,7 +174,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': 'https://example.com/',
             'adomain': [
@@ -147,7 +189,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -166,7 +208,7 @@ describe('marsmedia adapter tests', function () {
       var bidList = {
         'body': [
           {
-            'impid': 'div-gpt-ad-1438287399331-1',
+            'impid': 'Unit-Code',
             'price': 1,
             'adm': '',
             'adomain': [
@@ -181,7 +223,7 @@ describe('marsmedia adapter tests', function () {
         ]
       };
 
-      var videoBids = r1adapter.interpretResponse(bidList);
+      var videoBids = marsAdapter.interpretResponse(bidList);
 
       expect(videoBids.length).to.equal(1);
       const bid = videoBids[0];
@@ -199,26 +241,6 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc buildRequests', function() {
     it('should send GDPR Consent data to Marsmedia tag', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 250]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-3',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var consentString = 'testConsentString';
       var gdprBidderRequest = this.defaultBidderRequest;
       gdprBidderRequest.gdprConsent = {
@@ -226,13 +248,50 @@ describe('marsmedia adapter tests', function () {
         'consentString': consentString
       };
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, gdprBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, gdprBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.user.ext.consent).to.equal(consentString);
       expect(openrtbRequest.regs.ext.gdpr).to.equal(true);
     });
 
+    it('should have CCPA Consent if defined', function () {
+      const ccpaBidderRequest = this.defaultBidderRequest;
+      ccpaBidderRequest.uspConsent = '1YYN';
+      const bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, ccpaBidderRequest);
+      const openrtbRequest = JSON.parse(bidRequest.data);
+
+      expect(openrtbRequest.regs.ext.us_privacy).to.equal('1YYN');
+    });
+
+    it('should submit coppa if set in config', function () {
+      sinon.stub(config, 'getConfig')
+        .withArgs('coppa')
+        .returns(true);
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.regs.coppa).to.equal(1);
+      config.getConfig.restore();
+    });
+
+    it('should process floors module if available', function() {
+      const floorBidderRequest = this.defaultBidRequestList;
+      const floorInfo = {
+        currency: 'USD',
+        floor: 1.20
+      };
+      floorBidderRequest[0].getFloor = () => floorInfo;
+      const request = marsAdapter.buildRequests(floorBidderRequest, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(1.20);
+    });
+
+    it('should have 0 bidfloor value', function() {
+      const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+      const requestparse = JSON.parse(request.data);
+      expect(requestparse.imp[0].bidfloor).to.equal(0);
+    });
+
     it('prefer 2.0 sizes', function () {
       var bidRequestList = [
         {
@@ -245,7 +304,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300, 600]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'sizes': [[300, 250]],
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
@@ -255,7 +314,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format[0].w).to.equal(300);
@@ -274,7 +333,7 @@ describe('marsmedia adapter tests', function () {
               'sizes': [[300]]
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -283,7 +342,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -297,7 +356,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -306,7 +365,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       expect(bidRequest.method).to.be.undefined;
     });
 
@@ -320,7 +379,7 @@ describe('marsmedia adapter tests', function () {
           'mediaTypes': {
             'banner': {'sizes': [['400', '500'], ['4n0', '5g0']]}
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -329,35 +388,15 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].banner.format.length).to.equal(1);
     });
 
     it('dnt is correctly set to 1', function () {
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaTypes': {
-            'banner': {
-              'sizes': [[300, 600]]
-            }
-          },
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
       var dntStub = sinon.stub(utils, 'getDNT').returns(1);
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
 
       dntStub.restore();
 
@@ -378,7 +417,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['600', '300']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -387,7 +426,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.equal(600);
@@ -407,7 +446,7 @@ describe('marsmedia adapter tests', function () {
               'playerSize': ['badWidth', 'badHeight']
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -416,7 +455,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -435,7 +474,7 @@ describe('marsmedia adapter tests', function () {
               'context': 'instream'
             }
           },
-          'adUnitCode': 'div-gpt-ad-1438287399331-1',
+          'adUnitCode': 'Unit-Code',
           'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
           'bidderRequestId': '418b37f85e772c',
           'auctionId': '18fd8b8b0bd757',
@@ -444,7 +483,7 @@ describe('marsmedia adapter tests', function () {
         }
       ];
 
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
 
       const openrtbRequest = JSON.parse(bidRequest.data);
       expect(openrtbRequest.imp[0].video.w).to.be.undefined;
@@ -453,52 +492,74 @@ describe('marsmedia adapter tests', function () {
 
     it('should return empty site data when refererInfo is missing', function() {
       delete this.defaultBidderRequest.refererInfo;
-      var bidRequestList = [
-        {
-          'bidder': 'marsmedia',
-          'params': {
-            'zoneId': 9999
-          },
-          'mediaType': 'banner',
-          'adUnitCode': 'div-gpt-ad-1438287399331-0',
-          'sizes': [[300, 250]],
-          'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-          'bidderRequestId': '418b37f85e772c',
-          'auctionId': '18fd8b8b0bd757',
-          'bidRequestsCount': 1,
-          'bidId': '51ef8751f9aead'
-        }
-      ];
-
-      var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+      var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
       const openrtbRequest = JSON.parse(bidRequest.data);
 
       expect(openrtbRequest.site.domain).to.equal('');
       expect(openrtbRequest.site.page).to.equal('');
       expect(openrtbRequest.site.ref).to.equal('');
     });
+
+    context('when element is fully in view', function() {
+      it('returns 100', function() {
+        Object.assign(element, { width: 600, height: 400 });
+        const request = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].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 = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].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 = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(75);
+      });
+    });
+
+    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 = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].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 = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
+        const openrtbRequest = JSON.parse(request.data);
+        expect(openrtbRequest.imp[0].ext.viewability).to.equal(0);
+      });
+    });
   });
 
   it('should return empty site.domain and site.page when refererInfo.stack is empty', function() {
     this.defaultBidderRequest.refererInfo.stack = [];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.site.domain).to.equal('');
@@ -508,24 +569,7 @@ describe('marsmedia adapter tests', function () {
 
   it('should secure correctly', function() {
     this.defaultBidderRequest.refererInfo.stack[0] = ['https://securesite.dvl'];
-    var bidRequestList = [
-      {
-        'bidder': 'marsmedia',
-        'params': {
-          'zoneId': 9999
-        },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
-        'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
-        'bidderRequestId': '418b37f85e772c',
-        'auctionId': '18fd8b8b0bd757',
-        'bidRequestsCount': 1,
-        'bidId': '51ef8751f9aead'
-      }
-    ];
-
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(this.defaultBidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.imp[0].secure).to.equal(1);
@@ -551,9 +595,12 @@ describe('marsmedia adapter tests', function () {
         'params': {
           'zoneId': 9999
         },
-        'mediaType': 'banner',
-        'adUnitCode': 'div-gpt-ad-1438287399331-0',
-        'sizes': [[300, 250]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250]]
+          }
+        },
+        'adUnitCode': 'Unit-Code',
         'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
         'bidderRequestId': '418b37f85e772c',
         'auctionId': '18fd8b8b0bd757',
@@ -563,7 +610,7 @@ describe('marsmedia adapter tests', function () {
       }
     ];
 
-    var bidRequest = r1adapter.buildRequests(bidRequestList, this.defaultBidderRequest);
+    var bidRequest = marsAdapter.buildRequests(bidRequestList, this.defaultBidderRequest);
     const openrtbRequest = JSON.parse(bidRequest.data);
 
     expect(openrtbRequest.source.ext.schain).to.deep.equal(schain);
@@ -571,7 +618,7 @@ describe('marsmedia adapter tests', function () {
 
   describe('misc interpretResponse', function () {
     it('No bid response', function() {
-      var noBidResponse = r1adapter.interpretResponse({
+      var noBidResponse = marsAdapter.interpretResponse({
         'body': ''
       });
       expect(noBidResponse.length).to.equal(0);
@@ -589,22 +636,73 @@ describe('marsmedia adapter tests', function () {
           'sizes': [[300, 250]]
         }
       },
-      'adUnitCode': 'bannerDiv'
+      'adUnitCode': 'Unit-Code'
     };
 
     it('should return true when required params found', function () {
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(true);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return false when placementId missing', function () {
       delete bid.params.zoneId;
-      expect(r1adapter.isBidRequestValid(bid)).to.equal(false);
+      expect(marsAdapter.isBidRequestValid(bid)).to.equal(false);
     });
   });
 
   describe('getUserSyncs', function () {
     it('returns an empty string', function () {
-      expect(r1adapter.getUserSyncs()).to.deep.equal([]);
+      expect(marsAdapter.getUserSyncs()).to.deep.equal([]);
+    });
+  });
+
+  describe('on bidWon', 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('on Timeout', 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.onTimeout({});
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
+    });
+  });
+
+  describe('on Set Targeting', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel');
+    });
+    afterEach(function() {
+      utils.triggerPixel.restore();
+    });
+    it('exists and is a function', () => {
+      expect(spec.onSetTargeting).to.exist.and.to.be.a('function');
+    });
+    it('should return nothing', function () {
+      var response = spec.onSetTargeting({});
+      expect(response).to.be.an('undefined')
+      expect(utils.triggerPixel.called).to.equal(true);
     });
   });
 
diff --git a/test/spec/modules/mass_spec.js b/test/spec/modules/mass_spec.js
new file mode 100644
index 00000000000..a4a87ce113f
--- /dev/null
+++ b/test/spec/modules/mass_spec.js
@@ -0,0 +1,151 @@
+import { expect } from 'chai';
+import {
+  init,
+  addBidResponseHook,
+  addListenerOnce,
+  isMassBid,
+  useDefaultMatch,
+  useDefaultRender,
+  updateRenderers,
+  listenerAdded,
+  isEnabled
+} from 'modules/mass';
+import { logInfo } from 'src/utils.js';
+
+// mock a MASS bid:
+const mockedMassBids = [
+  {
+    bidder: 'ix',
+    bidId: 'mass-bid-1',
+    requestId: 'mass-bid-1',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: 'MASS1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {}
+  },
+  {
+    bidder: 'ix',
+    bidId: 'mass-bid-2',
+    requestId: 'mass-bid-2',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: '1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {
+      mass: true
+    }
+  },
+];
+
+// mock non-MASS bids:
+const mockedNonMassBids = [
+  {
+    bidder: 'ix',
+    bidId: 'non-mass-bid-1',
+    requstId: 'non-mass-bid-1',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: 'MASS1234',
+    ad: '',
+    meta: {
+      mass: true
+    }
+  },
+  {
+    bidder: 'ix',
+    bidId: 'non-mass-bid-2',
+    requestId: 'non-mass-bid-2',
+    bidderRequestId: 'bidder-request-id-1',
+    dealId: '1234',
+    ad: 'mass://provider/product/etc...',
+    meta: {}
+  },
+];
+
+// mock bidder request:
+const mockedBidderRequest = {
+  bidderCode: 'ix',
+  bidderRequestId: 'bidder-request-id-1'
+};
+
+const noop = function() {};
+
+describe('MASS Module', function() {
+  let bidderRequest = Object.assign({}, mockedBidderRequest);
+
+  it('should be enabled by default', function() {
+    expect(isEnabled).to.equal(true);
+  });
+
+  it('can be disabled', function() {
+    init({enabled: false});
+    expect(isEnabled).to.equal(false);
+  });
+
+  it('should only affect MASS bids', function() {
+    init({renderUrl: 'https://...'});
+    mockedNonMassBids.forEach(function(mockedBid) {
+      const originalBid = Object.assign({}, mockedBid);
+      const bid = Object.assign({}, originalBid);
+
+      bidderRequest.bids = [bid];
+
+      addBidResponseHook.call({bidderRequest}, noop, 'ad-code-id', bid);
+
+      expect(bid).to.deep.equal(originalBid);
+    });
+  });
+
+  it('should only update the ad markup field', function() {
+    init({renderUrl: 'https://...'});
+    mockedMassBids.forEach(function(mockedBid) {
+      const originalBid = Object.assign({}, mockedBid);
+      const bid = Object.assign({}, originalBid);
+
+      bidderRequest.bids = [bid];
+
+      addBidResponseHook.call({bidderRequest}, noop, 'ad-code-id', bid);
+
+      expect(bid.ad).to.not.equal(originalBid.ad);
+
+      delete bid.ad;
+      delete originalBid.ad;
+
+      expect(bid).to.deep.equal(originalBid);
+    });
+  });
+
+  it('should add a message listener', function() {
+    addListenerOnce();
+    expect(listenerAdded).to.equal(true);
+  });
+
+  it('should support custom renderers', function() {
+    init({
+      renderUrl: 'https://...',
+      custom: [
+        {
+          dealIdPattern: /abc/,
+          render: function() {}
+        }
+      ]
+    });
+
+    const renderers = updateRenderers();
+
+    expect(renderers.length).to.equal(2);
+  });
+
+  it('should match bids by deal ID with the default matcher', function() {
+    const match = useDefaultMatch(/abc/);
+
+    expect(match({dealId: 'abc'})).to.equal(true);
+    expect(match({dealId: 'xyz'})).to.equal(false);
+  });
+
+  it('should have a default renderer', function() {
+    const render = useDefaultRender('https://example.com/render.js', 'abc');
+    render({});
+
+    expect(window.abc.loaded).to.equal(true);
+    expect(window.abc.queue.length).to.equal(1);
+  });
+});
diff --git a/test/spec/modules/mediaforceBidAdapter_spec.js b/test/spec/modules/mediaforceBidAdapter_spec.js
index 09d997e9349..be9b528aedd 100644
--- a/test/spec/modules/mediaforceBidAdapter_spec.js
+++ b/test/spec/modules/mediaforceBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {assert} from 'chai';
 import {spec} from 'modules/mediaforceBidAdapter.js';
 import * as utils from '../../../src/utils.js';
+import {BANNER, NATIVE} from '../../../src/mediaTypes.js';
 
 describe('mediaforce bid adapter', function () {
   let sandbox;
@@ -19,7 +20,7 @@ describe('mediaforce bid adapter', function () {
   }
 
   const language = getLanguage();
-  const baseUrl = 'https://rtb.mfadsrvr.com'
+  const baseUrl = 'https://rtb.mfadsrvr.com';
 
   describe('isBidRequestValid()', function () {
     const defaultBid = {
@@ -56,17 +57,6 @@ describe('mediaforce bid adapter', function () {
       bid.params = {publisher_id: 2, placement_id: '123'};
       assert.equal(spec.isBidRequestValid(bid), true);
     });
-
-    it('should return false when mediaTypes == native passed (native is not supported yet)', function () {
-      let bid = utils.deepClone(defaultBid);
-      bid.mediaTypes = {
-        native: {
-          sizes: [[300, 250]]
-        }
-      };
-      bid.params = {publisher_id: 2, placement_id: '123'};
-      assert.equal(spec.isBidRequestValid(bid), true);
-    });
   });
 
   describe('buildRequests()', function () {
@@ -76,14 +66,71 @@ describe('mediaforce bid adapter', function () {
         publisher_id: 'pub123',
         placement_id: '202',
       },
+      nativeParams: {
+        title: {
+          required: true,
+          len: 800
+        },
+        image: {
+          required: true,
+          sizes: [300, 250],
+        },
+        sponsoredBy: {
+          required: true
+        }
+      },
       mediaTypes: {
         banner: {
           sizes: [[300, 250]]
+        },
+        native: {
+          title: {
+            required: true,
+            len: 800
+          },
+          image: {
+            required: true,
+            sizes: [300, 250],
+          },
+          sponsoredBy: {
+            required: true
+          }
         }
       },
       transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
     };
 
+    const multiBid = [
+      {
+        publisher_id: 'pub123',
+        placement_id: '202',
+      },
+      {
+        publisher_id: 'pub123',
+        placement_id: '203',
+      },
+      {
+        publisher_id: 'pub124',
+        placement_id: '202',
+      },
+      {
+        publisher_id: 'pub123',
+        placement_id: '203',
+        transactionId: '8df76688-1618-417a-87b1-60ad046841c9'
+      }
+    ].map(({publisher_id, placement_id, transactionId}) => {
+      return {
+        bidder: 'mediaforce',
+        params: {publisher_id, placement_id},
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 250], [600, 400]]
+          }
+        },
+        transactionId: transactionId || 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+      }
+    });
+
     const refererInfo = {
       referer: 'https://www.prebid.org',
       reachedTop: true,
@@ -95,7 +142,9 @@ describe('mediaforce bid adapter', function () {
 
     const requestUrl = `${baseUrl}/header_bid`;
     const dnt = utils.getDNT() ? 1 : 0;
-    const secure = 1
+    const secure = window.location.protocol === 'https:' ? 1 : 0;
+    const pageUrl = window.location.href;
+    const timeout = 1500;
 
     it('should return undefined if no validBidRequests passed', function () {
       assert.equal(spec.buildRequests([]), undefined);
@@ -111,18 +160,29 @@ describe('mediaforce bid adapter', function () {
       bid.params.bidfloor = 0.5;
 
       let bidRequests = [bid];
-      let bidderRequest = {bids: bidRequests, refererInfo: refererInfo};
+      let bidderRequest = {
+        bids: bidRequests,
+        refererInfo: refererInfo,
+        timeout: timeout,
+        auctionId: '210a474e-88f0-4646-837f-4253b7cf14fb'
+      };
 
       let [request] = spec.buildRequests(bidRequests, bidderRequest);
 
       let data = JSON.parse(request.data);
       assert.deepEqual(data, {
-        id: bid.transactionId,
+        id: data.id,
+        tmax: timeout,
+        ext: {
+          mediaforce: {
+            hb_key: bidderRequest.auctionId
+          }
+        },
         site: {
           id: bid.params.publisher_id,
           publisher: {id: bid.params.publisher_id},
           ref: encodeURIComponent(refererInfo.referer),
-          page: encodeURIComponent(refererInfo.referer),
+          page: pageUrl,
         },
         device: {
           ua: navigator.userAgent,
@@ -134,14 +194,32 @@ describe('mediaforce bid adapter', function () {
           tagid: bid.params.placement_id,
           secure: secure,
           bidfloor: bid.params.bidfloor,
+          ext: {
+            mediaforce: {
+              transactionId: bid.transactionId
+            }
+          },
           banner: {w: 300, h: 250},
+          native: {
+            ver: '1.2',
+            request: {
+              assets: [
+                {id: 1, title: {len: 800}, required: 1},
+                {id: 3, img: {w: 300, h: 250, type: 3}, required: 1},
+                {id: 5, data: {type: 1}, required: 1}
+              ],
+              context: 1,
+              plcmttype: 1,
+              ver: '1.2'
+            }
+          },
         }],
       });
 
       assert.deepEqual(request, {
         method: 'POST',
         url: requestUrl,
-        data: '{"id":"d45dd707-a418-42ec-b8a7-b70a6c6fab0b","site":{"page":"https%3A%2F%2Fwww.prebid.org","ref":"https%3A%2F%2Fwww.prebid.org","id":"pub123","publisher":{"id":"pub123"}},"device":{"ua":"' + navigator.userAgent + '","js":1,"dnt":' + dnt + ',"language":"' + language + '"},"imp":[{"tagid":"202","secure":1,"bidfloor":0.5,"banner":{"w":300,"h":250}}]}',
+        data: '{"id":"' + data.id + '","site":{"page":"' + pageUrl + '","ref":"https%3A%2F%2Fwww.prebid.org","id":"pub123","publisher":{"id":"pub123"}},"device":{"ua":"' + navigator.userAgent + '","js":1,"dnt":' + dnt + ',"language":"' + language + '"},"ext":{"mediaforce":{"hb_key":"210a474e-88f0-4646-837f-4253b7cf14fb"}},"tmax":1500,"imp":[{"tagid":"202","secure":' + secure + ',"bidfloor":0.5,"ext":{"mediaforce":{"transactionId":"d45dd707-a418-42ec-b8a7-b70a6c6fab0b"}},"banner":{"w":300,"h":250},"native":{"ver":"1.2","request":{"assets":[{"required":1,"id":1,"title":{"len":800}},{"required":1,"id":3,"img":{"type":3,"w":300,"h":250}},{"required":1,"id":5,"data":{"type":1}}],"context":1,"plcmttype":1,"ver":"1.2"}}}]}',
       });
     });
 
@@ -157,6 +235,116 @@ describe('mediaforce bid adapter', function () {
       let data = JSON.parse(request.data);
       assert.deepEqual(data.imp[0].banner, {w: 300, h: 600, format: [{w: 300, h: 250}]});
     });
+
+    it('should return proper requests for multiple imps', function () {
+      let bidderRequest = {
+        bids: multiBid,
+        refererInfo: refererInfo,
+        timeout: timeout,
+        auctionId: '210a474e-88f0-4646-837f-4253b7cf14fb'
+      };
+
+      let requests = spec.buildRequests(multiBid, bidderRequest);
+      assert.equal(requests.length, 2);
+      requests.forEach((req) => {
+        req.data = JSON.parse(req.data);
+      });
+
+      assert.deepEqual(requests, [
+        {
+          method: 'POST',
+          url: requestUrl,
+          data: {
+            id: requests[0].data.id,
+            tmax: timeout,
+            ext: {
+              mediaforce: {
+                hb_key: bidderRequest.auctionId
+              }
+            },
+            site: {
+              id: 'pub123',
+              publisher: {id: 'pub123'},
+              ref: encodeURIComponent(refererInfo.referer),
+              page: pageUrl,
+            },
+            device: {
+              ua: navigator.userAgent,
+              dnt: dnt,
+              js: 1,
+              language: language,
+            },
+            imp: [{
+              tagid: '202',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }, {
+              tagid: '203',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }, {
+              tagid: '203',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: '8df76688-1618-417a-87b1-60ad046841c9'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }]
+          }
+        },
+        {
+          method: 'POST',
+          url: requestUrl,
+          data: {
+            id: requests[1].data.id,
+            tmax: timeout,
+            ext: {
+              mediaforce: {
+                hb_key: bidderRequest.auctionId
+              }
+            },
+            site: {
+              id: 'pub124',
+              publisher: {id: 'pub124'},
+              ref: encodeURIComponent(refererInfo.referer),
+              page: pageUrl,
+            },
+            device: {
+              ua: navigator.userAgent,
+              dnt: dnt,
+              js: 1,
+              language: language,
+            },
+            imp: [{
+              tagid: '202',
+              secure: secure,
+              bidfloor: 0,
+              ext: {
+                mediaforce: {
+                  transactionId: 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b'
+                }
+              },
+              banner: {w: 300, h: 250, format: [{w: 600, h: 400}]},
+            }]
+          }
+        }
+      ]);
+    });
   });
 
   describe('interpretResponse() banner', function () {
@@ -173,6 +361,7 @@ describe('mediaforce bid adapter', function () {
         cid: '2_ssl',
         h: 100,
         cat: ['IAB1-1'],
+        dealid: '3901521',
         crid: '2_ssl',
         impid: '2b3c9d103723a7',
         adid: '2_ssl',
@@ -193,18 +382,191 @@ describe('mediaforce bid adapter', function () {
       assert.deepEqual(bids, ([{
         ad: bid.adm,
         cpm: bid.price,
+        dealId: bid.dealid,
         creativeId: bid.adid,
         currency: response.body.cur,
         height: bid.h,
         netRevenue: true,
         burl: bid.burl,
+        mediaType: BANNER,
         requestId: bid.impid,
         ttl: 300,
+        meta: { advertiserDomains: [] },
         width: bid.w,
       }]));
     });
   });
 
+  describe('interpretResponse() native as object', function () {
+    it('successfull response', function () {
+      let titleText = 'Colorado Drivers With No DUI\'s Getting A Pay Day on Friday';
+      let imgData = {
+        url: `${baseUrl}/image`,
+        w: 1200,
+        h: 627
+      };
+      let nativeLink = `${baseUrl}/click/`;
+      let nativeTracker = `${baseUrl}/imp-image`;
+      let sponsoredByValue = 'Comparisons.org';
+      let bodyValue = 'Drivers With No Tickets In 3 Years Should Do This On June';
+      let bid = {
+        price: 3,
+        id: '65599d0a-42d2-446a-9d39-6086c1433ffe',
+        burl: `${baseUrl}/burl/\${AUCTION_PRICE}`,
+        cid: '2_ssl',
+        cat: ['IAB1-1'],
+        crid: '2_ssl',
+        impid: '2b3c9d103723a7',
+        adid: '2_ssl',
+        ext: {
+          advertiser_name: 'MediaForce',
+          native: {
+            link: {url: nativeLink},
+            assets: [{
+              id: 1,
+              title: {text: titleText},
+              required: 1
+            }, {
+              id: 3,
+              img: imgData
+            }, {
+              id: 5,
+              data: {value: sponsoredByValue}
+            }, {
+              id: 4,
+              data: {value: bodyValue}
+            }],
+            imptrackers: [nativeTracker],
+            ver: '1'
+          },
+          language: 'en',
+          agency_name: 'MediaForce DSP'
+        }
+      };
+
+      let response = {
+        body: {
+          seatbid: [{
+            bid: [bid]
+          }],
+          cur: 'USD',
+          id: '620190c2-7eef-42fa-91e2-f5c7fbc2bdd3'
+        }
+      };
+
+      let bids = spec.interpretResponse(response);
+      assert.deepEqual(bids, ([{
+        native: {
+          clickUrl: nativeLink,
+          clickTrackers: [],
+          impressionTrackers: [nativeTracker],
+          javascriptTrackers: [],
+          title: titleText,
+          image: {
+            url: imgData.url,
+            width: imgData.w,
+            height: imgData.h
+          },
+          sponsoredBy: sponsoredByValue,
+          body: bodyValue
+        },
+        cpm: bid.price,
+        creativeId: bid.adid,
+        currency: response.body.cur,
+        netRevenue: true,
+        burl: bid.burl,
+        mediaType: NATIVE,
+        requestId: bid.impid,
+        ttl: 300,
+        meta: { advertiserDomains: [] },
+      }]));
+    });
+  });
+
+  describe('interpretResponse() native as string', function () {
+    it('successfull response', function () {
+      let titleText = 'Colorado Drivers With No DUI\'s Getting A Pay Day on Friday';
+      let imgData = {
+        url: `${baseUrl}/image`,
+        w: 1200,
+        h: 627
+      };
+      let nativeLink = `${baseUrl}/click/`;
+      let nativeTracker = `${baseUrl}/imp-image`;
+      let sponsoredByValue = 'Comparisons.org';
+      let bodyValue = 'Drivers With No Tickets In 3 Years Should Do This On June';
+      let adm = JSON.stringify({
+        native: {
+          link: {url: nativeLink},
+          assets: [{
+            id: 1,
+            title: {text: titleText},
+            required: 1
+          }, {
+            id: 3,
+            img: imgData
+          }, {
+            id: 5,
+            data: {value: sponsoredByValue}
+          }, {
+            id: 4,
+            data: {value: bodyValue}
+          }],
+          imptrackers: [nativeTracker],
+          ver: '1'
+        }
+      });
+      let bid = {
+        price: 3,
+        id: '65599d0a-42d2-446a-9d39-6086c1433ffe',
+        burl: `${baseUrl}/burl/\${AUCTION_PRICE}`,
+        cid: '2_ssl',
+        cat: ['IAB1-1'],
+        crid: '2_ssl',
+        impid: '2b3c9d103723a7',
+        adid: '2_ssl',
+        adm: adm
+      };
+
+      let response = {
+        body: {
+          seatbid: [{
+            bid: [bid]
+          }],
+          cur: 'USD',
+          id: '620190c2-7eef-42fa-91e2-f5c7fbc2bdd3'
+        }
+      };
+
+      let bids = spec.interpretResponse(response);
+      assert.deepEqual(bids, ([{
+        native: {
+          clickUrl: nativeLink,
+          clickTrackers: [],
+          impressionTrackers: [nativeTracker],
+          javascriptTrackers: [],
+          title: titleText,
+          image: {
+            url: imgData.url,
+            width: imgData.w,
+            height: imgData.h
+          },
+          sponsoredBy: sponsoredByValue,
+          body: bodyValue
+        },
+        cpm: bid.price,
+        creativeId: bid.adid,
+        currency: response.body.cur,
+        netRevenue: true,
+        burl: bid.burl,
+        mediaType: NATIVE,
+        requestId: bid.impid,
+        ttl: 300,
+        meta: { advertiserDomains: [] },
+      }]));
+    });
+  });
+
   describe('onBidWon()', function () {
     beforeEach(function() {
       sinon.stub(utils, 'triggerPixel');
diff --git a/test/spec/modules/mediagoBidAdapter_spec.js b/test/spec/modules/mediagoBidAdapter_spec.js
new file mode 100644
index 00000000000..25cfc72672b
--- /dev/null
+++ b/test/spec/modules/mediagoBidAdapter_spec.js
@@ -0,0 +1,101 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/mediagoBidAdapter.js';
+
+describe('mediago:BidAdapterTests', function() {
+  let bidRequestData = {
+    'bidderCode': 'mediago',
+    'auctionId': '7fae02a9-0195-472f-ba94-708d3bc2c0d9',
+    'bidderRequestId': '4fec04e87ad785',
+    'bids': [{
+      'bidder': 'mediago',
+      'params': {
+        'token': '85a6b01e41ac36d49744fad726e3655d'
+      },
+      'mediaTypes': {
+        'banner': {
+          'sizes': [
+            [
+              300,
+              250
+            ]
+          ]
+        }
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': '5e24a2ce-db03-4565-a8a3-75dbddca9377',
+      'sizes': [
+        [
+          300,
+          250
+        ]
+      ],
+      'bidId': '54d73f19c9d47a',
+      'bidderRequestId': '4fec04e87ad785',
+      'auctionId': '7fae02a9-0195-472f-ba94-708d3bc2c0d9',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }]
+  };
+  let request = [];
+
+  it('mediago:validate_pub_params', function() {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'mediago',
+        params: {
+          token: ['85a6b01e41ac36d49744fad726e3655d']
+        }
+      })
+    ).to.equal(true);
+  });
+
+  it('mediago:validate_generated_params', function() {
+    request = spec.buildRequests(bidRequestData.bids, bidRequestData);
+    // console.log(request);
+    let req_data = JSON.parse(request.data);
+    expect(req_data.imp).to.have.lengthOf(1);
+  });
+
+  it('mediago:validate_response_params', function() {
+    let serverResponse = {
+      body: {
+        'id': '7244645c-a81a-4760-8fd6-9d908d2c4a44',
+        'seatbid': [{
+          'bid': [{
+            'id': 'aa86796a857ebedda9a2d7128a87dab1',
+            'impid': '1',
+            'price': 0.05,
+            'nurl': 'http://d21uzv52i0cqie.cloudfront.net/api/winnotice?tn=341443089c0cb829164455a42d216ee3\u0026winloss=1\u0026id=aa86796a857ebedda9a2d7128a87dab1\u0026seat_id=${AUCTION_SEAT_ID}\u0026currency=${AUCTION_CURRENCY}\u0026bid_id=${AUCTION_BID_ID}\u0026ad_id=${AUCTION_AD_ID}\u0026loss=${AUCTION_LOSS}\u0026imp_id=1\u0026price=${AUCTION_PRICE}\u0026test=0\u0026time=1597714943\u0026adp=Dtnz0O4U8sdAU-XGGijCAgMbjDIeMGyCLXeSg1laXxM\u0026dsp_id=22\u0026url=-BFDu2NYtc4PYTplFW_2JcnDSRVLOOfaERbwJABjFyG6NUB4ywA3dUaXt5zPlyCUpBCOxjH9gk4E6yWTshzuSfQSx7g_TxvcXYUgh7YtY9NQZxx14InmNCTsezqID5UztV7llz8SXWHQ-ZsutH1nJIZzl1jH3i2uCPi91shqIZLN1bLJ5guAr5O4WyxVeOqIKyD_GiVcY9Olm51iI_3wgwFyDEN_dIDv-ObgNxpbPD0L11-62bjhGw3__7RuEo6XLdox-g46Fcqk6i0zayfsPM4QeMAhWJ4lsg-xswSI0YAfzyoOIeTWB78mdpt_GmN5PKZZPqyO7VkbwHEasn-mTyYTddbz5v2fzEkRO0AQZtAZx96PANGrNvcOHnRVmCdkzN96b5Ur1_8ipdyzHOFRtJ-z_KmKaxig6himvMCePozZvrvihiGhigP4RGiFT7ytVYKHyUGAV2PF5SwtgnB0uGCltd7o1CLhZyZEQNgE7LSESyGztZ5kM9N_VZV9gPZVhvlJDfYFNRW9i6D2pZxV0Gd63rA9gpeUJ3mhbkj-B27VRKrNTBSrwIAU7P0RPD5_opl3G8nPD1Ce2vKuQK8qynHWQblfeA61nDok-fRezSKbzwepqi8oxXadFrCmN7KxP_mPqA794xYzIw5-mS64NA',
+            'burl': 'http://d21uzv52i0cqie.cloudfront.net/api/winnotice?tn=341443089c0cb829164455a42d216ee3\u0026winloss=2\u0026id=aa86796a857ebedda9a2d7128a87dab1\u0026seat_id=${AUCTION_SEAT_ID}\u0026currency=${AUCTION_CURRENCY}\u0026bid_id=${AUCTION_BID_ID}\u0026ad_id=${AUCTION_AD_ID}\u0026loss=${AUCTION_LOSS}\u0026imp_id=1\u0026price=${AUCTION_PRICE}\u0026test=0\u0026time=1597714943\u0026adp=Dtnz0O4U8sdAU-XGGijCAgMbjDIeMGyCLXeSg1laXxM\u0026dsp_id=22\u0026url=dXerAvyp4zYQzsQ56eGB4JtiA4yFaYlTqcHffccrvCg',
+            'lurl': 'http://d21uzv52i0cqie.cloudfront.net/api/winnotice?tn=341443089c0cb829164455a42d216ee3\u0026winloss=0\u0026id=aa86796a857ebedda9a2d7128a87dab1\u0026seat_id=${AUCTION_SEAT_ID}\u0026currency=${AUCTION_CURRENCY}\u0026bid_id=${AUCTION_BID_ID}\u0026ad_id=${AUCTION_AD_ID}\u0026loss=${AUCTION_LOSS}\u0026imp_id=1\u0026price=${AUCTION_PRICE}\u0026test=0\u0026time=1597714943\u0026adp=Dtnz0O4U8sdAU-XGGijCAgMbjDIeMGyCLXeSg1laXxM\u0026dsp_id=22\u0026url=ptSxg_vR7-fdx-WAkkUADJb__BntE5a6-RSeYdUewvk',
+            'adm': '\u003clink rel=\"stylesheet\" href=\"//cdn.mediago.io/js/style/style_banner_300*250.css\"\u003e\u003cdiv id=\"mgcontainer-583ce3286b442001205b2fb9a5488efc\" class=\"mediago-placement imgTopTitleBottom\" style=\"position:relative;width:298px;height:248px;overflow:hidden\"\u003e\u003ca href=\"http://trace.mediago.io/api/bidder/track?tn=341443089c0cb829164455a42d216ee3\u0026price=PRMC8pCHtH55ipgXubUs8jlsKTBxWRSEweH8Mee_aUQ\u0026evt=102\u0026rid=aa86796a857ebedda9a2d7128a87dab1\u0026campaignid=1003540\u0026impid=25-300x175-1\u0026offerid=1107782\u0026test=0\u0026time=1597714943\u0026cp=GJA03gjm-ugPTmN7prOpvhfu1aA04IgpTcW4oRX22Lg\u0026clickid=25_aa86796a857ebedda9a2d7128a87dab1_25-300x175-1\u0026acid=164\u0026trackingid=583ce3286b442001205b2fb9a5488efc\u0026uid=6dda6c6b70eb4e2d9ab3469d921f2c74\u0026jt=2\u0026url=PQFFci337KgCVkx7KTgRItClLaWH0lgTcIlgBRTpfKngVJES4uKLfxXz9mjLcDWIbWQcEVVk_gfTcIaK8oKO2YyVG5lc3hjZeZr0VaIDHbWggPJaqtfDK9T0HZIKvrpe\" target=\"_blank\"\u003e\u003cimg alt=\"Robert Vowed To Keep Silent, But Decided To Put The People First And Speak\" src=\"https://d2cli4kgl5uxre.cloudfront.net/ML/b5e361889beef5eaf69987384b7a56e8__300x175.png\" style=\"height:70%;width:100%;border-width:0;border:none;\"\u003e\u003ch3 class=\"title\" style=\"font-size:16px;\"\u003eRobert Vowed To Keep Silent, But Decided To Put The People First And Speak\u003c/h3\u003e\u003c/a\u003e\u003cspan class=\"source\"\u003e\u003ca class=\"sourcename\" href=\"//www.mediago.io\" target=\"_blank\"\u003e\u003cspan\u003eAd\u003c/span\u003e \u003c/a\u003e\u003ca class=\"srcnameadslabelurl\" href=\"//www.mediago.io/privacy\" target=\"_blank\"\u003e\u003cspan\u003eViral Net News\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e\u003c/div\u003e\u003cscript\u003e!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){\"undefined\"!=typeof Symbol\u0026\u0026Symbol.toStringTag\u0026\u0026Object.defineProperty(e,Symbol.toStringTag,{value:\"Module\"}),Object.defineProperty(e,\"__esModule\",{value:!0})},n.t=function(e,t){if(1\u0026t\u0026\u0026(e=n(e)),8\u0026t)return e;if(4\u0026t\u0026\u0026\"object\"==typeof e\u0026\u0026e\u0026\u0026e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,\"default\",{enumerable:!0,value:e}),2\u0026t\u0026\u0026\"string\"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e\u0026\u0026e.__esModule?function(){return e.default}:function(){return e};return n.d(t,\"a\",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p=\"\",n(n.s=24)}({24:function(e,t,n){\"use strict\";function o(e){var t=new Image;t.src=e,t.style=\"display:none;visibility:hidden\",t.width=0,t.height=0,document.body.appendChild(t)}o(\"http://d21uzv52i0cqie.cloudfront.net/api/bidder/track?tn=341443089c0cb829164455a42d216ee3\u0026price=PRMC8pCHtH55ipgXubUs8jlsKTBxWRSEweH8Mee_aUQ\u0026evt=101\u0026rid=aa86796a857ebedda9a2d7128a87dab1\u0026campaignid=1003540\u0026impid=25-300x175-1\u0026offerid=1107782\u0026test=0\u0026time=1597714943\u0026cp=GJA03gjm-ugPTmN7prOpvhfu1aA04IgpTcW4oRX22Lg\u0026acid=164\u0026trackingid=583ce3286b442001205b2fb9a5488efc\u0026uid=6dda6c6b70eb4e2d9ab3469d921f2c74\");var r=document.getElementById(\"mgcontainer-583ce3286b442001205b2fb9a5488efc\"),i=!1;!function e(){setTimeout((function(){var t,n;!i\u0026\u0026(t=r,n=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight,(t.getBoundingClientRect()\u0026\u0026t.getBoundingClientRect().top)\u003c=n-.75*(t.offsetHeight||t.clientHeight))?(i=!0,o(\"http://d21uzv52i0cqie.cloudfront.net/api/bidder/track?tn=341443089c0cb829164455a42d216ee3\u0026price=PRMC8pCHtH55ipgXubUs8jlsKTBxWRSEweH8Mee_aUQ\u0026evt=104\u0026rid=aa86796a857ebedda9a2d7128a87dab1\u0026campaignid=1003540\u0026impid=25-300x175-1\u0026offerid=1107782\u0026test=0\u0026time=1597714943\u0026cp=GJA03gjm-ugPTmN7prOpvhfu1aA04IgpTcW4oRX22Lg\u0026acid=164\u0026trackingid=583ce3286b442001205b2fb9a5488efc\u0026uid=6dda6c6b70eb4e2d9ab3469d921f2c74\u0026sid=16__11__13\u0026format=\u0026crid=b5e361889beef5eaf69987384b7a56e8\")):e()}),500)}()}});\u003c/script\u003e\u003cscript type=\"text/javascript\" src=\"http://d21uzv52i0cqie.cloudfront.net/api/track?tn=341443089c0cb829164455a42d216ee3\u0026price=${AUCTION_PRICE}\u0026evt=5\u0026rid=aa86796a857ebedda9a2d7128a87dab1\u0026impid=1\u0026offerid=\u0026tagid=\u0026test=0\u0026time=1597714943\u0026adp=5zrCZ2rC-WLafYkNpeTnzA72tDqVZUlOA3Js6_eJjYU\u0026dsp_id=22\u0026cp=${cp}\u0026url=\u0026type=script\"\u003e\u003c/script\u003e\u003cscript\u003edocument.addEventListener\u0026\u0026document.addEventListener(\"click\",function(){var a=document.createElement(\"script\");a.src=\"http://d21uzv52i0cqie.cloudfront.net/api/track?tn=341443089c0cb829164455a42d216ee3\u0026price=${AUCTION_PRICE}\u0026evt=6\u0026rid=aa86796a857ebedda9a2d7128a87dab1\u0026impid=1\u0026offerid=\u0026tagid=\u0026test=0\u0026time=1597714943\u0026adp=5zrCZ2rC-WLafYkNpeTnzA72tDqVZUlOA3Js6_eJjYU\u0026dsp_id=22\u0026cp=${cp}\u0026url=\u0026clickid=25_aa86796a857ebedda9a2d7128a87dab1_1\";document.body.appendChild(a)});\u003c/script\u003e',
+            'cid': '1003540',
+            'crid': 'b5e361889beef5eaf69987384b7a56e8',
+            'w': 300,
+            'h': 250
+          }]
+        }],
+        'cur': 'USD'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse);
+    // console.log({
+    //   bids
+    // });
+    expect(bids).to.have.lengthOf(1);
+
+    let bid = bids[0];
+
+    expect(bid.creativeId).to.equal('b5e361889beef5eaf69987384b7a56e8');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.currency).to.equal('USD');
+  });
+});
diff --git a/test/spec/modules/medianetAnalyticsAdapter_spec.js b/test/spec/modules/medianetAnalyticsAdapter_spec.js
index dcec1050652..41a6338225e 100644
--- a/test/spec/modules/medianetAnalyticsAdapter_spec.js
+++ b/test/spec/modules/medianetAnalyticsAdapter_spec.js
@@ -9,18 +9,32 @@ const {
 } = CONSTANTS;
 
 const MOCK = {
-  AUCTION_INIT: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739},
+  Ad_Units: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
+  MULTI_FORMAT_TWIN_AD_UNITS: [{'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'banner': {'sizes': [[300, 250]]}, 'native': {'image': {'required': true, 'sizes': [150, 50]}}}, 'bids': [], 'ext': {'prop1': 'value1'}}, {'code': 'div-gpt-ad-1460505748561-0', 'mediaTypes': {'video': {'playerSize': [640, 480], 'context': 'instream'}}, 'bids': [], 'ext': {'prop1': 'value1'}}],
+  AUCTION_INIT: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739, 'timeout': 6000},
+  AUCTION_INIT_WITH_FLOOR: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'timestamp': 1584563605739, 'timeout': 6000, 'bidderRequests': [{'bids': [{ 'floorData': {'enforcements': {'enforceJS': true}} }]}]},
   BID_REQUESTED: {'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743},
-  BID_RESPONSE: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
+  MULTI_FORMAT_BID_REQUESTED: {'bidderCode': 'medianet', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'bids': [{'bidder': 'medianet', 'params': {'cid': 'TEST_CID', 'crid': '451466393'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}, 'video': {'playerSize': [640, 480], 'context': 'instream'}, 'native': {'image': {'required': true, 'sizes': [150, 50]}, 'title': {'required': true, 'len': 80}}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'sizes': [[300, 250]], 'bidId': '28248b0e6aece2', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'}], 'auctionStart': 1584563605739, 'timeout': 6000, 'uspConsent': '1YY', 'start': 1584563605743},
+  BID_RESPONSE: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'ext': {'pvid': 123, 'crid': '321'}, 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'floorData': {'floorValue': 1.10, 'floorRule': 'banner'}, 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
   AUCTION_END: {'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'auctionEnd': 1584563605739},
   SET_TARGETING: {'div-gpt-ad-1460505748561-0': {'prebid_test': '1', 'hb_format': 'banner', 'hb_source': 'client', 'hb_size': '300x250', 'hb_pb': '2.00', 'hb_adid': '3e6e4bce5c8fb3', 'hb_bidder': 'medianet', 'hb_format_medianet': 'banner', 'hb_source_medianet': 'client', 'hb_size_medianet': '300x250', 'hb_pb_medianet': '2.00', 'hb_adid_medianet': '3e6e4bce5c8fb3', 'hb_bidder_medianet': 'medianet'}},
+  NO_BID_SET_TARGETING: {'div-gpt-ad-1460505748561-0': {}},
   BID_WON: {'bidderCode': 'medianet', 'width': 300, 'height': 250, 'statusMessage': 'Bid available', 'adId': '3e6e4bce5c8fb3', 'requestId': '28248b0e6aece2', 'mediaType': 'banner', 'source': 'client', 'no_bid': false, 'cpm': 2.299, 'ad': 'AD_CODE', 'ttl': 180, 'creativeId': 'Test1', 'netRevenue': true, 'currency': 'USD', 'dfp_id': 'div-gpt-ad-1460505748561-0', 'originalCpm': 1.1495, 'originalCurrency': 'USD', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'responseTimestamp': 1584563606009, 'requestTimestamp': 1584563605743, 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'timeToRespond': 266, 'pbLg': '2.00', 'pbMg': '2.20', 'pbHg': '2.29', 'pbAg': '2.25', 'pbDg': '2.29', 'pbCg': '2.00', 'size': '300x250', 'adserverTargeting': {'hb_bidder': 'medianet', 'hb_adid': '3e6e4bce5c8fb3', 'hb_pb': '2.00', 'hb_size': '300x250', 'hb_source': 'client', 'hb_format': 'banner', 'prebid_test': 1}, 'status': 'rendered', 'params': [{'cid': 'test123', 'crid': '451466393'}]},
   NO_BID: {'bidder': 'medianet', 'params': {'cid': 'test123', 'crid': '451466393', 'site': {}}, 'mediaTypes': {'banner': {'sizes': [[300, 250]], 'ext': ['asdads']}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': '303fa0c6-682f-4aea-8e4a-dc68f0d5c7d5', 'sizes': [[300, 250], [300, 600]], 'bidId': '28248b0e6aece2', 'bidderRequestId': '13fccf3809fe43', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'src': 'client'},
   BID_TIMEOUT: [{'bidId': '28248b0e6aece2', 'bidder': 'medianet', 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'auctionId': '8e0d5245-deb3-406c-96ca-9b609e077ff7', 'params': [{'cid': 'test123', 'crid': '451466393', 'site': {}}, {'cid': '8CUX0H51P', 'crid': '451466393', 'site': {}}], 'timeout': 6}]
 }
 
+function performAuctionWithFloorConfig() {
+  events.emit(AUCTION_INIT, {...MOCK.AUCTION_INIT_WITH_FLOOR, adUnits: MOCK.Ad_Units});
+  events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+  events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(BID_WON, MOCK.BID_WON);
+}
+
 function performStandardAuctionWithWinner() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, {...MOCK.AUCTION_INIT, adUnits: MOCK.Ad_Units});
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(BID_RESPONSE, MOCK.BID_RESPONSE);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
@@ -28,20 +42,28 @@ function performStandardAuctionWithWinner() {
   events.emit(BID_WON, MOCK.BID_WON);
 }
 
+function performMultiFormatAuctionWithNoBid() {
+  events.emit(AUCTION_INIT, {...MOCK.AUCTION_INIT, adUnits: MOCK.MULTI_FORMAT_TWIN_AD_UNITS});
+  events.emit(BID_REQUESTED, MOCK.MULTI_FORMAT_BID_REQUESTED);
+  events.emit(NO_BID, MOCK.NO_BID);
+  events.emit(AUCTION_END, MOCK.AUCTION_END);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
+}
+
 function performStandardAuctionWithNoBid() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, {...MOCK.AUCTION_INIT, adUnits: MOCK.Ad_Units});
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(NO_BID, MOCK.NO_BID);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
-  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
 }
 
 function performStandardAuctionWithTimeout() {
-  events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+  events.emit(AUCTION_INIT, {...MOCK.AUCTION_INIT, adUnits: MOCK.Ad_Units});
   events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
   events.emit(BID_TIMEOUT, MOCK.BID_TIMEOUT);
   events.emit(AUCTION_END, MOCK.AUCTION_END);
-  events.emit(SET_TARGETING, MOCK.SET_TARGETING);
+  events.emit(SET_TARGETING, MOCK.NO_BID_SET_TARGETING);
 }
 
 function getQueryData(url) {
@@ -104,8 +126,10 @@ describe('Media.net Analytics Adapter', function() {
           cid: 'test123'
         }
       });
+      medianetAnalytics.clearlogsQueue();
     });
     afterEach(function () {
+      medianetAnalytics.clearlogsQueue();
       medianetAnalytics.disableAnalytics();
     });
 
@@ -115,6 +139,16 @@ describe('Media.net Analytics Adapter', function() {
       expect(medianetAnalytics.getlogsQueue().length).to.equal(0);
     });
 
+    it('should have all applicable sizes in request', function() {
+      medianetAnalytics.clearlogsQueue();
+      performMultiFormatAuctionWithNoBid();
+      const noBidLog = medianetAnalytics.getlogsQueue().map((log) => getQueryData(log))[0];
+      medianetAnalytics.clearlogsQueue();
+      expect(noBidLog.mtype).to.have.ordered.members([encodeURIComponent('banner|native|video'), encodeURIComponent('banner|video|native')]);
+      expect(noBidLog.szs).to.have.ordered.members([encodeURIComponent('300x250|1x1|640x480'), encodeURIComponent('300x250|1x1|640x480')]);
+      expect(noBidLog.vplcmtt).to.equal('instream');
+    });
+
     it('should have winner log in standard auction', function() {
       medianetAnalytics.clearlogsQueue();
       performStandardAuctionWithWinner();
@@ -137,12 +171,30 @@ describe('Media.net Analytics Adapter', function() {
         src: 'client',
         size: '300x250',
         mtype: 'banner',
+        gdpr: '0',
         cid: 'test123',
         lper: '1',
         ogbdp: '1.1495',
         flt: '1',
         supcrid: 'div-gpt-ad-1460505748561-0',
-        mpvid: '123'
+        mpvid: '123',
+        bidflr: '1.1'
+      });
+    });
+
+    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);
+      medianetAnalytics.clearlogsQueue();
+
+      expect(winnerLog[0]).to.include({
+        winner: '1',
+        curr: 'USD',
+        ogbdp: '1.1495',
+        bidflr: '1.1',
+        flrrule: 'banner',
+        flrdata: encodeURIComponent('ln=||skp=||enfj=true||enfd=||sr=||fs=')
       });
     });
 
@@ -158,7 +210,7 @@ describe('Media.net Analytics Adapter', function() {
       expect(noBidLog.status).to.have.ordered.members(['1', '2']);
       expect(noBidLog.src).to.have.ordered.members(['client', 'client']);
       expect(noBidLog.curr).to.have.ordered.members(['', '']);
-      expect(noBidLog.mtype).to.have.ordered.members(['', '']);
+      expect(noBidLog.mtype).to.have.ordered.members(['banner', 'banner']);
       expect(noBidLog.ogbdp).to.have.ordered.members(['', '']);
       expect(noBidLog.mpvid).to.have.ordered.members(['', '']);
       expect(noBidLog.crid).to.have.ordered.members(['', '451466393']);
@@ -176,7 +228,7 @@ describe('Media.net Analytics Adapter', function() {
       expect(timeoutLog.status).to.have.ordered.members(['1', '3']);
       expect(timeoutLog.src).to.have.ordered.members(['client', 'client']);
       expect(timeoutLog.curr).to.have.ordered.members(['', '']);
-      expect(timeoutLog.mtype).to.have.ordered.members(['', '']);
+      expect(timeoutLog.mtype).to.have.ordered.members(['banner', 'banner']);
       expect(timeoutLog.ogbdp).to.have.ordered.members(['', '']);
       expect(timeoutLog.mpvid).to.have.ordered.members(['', '']);
       expect(timeoutLog.crid).to.have.ordered.members(['', '451466393']);
diff --git a/test/spec/modules/medianetBidAdapter_spec.js b/test/spec/modules/medianetBidAdapter_spec.js
index fcfdcdf8c2f..adb9663ba7c 100644
--- a/test/spec/modules/medianetBidAdapter_spec.js
+++ b/test/spec/modules/medianetBidAdapter_spec.js
@@ -1,7 +1,9 @@
 import {expect} from 'chai';
 import {spec} from 'modules/medianetBidAdapter.js';
+import { makeSlot } from '../integration/faker/googletag.js';
 import { config } from 'src/config.js';
 
+$$PREBID_GLOBAL$$.version = $$PREBID_GLOBAL$$.version || 'version';
 let VALID_BID_REQUEST = [{
     'bidder': 'medianet',
     'params': {
@@ -37,6 +39,11 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
@@ -81,6 +88,11 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
@@ -127,6 +139,11 @@ let VALID_BID_REQUEST = [{
     },
     'adUnitCode': 'div-gpt-ad-1460505748561-123',
     'transactionId': 'c52a5c62-3c2b-4b90-9ff8-ec1487754822',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [[300, 251]],
+      }
+    },
     'sizes': [[300, 251]],
     'bidId': '3f97ca71b1e5c2',
     'bidderRequestId': '1e9b1f07797c1c',
@@ -731,6 +748,28 @@ let VALID_BID_REQUEST = [{
     }],
     'tmax': config.getConfig('bidderTimeout')
   },
+
+  VALID_VIDEO_BID_REQUEST = [{
+    'bidder': 'medianet',
+    'params': {
+      'cid': 'customer_id',
+      'video': {
+        'skipppable': true
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'transactionId': '277b631f-92f5-4844-8b19-ea13c095d3f1',
+    'mediaTypes': {
+      'video': {
+        'context': 'instream',
+      }
+    },
+    'bidId': '28f8f8130a583e',
+    'bidderRequestId': '1e9b1f07797c1c',
+    'auctionId': 'aafabfd0-28c0-4ac0-aa09-99689e88b81d',
+    'bidRequestsCount': 1
+  }],
+
   VALID_PAYLOAD_PAGE_META = (() => {
     let PAGE_META;
     try {
@@ -913,6 +952,42 @@ let VALID_BID_REQUEST = [{
       }
     }
   },
+  SERVER_VIDEO_OUTSTREAM_RESPONSE_VALID_BID = {
+    body: {
+      'id': 'd90ca32f-3877-424a-b2f2-6a68988df57a',
+      'bidList': [{
+        'no_bid': false,
+        'requestId': '27210feac00e96',
+        'cpm': 12.00,
+        'width': 640,
+        'height': 480,
+        'ttl': 180,
+        'creativeId': '370637746',
+        'netRevenue': true,
+        'vastXml': '',
+        'currency': 'USD',
+        'dfp_id': 'video1',
+        'mediaType': 'video',
+        'vto': 5000,
+        'mavtr': 10,
+        'avp': true,
+        'ap': true,
+        'pl': true,
+        'mt': true,
+        'jslt': 3000,
+        'context': 'outstream'
+      }],
+      'ext': {
+        'csUrl': [{
+          'type': 'image',
+          'url': 'http://cs.media.net/cksync.php'
+        }, {
+          'type': 'iframe',
+          'url': 'http://contextual.media.net/checksync.php?&vsSync=1'
+        }]
+      }
+    }
+  },
   SERVER_VALID_BIDS = [{
     'no_bid': false,
     'requestId': '27210feac00e96',
@@ -1156,6 +1231,11 @@ describe('Media.net bid adapter', function () {
       expect(JSON.parse(bidReq.data)).to.deep.equal(VALID_PAYLOAD_NATIVE);
     });
 
+    it('should parse params for video request', function () {
+      let bidReq = spec.buildRequests(VALID_VIDEO_BID_REQUEST, VALID_AUCTIONDATA);
+      expect(JSON.stringify(bidReq.data)).to.include('instream');
+    });
+
     it('should have valid crid present in bid request', function() {
       sandbox.stub(config, 'getConfig').callsFake((key) => {
         const config = {
@@ -1264,6 +1344,30 @@ describe('Media.net bid adapter', function () {
       expect(data.imp[1].ext).to.not.have.ownPropertyDescriptor('viewability');
       expect(data.imp[1].ext.visibility).to.equal(0);
     });
+    it('slot visibility should be calculable even in case of adUnitPath', function () {
+      const code = '/19968336/header-bid-tag-0';
+      const divId = 'div-gpt-ad-1460505748561-0';
+      window.googletag.pubads().setSlots([makeSlot({ code, divId })]);
+
+      let boundingRect = {
+        top: 1010,
+        left: 1010,
+        bottom: 1050,
+        right: 1050
+      };
+      documentStub.withArgs(divId).returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      documentStub.withArgs('div-gpt-ad-1460505748561-123').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+
+      const bidRequest = [{...VALID_BID_REQUEST[0], adUnitCode: code}]
+      const bidReq = spec.buildRequests(bidRequest, VALID_AUCTIONDATA);
+      const data = JSON.parse(bidReq.data);
+      expect(data.imp[0].ext.visibility).to.equal(2);
+      expect(data.imp[0].ext.viewability).to.equal(0);
+    });
   });
 
   describe('getUserSyncs', function () {
@@ -1337,4 +1441,50 @@ describe('Media.net bid adapter', function () {
       expect(response).to.deep.equal(undefined);
     });
   });
+
+  it('context should be outstream', function () {
+    let bids = spec.interpretResponse(SERVER_VIDEO_OUTSTREAM_RESPONSE_VALID_BID, []);
+    expect(bids[0].context).to.equal('outstream');
+  });
+  describe('buildRequests floor tests', function () {
+    let floor;
+    let getFloor = function(req) {
+      return floor[req.mediaType];
+    };
+    beforeEach(function () {
+      floor = {
+        'banner': {
+          'currency': 'USD',
+          'floor': 1
+        }
+      };
+      $$PREBID_GLOBAL$$.medianetGlobals = {};
+
+      let documentStub = sandbox.stub(document, 'getElementById');
+      let boundingRect = {
+        top: 50,
+        left: 50,
+        bottom: 100,
+        right: 100
+      };
+      documentStub.withArgs('div-gpt-ad-1460505748561-123').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      documentStub.withArgs('div-gpt-ad-1460505748561-0').returns({
+        getBoundingClientRect: () => boundingRect
+      });
+      let windowSizeStub = sandbox.stub(spec, 'getWindowSize');
+      windowSizeStub.returns({
+        w: 1000,
+        h: 1000
+      });
+      VALID_BID_REQUEST[0].getFloor = getFloor;
+    });
+
+    it('should build valid payload with floor', function () {
+      let requestObj = spec.buildRequests(VALID_BID_REQUEST, VALID_AUCTIONDATA);
+      requestObj = JSON.parse(requestObj.data);
+      expect(requestObj.imp[0].hasOwnProperty('bidfloors')).to.equal(true);
+    });
+  });
 });
diff --git a/test/spec/modules/mediasquareBidAdapter_spec.js b/test/spec/modules/mediasquareBidAdapter_spec.js
index 351fbb40228..20e5588a99e 100644
--- a/test/spec/modules/mediasquareBidAdapter_spec.js
+++ b/test/spec/modules/mediasquareBidAdapter_spec.js
@@ -24,6 +24,43 @@ describe('MediaSquare bid adapter tests', function () {
       code: 'publishername_atf_desktop_rg_pave'
     },
   }];
+  var VIDEO_PARAMS = [{
+    adUnitCode: 'banner-div',
+    bidId: 'aaaa1234',
+    auctionId: 'bbbb1234',
+    transactionId: 'cccc1234',
+    mediaTypes: {
+      video: {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4'],
+      }
+    },
+    bidder: 'mediasquare',
+    params: {
+      owner: 'test',
+      code: 'publishername_atf_desktop_rg_pave'
+    },
+  }];
+  var NATIVE_PARAMS = [{
+    adUnitCode: 'banner-div',
+    bidId: 'aaaa1234',
+    auctionId: 'bbbb1234',
+    transactionId: 'cccc1234',
+    mediaTypes: {
+      native: {
+        title: {
+          required: true,
+          len: 80
+        },
+      }
+    },
+    bidder: 'mediasquare',
+    params: {
+      owner: 'test',
+      code: 'publishername_atf_desktop_rg_pave'
+    },
+  }];
 
   var BID_RESPONSE = {'body': {
     'responses': [{
@@ -39,6 +76,7 @@ describe('MediaSquare bid adapter tests', function () {
       'bidder': 'msqClassic',
       'code': 'test/publishername_atf_desktop_rg_pave',
       'bid_id': 'aaaa1234',
+      'adomain': ['test.com'],
     }],
   }};
 
@@ -53,7 +91,7 @@ describe('MediaSquare bid adapter tests', function () {
       canonicalUrl: 'https://www.prebid.org/the/link/to/the/page'
     },
     uspConsent: '111222333',
-    userId: {'id5id': '1111'},
+    userId: { 'id5id': { uid: '1111' } },
     schain: {
       'ver': '1.0',
       'complete': 1,
@@ -98,6 +136,9 @@ describe('MediaSquare bid adapter tests', function () {
     expect(bid.mediasquare).to.exist;
     expect(bid.mediasquare.bidder).to.equal('msqClassic');
     expect(bid.mediasquare.code).to.equal([DEFAULT_PARAMS[0].params.owner, DEFAULT_PARAMS[0].params.code].join('/'));
+    expect(bid.meta).to.exist;
+    expect(bid.meta.advertiserDomains).to.exist;
+    expect(bid.meta.advertiserDomains).to.have.lengthOf(1);
   });
 
   it('Verifies bidder code', function () {
@@ -128,4 +169,33 @@ describe('MediaSquare bid adapter tests', function () {
     expect(syncs[0]).to.have.property('type').and.to.equal('image');
     expect(syncs[0]).to.have.property('url').and.to.equal('http://www.cookie.sync.org/');
   });
+  it('Verifies user sync with no bid response', function() {
+    var syncs = spec.getUserSyncs({}, null, DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.property('type').and.to.equal('iframe');
+  });
+  it('Verifies user sync with no bid body response', function() {
+    var syncs = spec.getUserSyncs({}, [], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.property('type').and.to.equal('iframe');
+    var syncs = spec.getUserSyncs({}, [{}], DEFAULT_OPTIONS.gdprConsent, DEFAULT_OPTIONS.uspConsent);
+    expect(syncs).to.have.property('type').and.to.equal('iframe');
+  });
+  it('Verifies native in bid response', function () {
+    const request = spec.buildRequests(NATIVE_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].native = {'title': 'native title'};
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid).to.have.property('native');
+    delete BID_RESPONSE.body.responses[0].native;
+  });
+  it('Verifies video in bid response', function () {
+    const request = spec.buildRequests(VIDEO_PARAMS, DEFAULT_OPTIONS);
+    BID_RESPONSE.body.responses[0].video = {'xml': 'my vast XML', 'url': 'my vast url'};
+    const response = spec.interpretResponse(BID_RESPONSE, request);
+    expect(response).to.have.lengthOf(1);
+    const bid = response[0];
+    expect(bid).to.have.property('vastXml');
+    expect(bid).to.have.property('vastUrl');
+    delete BID_RESPONSE.body.responses[0].video;
+  });
 });
diff --git a/test/spec/modules/missenaBidAdapter_spec.js b/test/spec/modules/missenaBidAdapter_spec.js
new file mode 100644
index 00000000000..026e79c6d5a
--- /dev/null
+++ b/test/spec/modules/missenaBidAdapter_spec.js
@@ -0,0 +1,131 @@
+import { expect } from 'chai';
+import { spec, _getPlatform } from 'modules/missenaBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+
+describe('Missena Adapter', function () {
+  const adapter = newBidder(spec);
+
+  const bidId = 'abc';
+
+  const bid = {
+    bidder: 'missena',
+    bidId: bidId,
+    sizes: [[1, 1]],
+    params: {
+      apiKey: 'PA-34745704',
+    },
+  };
+
+  describe('codes', function () {
+    it('should return a bidder code of missena', function () {
+      expect(spec.code).to.equal('missena');
+    });
+  });
+
+  describe('isBidRequestValid', function () {
+    it('should return true if the apiKey param is present', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should return false if the apiKey is missing', function () {
+      expect(
+        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: '' } }))
+      ).to.equal(false);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const consentString = 'AAAAAAAAA==';
+
+    const bidderRequest = {
+      gdprConsent: {
+        consentString: consentString,
+        gdprApplies: true,
+      },
+      refererInfo: {
+        referer: 'https://referer',
+        canonicalUrl: 'https://canonical',
+      },
+    };
+
+    const requests = spec.buildRequests([bid, bid], bidderRequest);
+    const request = requests[0];
+    const payload = JSON.parse(request.data);
+
+    it('should return as many server requests as bidder requests', function () {
+      expect(requests.length).to.equal(2);
+    });
+
+    it('should have a post method', function () {
+      expect(request.method).to.equal('POST');
+    });
+
+    it('should send the bidder id', function () {
+      expect(payload.request_id).to.equal(bidId);
+    });
+
+    it('should send referer information to the request', function () {
+      expect(payload.referer).to.equal('https://referer');
+      expect(payload.referer_canonical).to.equal('https://canonical');
+    });
+
+    it('should send gdpr consent information to the request', function () {
+      expect(payload.consent_string).to.equal(consentString);
+      expect(payload.consent_required).to.equal(true);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '',
+    };
+
+    const serverTimeoutResponse = {
+      requestId: bidId,
+      timeout: true,
+      ad: '',
+    };
+
+    const serverEmptyAdResponse = {
+      requestId: bidId,
+      cpm: 0.5,
+      currency: 'USD',
+      ad: '',
+    };
+
+    it('should return a proper bid response', function () {
+      const result = spec.interpretResponse({ body: serverResponse }, bid);
+
+      expect(result.length).to.equal(1);
+
+      expect(Object.keys(result[0])).to.have.members(
+        Object.keys(serverResponse)
+      );
+    });
+
+    it('should return an empty response when the server answers with a timeout', function () {
+      const result = spec.interpretResponse(
+        { body: serverTimeoutResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+
+    it('should return an empty response when the server answers with an empty ad', function () {
+      const result = spec.interpretResponse(
+        { body: serverEmptyAdResponse },
+        bid
+      );
+      expect(result).to.deep.equal([]);
+    });
+  });
+});
diff --git a/test/spec/modules/mobfoxpbBidAdapter_spec.js b/test/spec/modules/mobfoxpbBidAdapter_spec.js
new file mode 100644
index 00000000000..a02d580ab88
--- /dev/null
+++ b/test/spec/modules/mobfoxpbBidAdapter_spec.js
@@ -0,0 +1,304 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/mobfoxpbBidAdapter.js';
+import { BANNER, VIDEO, NATIVE } from '../../../src/mediaTypes.js';
+
+describe('MobfoxHBBidAdapter', function () {
+  const bid = {
+    bidId: '23fhj33i987f',
+    bidder: 'mobfoxpb',
+    mediaTypes: {
+      [BANNER]: {
+        sizes: [[300, 250]]
+      }
+    },
+    params: {
+      placementId: 783,
+      traffic: BANNER
+    }
+  };
+
+  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://bes.mobfox.com/?c=o&m=multi');
+    });
+    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');
+      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');
+    });
+
+    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');
+      expect(placement.traffic).to.equal(VIDEO);
+      expect(placement.wPlayer).to.equal(playerSize[0]);
+      expect(placement.hPlayer).to.equal(playerSize[1]);
+    });
+
+    it('Returns valid data for mediatype native', function () {
+      const native = {
+        title: {
+          required: true
+        },
+        body: {
+          required: true
+        },
+        icon: {
+          required: true,
+          size: [64, 64]
+        }
+      };
+
+      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);
+    });
+
+    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: '23fhj33i987f',
+          ttl: 120,
+          creativeId: '2',
+          netRevenue: true,
+          currency: 'USD',
+          dealId: '1'
+        }]
+      };
+      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');
+      expect(dataItem.netRevenue).to.be.true;
+      expect(dataItem.currency).to.equal('USD');
+    });
+    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'
+        }]
+      };
+      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');
+      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');
+    });
+    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',
+        }]
+      };
+      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.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');
+    });
+    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/multibid_spec.js b/test/spec/modules/multibid_spec.js
new file mode 100644
index 00000000000..e849392ee4b
--- /dev/null
+++ b/test/spec/modules/multibid_spec.js
@@ -0,0 +1,845 @@
+import {expect} from 'chai';
+import {
+  validateMultibid,
+  adjustBidderRequestsHook,
+  addBidResponseHook,
+  resetMultibidUnits,
+  sortByMultibid,
+  targetBidPoolHook,
+  resetMultiConfig
+} from 'modules/multibid/index.js';
+import {parse as parseQuery} from 'querystring';
+import {config} from 'src/config.js';
+import * as utils from 'src/utils.js';
+import find from 'core-js-pure/features/array/find.js';
+
+describe('multibid adapter', function () {
+  let bidArray = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 75,
+    'originalCpm': 75,
+    'bidder': 'bidderA',
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 52,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 52,
+    'bidder': 'bidderA',
+  }];
+  let bidCacheArray = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 66,
+    'originalCpm': 66,
+    'bidder': 'bidderA',
+    'originalBidder': 'bidderA',
+    'multibidPrefix': 'bidA'
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 38,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 38,
+    'bidder': 'bidderA',
+    'originalBidder': 'bidderA',
+    'multibidPrefix': 'bidA'
+  }];
+  let bidArrayAlt = [{
+    'bidderCode': 'bidderA',
+    'requestId': '1c5f0a05d3629a',
+    'cpm': 29,
+    'originalCpm': 29,
+    'bidder': 'bidderA'
+  }, {
+    'bidderCode': 'bidderA',
+    'cpm': 52,
+    'requestId': '2e6j8s05r4363h',
+    'originalCpm': 52,
+    'bidder': 'bidderA'
+  }, {
+    'bidderCode': 'bidderB',
+    'cpm': 3,
+    'requestId': '7g8h5j45l7654i',
+    'originalCpm': 3,
+    'bidder': 'bidderB'
+  }, {
+    'bidderCode': 'bidderC',
+    'cpm': 12,
+    'requestId': '9d7f4h56t6483u',
+    'originalCpm': 12,
+    'bidder': 'bidderC'
+  }];
+  let bidderRequests = [{
+    'bidderCode': 'bidderA',
+    'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+    'bidderRequestId': '10e78266423c0e',
+    'bids': [{
+      'bidder': 'bidderA',
+      'params': {'placementId': 1234567},
+      'crumbs': {'pubcid': 'fb4cfc66-ff3d-4fda-bef8-3f2cb6fe9412'},
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250]]
+        }
+      },
+      'adUnitCode': 'test-div',
+      'transactionId': 'c153f3da-84f0-4be8-95cb-0647c458bc60',
+      'sizes': [[300, 250]],
+      'bidId': '2408ef83b84c9d',
+      'bidderRequestId': '10e78266423c0e',
+      'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }]
+  }, {
+    'bidderCode': 'bidderB',
+    'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+    'bidderRequestId': '10e78266423c0e',
+    'bids': [{
+      'bidder': 'bidderB',
+      'params': {'placementId': 1234567},
+      'crumbs': {'pubcid': 'fb4cfc66-ff3d-4fda-bef8-3f2cb6fe9412'},
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[300, 250]]
+        }
+      },
+      'adUnitCode': 'test-div',
+      'transactionId': 'c153f3da-84f0-4be8-95cb-0647c458bc60',
+      'sizes': [[300, 250]],
+      'bidId': '2408ef83b84c9d',
+      'bidderRequestId': '10e78266423c0e',
+      'auctionId': 'e6bd4400-28fc-459b-9905-ad64d044daaa',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }]
+  }];
+
+  afterEach(function () {
+    config.resetConfig();
+    resetMultiConfig();
+    resetMultibidUnits();
+  });
+
+  describe('adjustBidderRequestsHook', function () {
+    let result;
+    let callbackFn = function (bidderRequests) {
+      result = bidderRequests;
+    };
+
+    beforeEach(function() {
+      result = null;
+    });
+
+    it('does not modify bidderRequest when no multibid config exists', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      adjustBidderRequestsHook(callbackFn, bidRequests);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.deep.equal(bidRequests);
+    });
+
+    it('does modify bidderRequest when multibid config exists', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.not.deep.equal(bidRequests);
+      expect(result[0].bidLimit).to.equal(2);
+    });
+
+    it('does modify bidderRequest when multibid config exists using bidders array', function () {
+      let bidRequests = [{...bidderRequests[0]}];
+
+      config.setConfig({multibid: [{bidders: ['bidderA'], maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result).to.not.deep.equal(bidRequests);
+      expect(result[0].bidLimit).to.equal(2);
+    });
+
+    it('does only modifies bidderRequest when multibid config exists for bidder', function () {
+      let bidRequests = [{...bidderRequests[0]}, {...bidderRequests[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      adjustBidderRequestsHook(callbackFn, [{...bidderRequests[0]}, {...bidderRequests[1]}]);
+
+      expect(result).to.not.equal(null);
+      expect(result[0]).to.not.deep.equal(bidRequests[0]);
+      expect(result[0].bidLimit).to.equal(2);
+      expect(result[1]).to.deep.equal(bidRequests[1]);
+      expect(result[1].bidLimit).to.equal(undefined);
+    });
+  });
+
+  describe('addBidResponseHook', function () {
+    let result;
+    let callbackFn = function (adUnitCode, bid) {
+      result = {
+        'adUnitCode': adUnitCode,
+        'bid': bid
+      };
+    };
+
+    beforeEach(function() {
+      result = null;
+    });
+
+    it('adds original bids and does not modify', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+    });
+
+    it('modifies and adds both bids based on multibid configuration', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+
+      delete bids[1].requestId;
+      delete result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+    });
+
+    it('only modifies bids defined in the multibid configuration', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderB',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderB',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[2]);
+    });
+
+    it('only modifies and returns bids under limit for a specifc bidder in the multibid configuration', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderA',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderA',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].multibidPrefix = 'bidA';
+      bids[1].originalBidder = 'bidderA';
+      bids[1].targetingBidder = 'bidA2';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.equal(null);
+    });
+
+    it('if no prefix in multibid configuration, modifies and returns bids under limit without preifx property', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      bids.push({
+        'bidderCode': 'bidderA',
+        'cpm': 33,
+        'requestId': '1j8s5f89y2345l',
+        'originalCpm': 33,
+        'bidder': 'bidderA',
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[0]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      bids[1].originalBidder = 'bidderA';
+      bids[1].originalRequestId = '2e6j8s05r4363h';
+      bids[1].requestId = result.bid.requestId;
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid).to.deep.equal(bids[1]);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.equal(null);
+    });
+
+    it('does not include extra bids if cpm is less than floor value', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArrayAlt[1]}, {...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}];
+
+      bids.map(bid => {
+        bid.floorData = {
+          cpmAfterAdjustments: bid.cpm,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          floorCurrency: 'USD',
+          floorRule: '*|banner',
+          floorRuleValue: 65,
+          floorValue: 65,
+          matchedFields: {
+            gptSlot: 'test-div',
+            mediaType: 'banner'
+          }
+        }
+
+        return bid;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[1]});
+
+      expect(result).to.equal(null);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[2]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderB');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[3]});
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderC');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+    });
+
+    it('does  include extra bids if cpm is not less than floor value', function () {
+      let adUnitCode = 'test-div';
+      let bids = [{...bidArrayAlt[1]}, {...bidArrayAlt[0]}];
+
+      bids.map(bid => {
+        bid.floorData = {
+          cpmAfterAdjustments: bid.cpm,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          floorCurrency: 'USD',
+          floorRule: '*|banner',
+          floorRuleValue: 25,
+          floorValue: 25,
+          matchedFields: {
+            gptSlot: 'test-div',
+            mediaType: 'banner'
+          }
+        }
+
+        return bid;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal(undefined);
+
+      result = null;
+
+      addBidResponseHook(callbackFn, adUnitCode, {...bids[0]});
+
+      bids[0].multibidPrefix = 'bidA';
+      bids[0].originalBidder = 'bidderA';
+
+      expect(result).to.not.equal(null);
+      expect(result.adUnitCode).to.not.equal(null);
+      expect(result.adUnitCode).to.equal('test-div');
+      expect(result.bid).to.not.equal(null);
+      expect(result.bid.bidder).to.equal('bidderA');
+      expect(result.bid.targetingBidder).to.equal('bidA2');
+    });
+  });
+
+  describe('targetBidPoolHook', function () {
+    let result;
+    let bidResult;
+    let callbackFn = function (bidsReceived, highestCpmCallback, adUnitBidLimit = 0, hasModified = false) {
+      result = {
+        'bidsReceived': bidsReceived,
+        'adUnitBidLimit': adUnitBidLimit,
+        'hasModified': hasModified
+      };
+    };
+    let bidResponseCallback = function (adUnitCode, bid) {
+      bidResult = bid;
+    };
+
+    beforeEach(function() {
+      result = null;
+      bidResult = null;
+    });
+
+    it('it does not run filter on bidsReceived if no multibid configuration found', function () {
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+      targetBidPoolHook(callbackFn, bids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(2);
+      expect(result.bidsReceived).to.deep.equal(bids);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(false);
+    });
+
+    it('it does filter on bidsReceived if multibid configuration found with no prefix', function () {
+      let bids = [{...bidArray[0]}, {...bidArray[1]}];
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2}]});
+
+      targetBidPoolHook(callbackFn, bids, utils.getHighestCpm);
+      bids.pop();
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(1);
+      expect(result.bidsReceived).to.deep.equal(bids);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it sorts and creates dynamic alias on bidsReceived if multibid configuration found with prefix', function () {
+      let modifiedBids = [{...bidArray[1]}, {...bidArray[0]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test-div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(2);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[1], modifiedBids[0]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[0].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[1].bidder).to.equal('bidderA');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it sorts by cpm treating dynamic alias as unique bid when no bid limit defined', function () {
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test-div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}]});
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(4);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[3], modifiedBids[0], modifiedBids[2], modifiedBids[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[0].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[0].cpm).to.equal(52);
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[1].bidder).to.equal('bidderA');
+      expect(result.bidsReceived[1].cpm).to.equal(29);
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[2].bidder).to.equal('bidderC');
+      expect(result.bidsReceived[2].cpm).to.equal(12);
+      expect(result.bidsReceived[3].bidderCode).to.equal('bidderB');
+      expect(result.bidsReceived[3].bidder).to.equal('bidderB');
+      expect(result.bidsReceived[3].cpm).to.equal(3);
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it should filter out dynamic bid when bid limit is less than unique bid pool', function () {
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test-div', {...bid});
+
+        return bidResult;
+      });
+
+      config.setConfig({ multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}] });
+
+      targetBidPoolHook(callbackFn, modifiedBids, utils.getHighestCpm, 3);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(3);
+      expect(result.bidsReceived).to.deep.equal([modifiedBids[3], modifiedBids[2], modifiedBids[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderB');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(3);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+
+    it('it should collect all bids from auction and bid cache then sort and filter', function () {
+      config.setConfig({ multibid: [{bidder: 'bidderA', maxBids: 2, targetBiddercodePrefix: 'bidA'}] });
+
+      let modifiedBids = [{...bidArrayAlt[0]}, {...bidArrayAlt[2]}, {...bidArrayAlt[3]}, {...bidArrayAlt[1]}].map(bid => {
+        addBidResponseHook(bidResponseCallback, 'test-div', {...bid});
+
+        return bidResult;
+      });
+
+      let bidPool = [].concat.apply(modifiedBids, [{...bidCacheArray[0]}, {...bidCacheArray[1]}]);
+
+      expect(bidPool.length).to.equal(6);
+
+      targetBidPoolHook(callbackFn, bidPool, utils.getHighestCpm);
+
+      expect(result).to.not.equal(null);
+      expect(result.bidsReceived).to.not.equal(null);
+      expect(result.bidsReceived.length).to.equal(4);
+      expect(result.bidsReceived).to.deep.equal([bidPool[4], bidPool[3], bidPool[2], bidPool[1]]);
+      expect(result.bidsReceived[0].bidderCode).to.equal('bidderA');
+      expect(result.bidsReceived[1].bidderCode).to.equal('bidA2');
+      expect(result.bidsReceived[2].bidderCode).to.equal('bidderC');
+      expect(result.bidsReceived[3].bidderCode).to.equal('bidderB');
+      expect(result.adUnitBidLimit).to.not.equal(null);
+      expect(result.adUnitBidLimit).to.equal(0);
+      expect(result.hasModified).to.not.equal(null);
+      expect(result.hasModified).to.equal(true);
+    });
+  });
+
+  describe('validate multibid', function () {
+    it('should fail validation for missing bidder name in entry', function () {
+      let conf = [{maxBids: 1}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should pass validation on all multibid entries', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 1}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(true);
+    });
+
+    it('should fail validation for maxbids less than 1 in entry', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 0}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should fail validation for maxbids greater than 9 in entry', function () {
+      let conf = [{bidder: 'bidderA', maxBids: 10}, {bidder: 'bidderB', maxBids: 2}];
+      let result = validateMultibid(conf);
+
+      expect(result).to.equal(false);
+    });
+
+    it('should add multbid entries to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 1}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}]);
+    });
+
+    it('should modify multbid entries and add to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 0}, {bidder: 'bidderB', maxBids: 15}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}, {bidder: 'bidderB', maxBids: 9}]);
+    });
+
+    it('should filter multbid entry and add modified to global config', function () {
+      config.setConfig({multibid: [{bidder: 'bidderA', maxBids: 0}, {maxBids: 15}]});
+      let conf = config.getConfig('multibid');
+
+      expect(conf.length).to.equal(1);
+      expect(conf).to.deep.equal([{bidder: 'bidderA', maxBids: 1}]);
+    });
+  });
+
+  describe('sort multibid', function () {
+    it('should not alter order', function () {
+      let bids = [{
+        'bidderCode': 'bidderA',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }];
+
+      let expected = [{
+        'bidderCode': 'bidderA',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }];
+      let result = bids.sort(sortByMultibid);
+
+      expect(result).to.deep.equal(expected);
+    });
+
+    it('should sort dynamic alias bidders to end', function () {
+      let bids = [{
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderA',
+        'cpm': 22,
+        'originalCpm': 22,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderB',
+        'cpm': 4,
+        'originalCpm': 4,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }, {
+        'bidderCode': 'bidB',
+        'cpm': 2,
+        'originalCpm': 2,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }];
+      let expected = [{
+        'bidderCode': 'bidderA',
+        'cpm': 22,
+        'originalCpm': 22,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidderB',
+        'cpm': 4,
+        'originalCpm': 4,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }, {
+        'bidderCode': 'bidA2',
+        'cpm': 75,
+        'originalCpm': 75,
+        'multibidPrefix': 'bidA',
+        'originalBidder': 'bidderA',
+        'bidder': 'bidderA',
+      }, {
+        'bidderCode': 'bidB',
+        'cpm': 2,
+        'originalCpm': 2,
+        'multibidPrefix': 'bidB',
+        'originalBidder': 'bidderB',
+        'bidder': 'bidderB',
+      }];
+      let result = bids.sort(sortByMultibid);
+
+      expect(result).to.deep.equal(expected);
+    });
+  });
+});
diff --git a/test/spec/modules/mwOpenLinkIdSystem_spec.js b/test/spec/modules/mwOpenLinkIdSystem_spec.js
new file mode 100644
index 00000000000..fb082b8cd16
--- /dev/null
+++ b/test/spec/modules/mwOpenLinkIdSystem_spec.js
@@ -0,0 +1,20 @@
+import { writeCookie, mwOpenLinkIdSubModule } from 'modules/mwOpenLinkIdSystem.js';
+
+const P_CONFIG_MOCK = {
+  params: {
+    accountId: '123',
+    partnerId: '123'
+  }
+};
+
+describe('mwOpenLinkId module', function () {
+  beforeEach(function() {
+    writeCookie('');
+  });
+
+  it('getId() should return a MediaWallah openLink Id when the MediaWallah openLink first party cookie exists', function () {
+    writeCookie({eid: 'XX-YY-ZZ-123'});
+    const id = mwOpenLinkIdSubModule.getId(P_CONFIG_MOCK);
+    expect(id).to.be.deep.equal({id: {eid: 'XX-YY-ZZ-123'}});
+  });
+});
diff --git a/test/spec/modules/nativoBidAdapter_spec.js b/test/spec/modules/nativoBidAdapter_spec.js
new file mode 100644
index 00000000000..6f489a65d3c
--- /dev/null
+++ b/test/spec/modules/nativoBidAdapter_spec.js
@@ -0,0 +1,229 @@
+import { expect } from 'chai'
+import { spec } from 'modules/nativoBidAdapter.js'
+// import { newBidder } from 'src/adapters/bidderFactory.js'
+// import * as bidderFactory from 'src/adapters/bidderFactory.js'
+// import { deepClone } from 'src/utils.js'
+// import { config } from 'src/config.js'
+
+describe('nativoBidAdapterTests', function () {
+  describe('isBidRequestValid', function () {
+    let bid = {
+      bidder: 'nativo',
+      params: {
+        placementId: '10433394',
+      },
+      adUnitCode: 'adunit-code',
+      sizes: [
+        [300, 250],
+        [300, 600],
+      ],
+      bidId: '27b02036ccfa6e',
+      bidderRequestId: '1372cd8bd8d6a8',
+      auctionId: 'cfc467e4-2707-48da-becb-bcaab0b2c114',
+    }
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      let bid2 = Object.assign({}, bid)
+      delete bid2.params
+      bid2.params = {}
+      expect(spec.isBidRequestValid(bid2)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    let bidRequests = [
+      {
+        bidder: 'nativo',
+        params: {
+          placementId: '10433394',
+        },
+        adUnitCode: 'adunit-code',
+        sizes: [
+          [300, 250],
+          [300, 600],
+        ],
+        bidId: '27b02036ccfa6e',
+        bidderRequestId: '1372cd8bd8d6a8',
+        auctionId: 'cfc467e4-2707-48da-becb-bcaab0b2c114',
+        transactionId: '3b36e7e0-0c3e-4006-a279-a741239154ff',
+      },
+    ]
+
+    it('url should contain query string parameters', function () {
+      const request = spec.buildRequests(bidRequests, {
+        bidderRequestId: 123456,
+        refererInfo: {
+          referer: 'https://www.test.com',
+        },
+      })
+
+      expect(request.url).to.exist
+      expect(request.url).to.be.a('string')
+
+      expect(request.url).to.include('?')
+      expect(request.url).to.include('ntv_ptd')
+      expect(request.url).to.include('ntv_pb_rid')
+      expect(request.url).to.include('ntv_ppc')
+      expect(request.url).to.include('ntv_url')
+    })
+  })
+})
+
+describe('interpretResponse', function () {
+  let response = {
+    id: '126456',
+    seatbid: [
+      {
+        seat: 'seat_0',
+        bid: [
+          {
+            id: 'f70362ac-f3cf-4225-82a5-948b690927a6',
+            impid: '1',
+            price: 3.569,
+            adm: '',
+            h: 300,
+            w: 250,
+            cat: [],
+            adomain: ['test.com'],
+            crid: '1060_72_6760217',
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  }
+
+  it('should get correct bid response', function () {
+    let expectedResponse = [
+      {
+        requestId: '1F254428-AB11-4D5E-9887-567B3F952CA5',
+        cpm: 3.569,
+        currency: 'USD',
+        width: 300,
+        height: 250,
+        creativeId: '1060_72_6760217',
+        dealId: 'f70362ac-f3cf-4225-82a5-948b690927a6',
+        netRevenue: true,
+        ttl: 360,
+        ad: '',
+        meta: {
+          advertiserDomains: ['test.com'],
+        },
+      },
+    ]
+
+    let bidderRequest = {
+      id: 123456,
+      bids: [
+        {
+          params: {
+            placementId: 1
+          }
+        },
+      ],
+    }
+
+    // mock
+    spec.getRequestId = () => 123456
+
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+    expect(Object.keys(result[0])).to.have.deep.members(
+      Object.keys(expectedResponse[0])
+    )
+  })
+
+  it('handles nobid responses', function () {
+    let response = {}
+    let bidderRequest
+
+    let result = spec.interpretResponse({ body: response }, { bidderRequest })
+    expect(result.length).to.equal(0)
+  })
+})
+
+describe('getUserSyncs', function () {
+  const response = [
+    {
+      body: {
+        cur: 'USD',
+        id: 'a136dbd8-4387-48bf-b8e4-ff9c1d6056ee',
+        seatbid: [
+          {
+            bid: [{}],
+            seat: 'seat_0',
+            syncUrls: [
+              {
+                type: 'image',
+                url: 'pixel-tracker-test-url/?{GDPR_params}',
+              },
+              {
+                type: 'iframe',
+                url: 'iframe-tracker-test-url/?{GDPR_params}',
+              },
+            ],
+          },
+        ],
+      },
+    },
+  ]
+
+  const gdprConsent = {
+    gdprApplies: true,
+    consentString: '111111'
+  }
+
+  const uspConsent = {
+    uspConsent: '1YYY'
+  }
+
+  it('Returns empty array if no supported user syncs', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: false,
+        pixelEnabled: false,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    expect(userSync).to.be.an('array').with.lengthOf(0)
+  })
+
+  it('Returns valid iframe user sync', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: true,
+        pixelEnabled: false,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    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('iframe')
+    expect(userSync[0].url).to.contain('gdpr=1&gdpr_consent=111111&us_privacy=1YYY')
+  })
+
+  it('Returns valid URL and type', function () {
+    let userSync = spec.getUserSyncs(
+      {
+        iframeEnabled: false,
+        pixelEnabled: true,
+      },
+      response,
+      gdprConsent,
+      uspConsent
+    )
+    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.contain('gdpr=1&gdpr_consent=111111&us_privacy=1YYY')
+  })
+})
diff --git a/test/spec/modules/nextMillenniumBidAdapter_spec.js b/test/spec/modules/nextMillenniumBidAdapter_spec.js
index f4d929b439c..42032eb03ea 100644
--- a/test/spec/modules/nextMillenniumBidAdapter_spec.js
+++ b/test/spec/modules/nextMillenniumBidAdapter_spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import * as utils from '../../../src/utils.js';
 import { spec } from 'modules/nextMillenniumBidAdapter.js';
 
 describe('nextMillenniumBidAdapterTests', function() {
@@ -8,20 +9,19 @@ describe('nextMillenniumBidAdapterTests', function() {
         bidId: 'transaction_1234',
         bidder: 'nextMillennium',
         params: {
-          placement_id: 12345
+          placement_id: '12345'
         },
         sizes: [[300, 250]]
       }
     ]
   };
-  let request = [];
 
   it('validate_pub_params', function() {
     expect(
       spec.isBidRequestValid({
         bidder: 'nextMillennium',
         params: {
-          placement_id: 12345
+          placement_id: '12345'
         }
       })
     ).to.equal(true);
@@ -32,7 +32,7 @@ describe('nextMillenniumBidAdapterTests', function() {
       {
         bidId: 'bid1234',
         bidder: 'nextMillennium',
-        params: { placement_id: -1 },
+        params: { placement_id: '-1' },
         sizes: [[300, 250]]
       }
     ];
@@ -40,34 +40,36 @@ describe('nextMillenniumBidAdapterTests', function() {
     expect(request[0].bidId).to.equal('bid1234');
   });
 
-  it('validate_getUserSyncs_function', function() {
-    expect(spec.getUserSyncs({ iframeEnabled: true })).to.have.lengthOf(1);
-    expect(spec.getUserSyncs({ iframeEnabled: false })).to.have.lengthOf(0);
-
-    let pixel = spec.getUserSyncs({ iframeEnabled: true });
-    expect(pixel[0].type).to.equal('iframe');
-    expect(pixel[0].url).to.equal('https://brainlyads.com/hb/s2s/matching');
-  });
-
   it('validate_response_params', function() {
     let serverResponse = {
       body: {
-        cpm: 1.7,
-        width: 300,
-        height: 250,
-        creativeId: 'p35t0enob6twbt9mofjc8e',
-        ad: 'Hello! It\'s a test ad!'
+        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
+              }
+            ]
+          }
+        ],
+        cur: 'USD'
       }
     };
 
     let bids = spec.interpretResponse(serverResponse, bidRequestData.bids[0]);
     expect(bids).to.have.lengthOf(1);
-
     let bid = bids[0];
 
-    expect(bid.creativeId).to.equal('p35t0enob6twbt9mofjc8e');
+    expect(bid.creativeId).to.equal('96846035');
     expect(bid.ad).to.equal('Hello! It\'s a test ad!');
-    expect(bid.cpm).to.equal(1.7);
+    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');
diff --git a/test/spec/modules/nextrollIdSystem_spec.js b/test/spec/modules/nextrollIdSystem_spec.js
new file mode 100644
index 00000000000..d89c7fe3c98
--- /dev/null
+++ b/test/spec/modules/nextrollIdSystem_spec.js
@@ -0,0 +1,56 @@
+import { nextrollIdSubmodule, storage } from 'modules/nextrollIdSystem.js';
+
+const LS_VALUE = `{
+  "AdID":{"id":"adid","key":"AdID"},
+  "AdID:1002": {"id":"adid","key":"AdID:1002","value":"id_value"}}`;
+
+describe('NextrollId module', function () {
+  let sandbox = sinon.sandbox.create();
+  let hasLocalStorageStub;
+  let getLocalStorageStub;
+
+  beforeEach(function() {
+    hasLocalStorageStub = sandbox.stub(storage, 'hasLocalStorage');
+    getLocalStorageStub = sandbox.stub(storage, 'getDataFromLocalStorage');
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+  })
+
+  const testCases = [
+    {
+      expect: {
+        id: {nextrollId: 'id_value'},
+      },
+      params: {partnerId: '1002'},
+      localStorage: LS_VALUE
+    },
+    {
+      expect: {id: undefined},
+      params: {partnerId: '1003'},
+      localStorage: LS_VALUE
+    },
+    {
+      expect: {id: undefined},
+      params: {partnerId: ''},
+      localStorage: LS_VALUE
+    },
+    {
+      expect: {id: undefined},
+      params: {partnerId: '102'},
+      localStorage: undefined
+    },
+    {
+      expect: {id: undefined},
+      params: undefined,
+      localStorage: undefined
+    }
+  ]
+  testCases.forEach(
+    (testCase, i) => it(`getId() (TC #${i}) should return the nextroll id if it exists`, function () {
+      getLocalStorageStub.withArgs('dca0.com').returns(testCase.localStorage);
+      const id = nextrollIdSubmodule.getId({params: testCase.params});
+      expect(id).to.be.deep.equal(testCase.expect);
+    }))
+});
diff --git a/test/spec/modules/nobidBidAdapter_spec.js b/test/spec/modules/nobidBidAdapter_spec.js
index 3b8fd32160b..c44b0ce3fc2 100644
--- a/test/spec/modules/nobidBidAdapter_spec.js
+++ b/test/spec/modules/nobidBidAdapter_spec.js
@@ -118,7 +118,7 @@ describe('Nobid Adapter', function () {
       expect(payload.a).to.exist;
       expect(payload.t).to.exist;
       expect(payload.tz).to.exist;
-      expect(payload.r).to.exist;
+      expect(payload.r).to.exist.and.to.equal('100x100');
       expect(payload.lang).to.exist;
       expect(payload.ref).to.exist;
       expect(payload.a[0].d).to.exist.and.to.equal('adunit-code');
@@ -228,6 +228,75 @@ describe('Nobid Adapter', function () {
     });
   });
 
+  describe('buildRequestsEIDs', function () {
+    const SITE_ID = 2;
+    const REFERER = 'https://www.examplereferer.com';
+    let bidRequests = [
+      {
+        'bidder': 'nobid',
+        'params': {
+          'siteId': SITE_ID
+        },
+        'adUnitCode': 'adunit-code',
+        'sizes': [[300, 250]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
+        'userIdAsEids': [
+          {
+            'source': 'criteo.com',
+            'uids': [
+              {
+                'id': 'CRITEO_ID',
+                'atype': 1
+              }
+            ]
+          },
+          {
+            'source': 'id5-sync.com',
+            'uids': [
+              {
+                'id': 'ID5_ID',
+                'atype': 1
+              }
+            ],
+            'ext': {
+              'linkType': 0
+            }
+          },
+          {
+            'source': 'adserver.org',
+            'uids': [
+              {
+                'id': 'TD_ID',
+                'atype': 1,
+                'ext': {
+                  'rtiPartner': 'TDID'
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ];
+
+    let bidderRequest = {
+      refererInfo: {referer: REFERER}
+    }
+
+    it('should criteo eid', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.sid).to.exist.and.to.equal(2);
+      expect(payload.eids[0].source).to.exist.and.to.equal('criteo.com');
+      expect(payload.eids[0].uids[0].id).to.exist.and.to.equal('CRITEO_ID');
+      expect(payload.eids[1].source).to.exist.and.to.equal('id5-sync.com');
+      expect(payload.eids[1].uids[0].id).to.exist.and.to.equal('ID5_ID');
+      expect(payload.eids[2].source).to.exist.and.to.equal('adserver.org');
+      expect(payload.eids[2].uids[0].id).to.exist.and.to.equal('TD_ID');
+    });
+  });
+
   describe('buildRequests', function () {
     const SITE_ID = 2;
     const REFERER = 'https://www.examplereferer.com';
@@ -264,6 +333,38 @@ describe('Nobid Adapter', function () {
       expect(payload.gdpr).to.exist;
     });
 
+    it('sends bid request to ad size', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a.length).to.exist.and.to.equal(1);
+      expect(payload.a[0].z[0][0]).to.equal(300);
+      expect(payload.a[0].z[0][1]).to.equal(250);
+    });
+
+    it('sends bid request to div id', function () {
+      const request = spec.buildRequests(bidRequests);
+      const payload = JSON.parse(request.data);
+      expect(payload.a).to.exist;
+      expect(payload.a[0].d).to.equal('adunit-code');
+    });
+
+    it('sends bid request to site id', function () {
+	  const request = spec.buildRequests(bidRequests);
+	  const payload = JSON.parse(request.data);
+	  expect(payload.a).to.exist;
+	  expect(payload.a[0].sid).to.equal(2);
+	  expect(payload.a[0].at).to.equal('banner');
+	  expect(payload.a[0].params.siteId).to.equal(2);
+    });
+
+    it('sends bid request to ad type', function () {
+  	  const request = spec.buildRequests(bidRequests);
+  	  const payload = JSON.parse(request.data);
+  	  expect(payload.a).to.exist;
+  	  expect(payload.a[0].at).to.equal('banner');
+  	});
+
     it('sends bid request to ENDPOINT via POST', function () {
       const request = spec.buildRequests(bidRequests);
       expect(request.url).to.contain('ads.servenobid.com/adreq');
@@ -291,6 +392,43 @@ describe('Nobid Adapter', function () {
       expect(payload.gdpr.consentString).to.exist.and.to.equal(consentString);
       expect(payload.gdpr.consentRequired).to.exist.and.to.be.true;
     });
+
+    it('should add gdpr consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'gdprConsent': {
+          gdprApplies: false
+        }
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.gdpr).to.exist;
+      expect(payload.gdpr.consentString).to.not.exist;
+      expect(payload.gdpr.consentRequired).to.exist.and.to.be.false;
+    });
+
+    it('should add usp consent information to the request', function () {
+      let bidderRequest = {
+        'bidderCode': 'nobid',
+        'auctionId': '1d1a030790a475',
+        'bidderRequestId': '22edbae2733bf6',
+        'timeout': 3000,
+        'uspConsent': '1Y-N'
+      };
+      bidderRequest.bids = bidRequests;
+
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = JSON.parse(request.data);
+
+      expect(payload.usp).to.exist;
+      expect(payload.usp).to.exist.and.to.equal('1Y-N');
+    });
   });
 
   describe('buildRequestsRefreshCount', function () {
@@ -460,6 +598,47 @@ describe('Nobid Adapter', function () {
     });
   });
 
+  describe('interpretResponseWithMeta', function () {
+    const CREATIVE_ID_300x250 = 'CREATIVE-100';
+    const ADUNIT_300x250 = 'ADUNIT-1';
+    const ADMARKUP_300x250 = 'ADMARKUP-300x250';
+    const PRICE_300x250 = 0.51;
+    const REQUEST_ID = '3db3773286ee59';
+    const DEAL_ID = 'deal123';
+    const ADOMAINS = ['adomain1', 'adomain2'];
+    let response = {
+      country: 'US',
+      ip: '68.83.15.75',
+      device: 'COMPUTER',
+      site: 2,
+      bids: [
+        {id: 1,
+          bdrid: 101,
+          divid: ADUNIT_300x250,
+          dealid: DEAL_ID,
+          creativeid: CREATIVE_ID_300x250,
+          size: {'w': 300, 'h': 250},
+          adm: ADMARKUP_300x250,
+          price: '' + PRICE_300x250,
+          meta: {
+        	  advertiserDomains: ADOMAINS
+          }
+        }
+      ]
+    };
+
+    it('should meta.advertiserDomains be respected', function () {
+      let bidderRequest = {
+        bids: [{
+          bidId: REQUEST_ID,
+          adUnitCode: ADUNIT_300x250
+        }]
+      }
+      let result = spec.interpretResponse({ body: response }, {bidderRequest: bidderRequest});
+      expect(result[0].meta.advertiserDomains).to.equal(ADOMAINS);
+    });
+  });
+
   describe('buildRequestsWithSupplyChain', function () {
     const SITE_ID = 2;
     let bidRequests = [
diff --git a/test/spec/modules/novatiqIdSystem_spec.js b/test/spec/modules/novatiqIdSystem_spec.js
new file mode 100644
index 00000000000..60c82626450
--- /dev/null
+++ b/test/spec/modules/novatiqIdSystem_spec.js
@@ -0,0 +1,70 @@
+import { novatiqIdSubmodule } from 'modules/novatiqIdSystem.js';
+import * as utils from 'src/utils.js';
+import { server } from 'test/mocks/xhr.js';
+
+describe('novatiqIdSystem', function () {
+  describe('getSrcId', function() {
+    it('getSrcId should set srcId value to 000 due to undefined parameter in config section', function() {
+      const config = { params: { } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set srcId value to 000 due to missing value in config section', function() {
+      const config = { params: { sourceid: '' } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set value to 000 due to null value in config section', function() {
+      const config = { params: { sourceid: null } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams);
+      expect(response).to.eq('000');
+    });
+
+    it('getSrcId should set value to 001 due to wrong length in config section max 3 chars', function() {
+      const config = { params: { sourceid: '1234' } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams);
+      expect(response).to.eq('001');
+    });
+
+    it('getSrcId should set value to 002 due to wrong format in config section', function() {
+      const config = { params: { sourceid: '1xc' } };
+      const configParams = config.params || {};
+      const response = novatiqIdSubmodule.getSrcId(configParams);
+      expect(response).to.eq('002');
+    });
+  });
+
+  describe('getId', function() {
+    it('should log message if novatiqId has wrong format', function() {
+      const config = { params: { sourceid: '123' } };
+      const response = novatiqIdSubmodule.getId(config);
+      expect(response.id).to.have.length(40);
+    });
+
+    it('should log message if novatiqId not provided', function() {
+      const config = { params: { sourceid: '123' } };
+      const response = novatiqIdSubmodule.getId(config);
+      expect(response.id).should.be.not.empty;
+    });
+  });
+
+  describe('decode', function() {
+    it('should log message if novatiqId has wrong format', function() {
+      const novatiqId = '81b001ec-8914-488c-a96e-8c220d4ee08895ef';
+      const response = novatiqIdSubmodule.decode(novatiqId);
+      expect(response.novatiq.snowflake).to.have.length(40);
+    });
+
+    it('should log message if novatiqId has wrong format', function() {
+      const novatiqId = '81b001ec-8914-488c-a96e-8c220d4ee08895ef';
+      const response = novatiqIdSubmodule.decode(novatiqId);
+      expect(response.novatiq.snowflake).should.be.not.empty;
+    });
+  });
+})
diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
new file mode 100644
index 00000000000..d08bf2c8430
--- /dev/null
+++ b/test/spec/modules/oguryBidAdapter_spec.js
@@ -0,0 +1,312 @@
+import { expect } from 'chai';
+import { spec } from 'modules/oguryBidAdapter';
+import { deepClone } from 'src/utils.js';
+
+const BID_HOST = 'https://webmobile.presage.io/api/header-bidding-request';
+
+describe('OguryBidAdapter', function () {
+  let bidRequests;
+  let bidderRequest;
+
+  bidRequests = [
+    {
+      adUnitCode: 'adUnitCode',
+      auctionId: 'auctionId',
+      bidId: 'bidId',
+      bidder: 'ogury',
+      params: {
+        assetKey: 'OGY-assetkey',
+        adUnitId: 'adunitId',
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      getFloor: ({ size, currency, mediaType }) => {
+        const floorResult = {
+          currency: 'USD',
+          floor: 0
+        };
+
+        if (mediaType === 'banner') {
+          floorResult.floor = 4;
+        } else {
+          floorResult.floor = 1000;
+        }
+
+        return floorResult;
+      },
+      transactionId: 'transactionId'
+    },
+    {
+      adUnitCode: 'adUnitCode2',
+      auctionId: 'auctionId',
+      bidId: 'bidId2',
+      bidder: 'ogury',
+      params: {
+        assetKey: 'OGY-assetkey',
+        adUnitId: 'adunitId2'
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [[600, 500]]
+        }
+      },
+      transactionId: 'transactionId2'
+    },
+  ];
+
+  bidderRequest = {
+    auctionId: bidRequests[0].auctionId,
+    gdprConsent: {consentString: 'myConsentString', vendorData: {}, gdprApplies: true},
+  };
+
+  describe('isBidRequestValid', function () {
+    it('should validate correct bid', () => {
+      let validBid = deepClone(bidRequests[0]);
+
+      let isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('should not validate incorrect bid', () => {
+      let invalidBid = deepClone(bidRequests[0]);
+      delete invalidBid.sizes;
+      delete invalidBid.mediaTypes;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should not validate bid if adunit is not present', () => {
+      let invalidBid = deepClone(bidRequests[0]);
+      delete invalidBid.params.adUnitId;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should not validate bid if assetKet is not present', () => {
+      let invalidBid = deepClone(bidRequests[0]);
+      delete invalidBid.params.assetKey;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('should validate bid if getFloor is not present', () => {
+      let invalidBid = deepClone(bidRequests[1]);
+      delete invalidBid.getFloor;
+
+      let isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(true);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const defaultTimeout = 1000;
+    const expectedRequestObject = {
+      id: bidRequests[0].auctionId,
+      at: 2,
+      tmax: defaultTimeout,
+      imp: [{
+        id: bidRequests[0].bidId,
+        tagid: bidRequests[0].params.adUnitId,
+        bidfloor: 4,
+        banner: {
+          format: [{
+            w: 300,
+            h: 250
+          }]
+        }
+      }, {
+        id: bidRequests[1].bidId,
+        tagid: bidRequests[1].params.adUnitId,
+        bidfloor: 0,
+        banner: {
+          format: [{
+            w: 600,
+            h: 500
+          }]
+        }
+      }],
+      regs: {
+        ext: {
+          gdpr: 1
+        },
+      },
+      site: {
+        id: bidRequests[0].params.assetKey,
+        domain: window.location.hostname,
+      },
+      user: {
+        ext: {
+          consent: bidderRequest.gdprConsent.consentString
+        },
+      }
+    };
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      const validBidRequests = deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.url).to.equal(BID_HOST);
+      expect(request.method).to.equal('POST');
+    });
+
+    it('bid request object should be conform', function () {
+      const validBidRequests = deepClone(bidRequests)
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestObject);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    it('should not add gdpr infos if not present', () => {
+      const bidderRequestWithoutGdpr = {
+        ...bidderRequest,
+        gdprConsent: {},
+      }
+      const expectedRequestObjectWithoutGdpr = {
+        ...expectedRequestObject,
+        regs: {
+          ext: {
+            gdpr: 1
+          },
+        },
+        user: {
+          ext: {
+            consent: ''
+          },
+        }
+      };
+
+      const validBidRequests = bidRequests
+
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithoutGdpr);
+      expect(request.data).to.deep.equal(expectedRequestObjectWithoutGdpr);
+      expect(request.data.regs.ext.gdpr).to.be.a('number');
+    });
+
+    it('should handle bidFloor undefined', () => {
+      const expectedRequestWithUndefinedFloor = {
+        ...expectedRequestObject
+      };
+
+      const validBidRequests = deepClone(bidRequests);
+      validBidRequests[1] = {
+        ...validBidRequests[1],
+        getFloor: undefined
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUndefinedFloor);
+    });
+
+    it('should handle bidFloor when is not function', () => {
+      const expectedRequestWithNotAFunctionFloor = {
+        ...expectedRequestObject
+      };
+
+      let validBidRequests = deepClone(bidRequests);
+      validBidRequests[1] = {
+        ...validBidRequests[1],
+        getFloor: 'getFloor'
+      };
+
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithNotAFunctionFloor);
+    });
+
+    it('should handle bidFloor when currency is not USD', () => {
+      const expectedRequestWithUnsupportedFloorCurrency = deepClone(expectedRequestObject)
+      expectedRequestWithUnsupportedFloorCurrency.imp[0].bidfloor = 0;
+      let validBidRequests = deepClone(bidRequests);
+      validBidRequests[0] = {
+        ...validBidRequests[0],
+        getFloor: ({ size, currency, mediaType }) => {
+          return {
+            currency: 'EUR',
+            floor: 4
+          }
+        }
+      };
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request.data).to.deep.equal(expectedRequestWithUnsupportedFloorCurrency);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let openRtbBidResponse = {
+      body: {
+        id: 'id_of_bid_response',
+        seatbid: [{
+          bid: [{
+            id: 'advertId',
+            impid: 'bidId',
+            price: 100,
+            nurl: 'url',
+            adm: `test creative
cookies
`,
+            adomain: ['renault.fr'],
+            w: 300,
+            h: 250
+          }, {
+            id: 'advertId2',
+            impid: 'bidId2',
+            price: 150,
+            nurl: 'url2',
+            adm: `test creative
cookies
`,
+            adomain: ['peugeot.fr'],
+            w: 600,
+            h: 500
+          }],
+        }]
+      }
+    };
+
+    it('should correctly interpret bidResponse', () => {
+      let expectedInterpretedBidResponse = [{
+        requestId: openRtbBidResponse.body.seatbid[0].bid[0].impid,
+        cpm: openRtbBidResponse.body.seatbid[0].bid[0].price,
+        currency: 'USD',
+        width: openRtbBidResponse.body.seatbid[0].bid[0].w,
+        height: openRtbBidResponse.body.seatbid[0].bid[0].h,
+        ad: openRtbBidResponse.body.seatbid[0].bid[0].adm,
+        ttl: 60,
+        creativeId: openRtbBidResponse.body.seatbid[0].bid[0].id,
+        netRevenue: true,
+        meta: {
+          advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[0].adomain
+        }
+      }, {
+        requestId: openRtbBidResponse.body.seatbid[0].bid[1].impid,
+        cpm: openRtbBidResponse.body.seatbid[0].bid[1].price,
+        currency: 'USD',
+        width: openRtbBidResponse.body.seatbid[0].bid[1].w,
+        height: openRtbBidResponse.body.seatbid[0].bid[1].h,
+        ad: openRtbBidResponse.body.seatbid[0].bid[1].adm,
+        ttl: 60,
+        creativeId: openRtbBidResponse.body.seatbid[0].bid[1].id,
+        netRevenue: true,
+        meta: {
+          advertiserDomains: openRtbBidResponse.body.seatbid[0].bid[1].adomain
+        }
+      }]
+
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      let result = spec.interpretResponse(openRtbBidResponse, request);
+
+      expect(result).to.deep.equal(expectedInterpretedBidResponse)
+    });
+
+    it('should return empty array if error during parsing', () => {
+      const wrongOpenRtbBidReponse = 'wrong data'
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      let result = spec.interpretResponse(wrongOpenRtbBidReponse, request);
+
+      expect(result).to.be.instanceof(Array);
+      expect(result.length).to.equal(0)
+    })
+  });
+});
diff --git a/test/spec/modules/oneVideoBidAdapter_spec.js b/test/spec/modules/oneVideoBidAdapter_spec.js
index 26412634200..5289203fd5b 100644
--- a/test/spec/modules/oneVideoBidAdapter_spec.js
+++ b/test/spec/modules/oneVideoBidAdapter_spec.js
@@ -1,7 +1,5 @@
 import { expect } from 'chai';
 import { spec } from 'modules/oneVideoBidAdapter.js';
-import * as utils from 'src/utils.js';
-import {config} from 'src/config.js';
 
 describe('OneVideoBidAdapter', function () {
   let bidRequest;
@@ -61,11 +59,77 @@ describe('OneVideoBidAdapter', function () {
   });
 
   describe('spec.isBidRequestValid', function () {
-    it('should return true when the required params are passed', function () {
+    it('should return false when mediaTypes video OR banner not declared', function () {
+      bidRequest.mediaTypes = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return true (skip validations) when e2etest = true', function () {
+      bidRequest.params.video = {
+        e2etest: true
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when mediaTypes.video has all mandatory params', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream',
+        playerSize: [640, 480],
+        mimes: ['video/mp4', 'application/javascript'],
+      }
+      bidRequest.params.video = {};
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when params.video has all override params instead of mediaTypes.video', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream'
+      };
+      bidRequest.params.video = {
+        playerWidth: 640,
+        playerHeight: 480,
+        mimes: ['video/mp4', 'application/javascript']
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when playerWidth & playerHeight are passed in params.video', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream',
+        mimes: ['video/mp4', 'application/javascript']
+      };
+      bidRequest.params.video = {
+        playerWidth: 640,
+        playerHeight: 480,
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when mimes is passed in params.video', function () {
+      bidRequest.mediaTypes.video = {
+        context: 'instream',
+        playerSizes: [640, 480]
+      };
+      bidRequest.video = {
+        mimes: ['video/mp4', 'application/javascript']
+      };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
     });
 
-    it('should return false when the "video" param is missing', function () {
+    it('should return false when both mediaTypes.video and params.video Objects are missing', function () {
+      bidRequest.mediaTypes = {};
+      bidRequest.params = {
+        pubId: 'brxd'
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when both mediaTypes.video and params.video are missing mimes and player size', function () {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'instream'
+        }
+      };
       bidRequest.params = {
         pubId: 'brxd'
       };
@@ -78,34 +142,16 @@ describe('OneVideoBidAdapter', function () {
           playerWidth: 480,
           playerHeight: 640,
           mimes: ['video/mp4', 'application/javascript'],
-          protocols: [2, 5],
-          api: [2],
-          position: 1,
-          delivery: [2],
-          playbackmethod: [1, 5],
-          sid: 134,
-          rewarded: 1,
-          placement: 1,
-          inventoryid: 123
         }
       };
       expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
     });
+
     it('should return true when the "pubId" param exists', function () {
-      bidRequest.params = {
+      bidRequest.mediaTypes = {
         video: {
-          playerWidth: 480,
-          playerHeight: 640,
-          mimes: ['video/mp4', 'application/javascript'],
-          protocols: [2, 5],
-          api: [2],
-          position: 1,
-          delivery: [2],
-          playbackmethod: [1, 5],
-          sid: 134,
-          rewarded: 1,
-          placement: 1,
-          inventoryid: 123
+          playerSizes: [640, 480],
+          mimes: ['video/mp4', 'application/javascript']
         },
         pubId: 'brxd'
       };
@@ -201,24 +247,24 @@ describe('OneVideoBidAdapter', function () {
 
   describe('spec.buildRequests', function () {
     it('should create a POST request for every bid', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       expect(requests[0].method).to.equal('POST');
       expect(requests[0].url).to.equal(spec.ENDPOINT + bidRequest.params.pubId);
     });
 
     it('should attach the bid request object', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       expect(requests[0].bidRequest).to.equal(bidRequest);
     });
 
     it('should attach request data', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
-      const [ width, height ] = bidRequest.sizes;
+      const [width, height] = bidRequest.sizes;
       const placement = bidRequest.params.video.placement;
       const rewarded = bidRequest.params.video.rewarded;
       const inventoryid = bidRequest.params.video.inventoryid;
-      const VERSION = '3.0.3';
+      const VERSION = '3.1.1';
       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(bidRequest.params.bidfloor);
@@ -232,50 +278,446 @@ describe('OneVideoBidAdapter', function () {
     it('must parse bid size from a nested array', function () {
       const width = 640;
       const height = 480;
-      bidRequest.sizes = [[ width, height ]];
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      bidRequest.sizes = [
+        [width, height]
+      ];
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       expect(data.imp[0].video.w).to.equal(width);
       expect(data.imp[0].video.h).to.equal(height);
     });
+
+    it('should set pubId to HBExchange when bid.params.video.e2etest = true', function () {
+      bidRequest.params.video.e2etest = true;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      expect(requests[0].method).to.equal('POST');
+      expect(requests[0].url).to.equal(spec.E2ETESTENDPOINT + 'HBExchange');
+    });
+
+    it('should attach End 2 End test data', function () {
+      bidRequest.params.video.e2etest = true;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].bidfloor).to.not.exist;
+      expect(data.imp[0].video.w).to.equal(300);
+      expect(data.imp[0].video.h).to.equal(250);
+      expect(data.imp[0].video.mimes).to.eql(['video/mp4', 'application/javascript']);
+      expect(data.imp[0].video.api).to.eql([2]);
+      expect(data.site.page).to.equal('https://verizonmedia.com');
+      expect(data.site.ref).to.equal('https://verizonmedia.com');
+      expect(data.tmax).to.equal(1000);
+    });
+
+    it('it should create new schain and send it if video.params.sid exists', function () {
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
+      expect(schain.nodes[0].rid).to.equal(data.id);
+    })
+
+    it('should send Global or Bidder specific schain if sid is not passed in video.params.sid', function () {
+      bidRequest.params.video.sid = null;
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.id,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain).to.equal(globalSchain);
+    });
+
+    it('should ignore Global or Bidder specific schain if video.params.sid exists and send new schain', function () {
+      const globalSchain = {
+        ver: '1.0',
+        complete: 1,
+        nodes: [{
+          asi: 'some-platform.com',
+          sid: '111111',
+          rid: bidRequest.id,
+          hp: 1
+        }]
+      };
+      bidRequest.schain = globalSchain;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes.length).to.equal(1);
+      expect(schain.complete).to.equal(1);
+      expect(schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
+      expect(schain.nodes[0].rid).to.equal(data.id);
+    })
+
+    it('should append hp to new schain created by sid if video.params.hp is passed', function () {
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      const schain = data.source.ext.schain;
+      expect(schain.nodes[0].hp).to.equal(bidRequest.params.video.hp);
+    })
+    it('should not accept key values pairs if custom is Undefined ', function () {
+      bidRequest.params.video.custom = null;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Array ', function () {
+      bidRequest.params.video.custom = [];
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Number ', function () {
+      bidRequest.params.video.custom = 123456;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is String ', function () {
+      bidRequest.params.video.custom = 'keyValuePairs';
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should not accept key values pairs if custom is Boolean ', function () {
+      bidRequest.params.video.custom = true;
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.undefined;
+    });
+    it('should accept key values pairs if custom is Object ', function () {
+      bidRequest.params.video.custom = {};
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.imp[0].ext.custom).to.be.a('object');
+    });
+    it('should accept key values pairs if custom is Object ', function () {
+      bidRequest.params.video.custom = {
+        key1: 'value1',
+        key2: 'value2',
+        key3: 4444444,
+        key4: false,
+        key5: {
+          nested: 'object'
+        },
+        key6: ['string', 2, true, null],
+        key7: null,
+        key8: undefined
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const custom = requests[0].data.imp[0].ext.custom;
+      expect(custom['key1']).to.be.a('string');
+      expect(custom['key2']).to.be.a('string');
+      expect(custom['key3']).to.be.a('number');
+      expect(custom['key4']).to.not.exist;
+      expect(custom['key5']).to.not.exist;
+      expect(custom['key6']).to.not.exist;
+      expect(custom['key7']).to.not.exist;
+      expect(custom['key8']).to.not.exist;
+    });
+
+    describe('content object validations', function () {
+      it('should not accept content object if value is Undefined ', function () {
+        bidRequest.params.video.content = null;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is is Array ', function () {
+        bidRequest.params.video.content = [];
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is Number ', function () {
+        bidRequest.params.video.content = 123456;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is String ', function () {
+        bidRequest.params.video.content = 'keyValuePairs';
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should not accept content object if value is Boolean ', function () {
+        bidRequest.params.video.content = true;
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.undefined;
+      });
+      it('should accept content object if value is Object ', function () {
+        bidRequest.params.video.content = {};
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.a('object');
+      });
+
+      it('should not append unsupported content object keys', function () {
+        bidRequest.params.video.content = {
+          fake: 'news',
+          unreal: 'param',
+          counterfit: 'data'
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.empty;
+      });
+
+      it('should not append content string parameters if value is not string ', function () {
+        bidRequest.params.video.content = {
+          id: 1234,
+          title: ['Title'],
+          series: ['Series'],
+          season: ['Season'],
+          genre: ['Genre'],
+          contentrating: {1: 'C-Rating'},
+          language: {1: 'EN'}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content Number parameters if value is not Number ', function () {
+        bidRequest.params.video.content = {
+          episode: '1',
+          context: 'context',
+          livestream: {0: 'stream'},
+          len: [360],
+          prodq: [1],
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content Array parameters if value is not Array ', function () {
+        bidRequest.params.video.content = {
+          cat: 'categories',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should not append content ext if value is not Object ', function () {
+        bidRequest.params.video.content = {
+          ext: 'content.ext',
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.be.a('object');
+        expect(data.site.content).to.be.empty
+      });
+      it('should append supported parameters if value match validations ', function () {
+        bidRequest.params.video.content = {
+          id: '1234',
+          title: 'Title',
+          series: 'Series',
+          season: 'Season',
+          cat: [
+            'IAB1'
+          ],
+          genre: 'Genre',
+          contentrating: 'C-Rating',
+          language: 'EN',
+          episode: 1,
+          prodq: 1,
+          context: 1,
+          livestream: 0,
+          len: 360,
+          ext: {}
+        };
+        const requests = spec.buildRequests([bidRequest], bidderRequest);
+        const data = requests[0].data;
+        expect(data.site.content).to.deep.equal(bidRequest.params.video.content);
+      });
+    });
   });
 
+  describe('price floor module validations', function () {
+    beforeEach(function () {
+      bidRequest.getFloor = (floorObj) => {
+        return {
+          floor: bidRequest.floors.values[floorObj.mediaType + '|640x480'],
+          currency: floorObj.currency,
+          mediaType: floorObj.mediaType
+        }
+      }
+    });
+
+    it('should get bidfloor from getFloor method', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'video|640x480': 5.55
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.cur).is.a('string');
+      expect(data.cur).to.equal('EUR');
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+
+    it('should use adUnit/module currency & floor instead of bid.params.bidfloor', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.params.bidfloor = 3.33;
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'video|640x480': 5.55
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.cur).is.a('string');
+      expect(data.cur).to.equal('EUR');
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(5.55);
+    });
+
+    it('should load banner instead of video floor when DAP is active bid.params.video.display = 1', function () {
+      bidRequest.params.video.display = 1;
+      bidRequest.params.cur = 'EUR';
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [640, 480]
+          ]
+        }
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|640x480': 2.22,
+          'video|640x480': 9.99
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.cur).is.a('string');
+      expect(data.cur).to.equal('EUR');
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(2.22);
+    })
+
+    it('should load video floor when multi-format adUnit is present', function () {
+      bidRequest.params.cur = 'EUR';
+      bidRequest.mediaTypes.banner = {
+        sizes: [
+          [640, 480]
+        ]
+      };
+      bidRequest.floors = {
+        currency: 'EUR',
+        values: {
+          'banner|640x480': 2.22,
+          'video|640x480': 9.99
+        }
+      };
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
+      const data = requests[0].data;
+      expect(data.cur).is.a('string');
+      expect(data.cur).to.equal('EUR');
+      expect(data.imp[0].bidfloor).is.a('number');
+      expect(data.imp[0].bidfloor).to.equal(9.99);
+    })
+  })
+
   describe('spec.interpretResponse', function () {
     it('should return no bids if the response is not valid', function () {
-      const bidResponse = spec.interpretResponse({ body: null }, { bidRequest });
+      const bidResponse = spec.interpretResponse({
+        body: null
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return no bids if the response "nurl" and "adm" are missing', function () {
-      const serverResponse = {seatbid: [{bid: [{price: 6.01}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            price: 6.01
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return no bids if the response "price" is missing', function () {
-      const serverResponse = {seatbid: [{bid: [{adm: ''}]}]};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            adm: ''
+          }]
+        }]
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.length).to.equal(0);
     });
 
     it('should return a valid video bid response with just "adm"', function () {
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: ''}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            id: 1,
+            adid: 123,
+            crid: 2,
+            price: 6.01,
+            adm: '',
+            adomain: [
+              'verizonmedia.com'
+            ],
+          }]
+        }],
+        cur: 'USD'
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       let o = {
         requestId: bidRequest.bidId,
         bidderCode: spec.code,
         cpm: serverResponse.seatbid[0].bid[0].price,
-        adId: serverResponse.seatbid[0].bid[0].adid,
         creativeId: serverResponse.seatbid[0].bid[0].crid,
         vastXml: serverResponse.seatbid[0].bid[0].adm,
         width: 640,
         height: 480,
         mediaType: 'video',
         currency: 'USD',
-        ttl: 100,
+        ttl: 300,
         netRevenue: true,
         adUnitCode: bidRequest.adUnitCode,
         renderer: (bidRequest.mediaTypes.video.context === 'outstream') ? newRenderer(bidRequest, bidResponse) : undefined,
+        meta: {
+          advertiserDomains: ['verizonmedia.com']
+        }
       };
       expect(bidResponse).to.deep.equal(o);
     });
@@ -293,12 +735,51 @@ describe('OneVideoBidAdapter', function () {
           }
         }
       }
-      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: '
DAP UNIT HERE
'}]}], cur: 'USD'};
-      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      const serverResponse = {
+        seatbid: [{
+          bid: [{
+            id: 1,
+            adid: 123,
+            crid: 2,
+            price: 6.01,
+            adm: '
DAP UNIT HERE
'
+          }]
+        }],
+        cur: 'USD'
+      };
+      const bidResponse = spec.interpretResponse({
+        body: serverResponse
+      }, {
+        bidRequest
+      });
       expect(bidResponse.ad).to.equal('
DAP UNIT HERE
');
       expect(bidResponse.mediaType).to.equal('banner');
       expect(bidResponse.renderer).to.be.undefined;
     });
+
+    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 }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should not allow ttl above 3601, default to 300', function () {
+      bidRequest.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 }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should not allow ttl below 1, default to 300', function () {
+      bidRequest.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 }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(300);
+    });
+    it('should use custom ttl if under 3600', function () {
+      bidRequest.params.video.ttl = 1000;
+      const serverResponse = {seatbid: [{bid: [{id: 1, adid: 123, crid: 2, price: 6.01, adm: ''}]}], cur: 'USD'};
+      const bidResponse = spec.interpretResponse({ body: serverResponse }, { bidRequest });
+      expect(bidResponse.ttl).to.equal(1000);
+    });
   });
 
   describe('when GDPR and uspConsent applies', function () {
@@ -341,34 +822,27 @@ describe('OneVideoBidAdapter', function () {
     });
 
     it('should send a signal to specify that GDPR applies to this request', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.gdpr).to.equal(1);
     });
 
     it('should send the consent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.user.ext.consent).to.equal(bidderRequest.gdprConsent.consentString);
     });
 
     it('should send the uspConsent string', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
     });
 
     it('should send the uspConsent and GDPR ', function () {
-      const request = spec.buildRequests([ bidRequest ], bidderRequest);
+      const request = spec.buildRequests([bidRequest], bidderRequest);
       expect(request[0].data.regs.ext.gdpr).to.equal(1);
       expect(request[0].data.regs.ext.us_privacy).to.equal(bidderRequest.uspConsent);
     });
-
-    it('should send schain object', function () {
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
-      const data = requests[0].data;
-      expect(data.source.ext.schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
-      expect(data.source.ext.schain.nodes[0].rid).to.equal(data.id);
-      expect(data.source.ext.schain.nodes[0].hp).to.equal(bidRequest.params.video.hp);
-    });
   });
+
   describe('should send banner object', function () {
     it('should send banner object when display is 1 and context="instream" (DAP O&O)', function () {
       bidRequest = {
@@ -407,7 +881,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -457,7 +931,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -503,7 +977,7 @@ describe('OneVideoBidAdapter', function () {
           pubId: 'OneMDisplay'
         }
       };
-      const requests = spec.buildRequests([ bidRequest ], bidderRequest);
+      const requests = spec.buildRequests([bidRequest], bidderRequest);
       const data = requests[0].data;
       const width = bidRequest.params.video.playerWidth;
       const height = bidRequest.params.video.playerHeight;
@@ -522,15 +996,35 @@ describe('OneVideoBidAdapter', function () {
       const GDPR_CONSENT_STRING = 'GDPR_CONSENT_STRING';
 
       it('should get correct user sync when iframeEnabled', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, {gdprApplies: true, consentString: GDPR_CONSENT_STRING})
-        expect(pixel[2].type).to.equal('image');
-        expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=1&gdpr_consent=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=1&gdpr_consent=' + encodeURI(GDPR_CONSENT_STRING));
+        let pixel = spec.getUserSyncs({
+          pixelEnabled: true
+        }, {}, {
+          gdprApplies: true,
+          consentString: GDPR_CONSENT_STRING
+        })
+        expect(pixel[1].type).to.equal('image');
+        expect(pixel[1].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=1&gdpr_consent=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=1&gdpr_consent=' + encodeURI(GDPR_CONSENT_STRING));
       });
 
       it('should default to gdprApplies=0 when consentData is undefined', function () {
-        let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, undefined);
-        expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=0&gdpr_consent=&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=0&gdpr_consent=');
+        let pixel = spec.getUserSyncs({
+          pixelEnabled: true
+        }, {}, undefined);
+        expect(pixel[1].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=0&gdpr_consent=&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=0&gdpr_consent=');
       });
     });
+
+    describe('verify sync pixels', function () {
+      let pixel = spec.getUserSyncs({
+        pixelEnabled: true
+      }, {}, undefined);
+      it('should be UPS sync pixel for DBM', function () {
+        expect(pixel[0].url).to.equal('https://pixel.advertising.com/ups/57304/sync?gdpr=&gdpr_consent=&_origin=0&redir=true')
+      });
+
+      it('should be TTD sync pixel', function () {
+        expect(pixel[2].url).to.equal('https://match.adsrvr.org/track/cmf/generic?ttd_pid=adaptv&ttd_tpi=1')
+      });
+    })
   });
 });
diff --git a/test/spec/modules/onetagBidAdapter_spec.js b/test/spec/modules/onetagBidAdapter_spec.js
index a951c74b20b..f51e95039ea 100644
--- a/test/spec/modules/onetagBidAdapter_spec.js
+++ b/test/spec/modules/onetagBidAdapter_spec.js
@@ -132,29 +132,57 @@ describe('onetag', function () {
       const data = JSON.parse(d);
       it('Should contain all keys', function () {
         expect(data).to.be.an('object');
-        expect(data).to.include.all.keys('location', 'referrer', 'masked', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'onetagSid');
+        expect(data).to.include.all.keys('location', 'referrer', 'masked', 'sHeight', 'sWidth', 'docHeight', 'wHeight', 'wWidth', 'oHeight', 'oWidth', 'aWidth', 'aHeight', 'sLeft', 'sTop', 'hLength', 'bids', 'docHidden', 'xOffset', 'yOffset', 'timing', 'version');
         expect(data.location).to.be.a('string');
-        expect(data.masked).to.be.a('number');
-        expect(data.referrer).to.be.a('string');
+        expect(data.masked).to.be.oneOf([0, 1, 2]);
+        expect(data.referrer).to.satisfy(referrer => referrer === null || typeof referrer === 'string');
         expect(data.sHeight).to.be.a('number');
         expect(data.sWidth).to.be.a('number');
         expect(data.wWidth).to.be.a('number');
         expect(data.wHeight).to.be.a('number');
         expect(data.oHeight).to.be.a('number');
         expect(data.oWidth).to.be.a('number');
+        expect(data.ancestorOrigin).to.satisfy(function (value) {
+          return value === null || typeof value === 'string';
+        });
         expect(data.aWidth).to.be.a('number');
         expect(data.aHeight).to.be.a('number');
         expect(data.sLeft).to.be.a('number');
         expect(data.sTop).to.be.a('number');
         expect(data.hLength).to.be.a('number');
         expect(data.bids).to.be.an('array');
+        expect(data.version).to.have.all.keys('prebid', 'adapter');
         const bids = data['bids'];
         for (let i = 0; i < bids.length; i++) {
           const bid = bids[i];
           if (hasTypeVideo(bid)) {
-            expect(bid).to.have.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'pubId', 'transactionId', 'context', 'mimes', 'playerSize', 'protocols', 'maxDuration', 'api', 'type');
+            expect(bid).to.have.all.keys(
+              'adUnitCode',
+              'auctionId',
+              'bidId',
+              'bidderRequestId',
+              'pubId',
+              'transactionId',
+              'context',
+              'mimes',
+              'playerSize',
+              'protocols',
+              'maxDuration',
+              'api',
+              'playbackmethod',
+              'type'
+            );
           } else if (isValid(BANNER, bid)) {
-            expect(bid).to.have.all.keys('adUnitCode', 'auctionId', 'bidId', 'bidderRequestId', 'pubId', 'transactionId', 'sizes', 'type');
+            expect(bid).to.have.all.keys(
+              'adUnitCode',
+              'auctionId',
+              'bidId',
+              'bidderRequestId',
+              'pubId',
+              'transactionId',
+              'sizes',
+              'type'
+            );
           }
           expect(bid.bidId).to.be.a('string');
           expect(bid.pubId).to.be.a('string');
@@ -239,6 +267,7 @@ describe('onetag', function () {
         expect(dataItem.creativeId).to.be.a('string');
         expect(dataItem.netRevenue).to.be.a('boolean');
         expect(dataItem.currency).to.be.a('string');
+        expect(dataItem.meta.advertiserDomains).to.be.an('array');
       }
     });
     it('Returns an empty array if response is not valid', function () {
@@ -322,6 +351,7 @@ function getBannerVideoResponse() {
           currency: 'USD',
           requestId: 'banner',
           mediaType: BANNER,
+          adomain: []
         },
         {
           cpm: 13,
@@ -333,7 +363,8 @@ function getBannerVideoResponse() {
           requestId: 'videoInstream',
           vastUrl: 'https://videoinstream.org',
           videoCacheKey: 'key',
-          mediaType: VIDEO
+          mediaType: VIDEO,
+          adomain: ['test_domain']
         },
         {
           cpm: 13,
@@ -346,7 +377,8 @@ function getBannerVideoResponse() {
           requestId: 'videoOutstream',
           ad: '',
           rendererUrl: 'https://testRenderer',
-          mediaType: VIDEO
+          mediaType: VIDEO,
+          adomain: []
         }
       ]
     }
diff --git a/test/spec/modules/onomagicBidAdapter_spec.js b/test/spec/modules/onomagicBidAdapter_spec.js
index 7c71c3e5764..6ddc0edd477 100644
--- a/test/spec/modules/onomagicBidAdapter_spec.js
+++ b/test/spec/modules/onomagicBidAdapter_spec.js
@@ -222,7 +222,8 @@ describe('onomagicBidAdapter', function() {
               'nurl': '',
               'adm': '',
               'w': 300,
-              'h': 250
+              'h': 250,
+              'adomain': ['example.com']
             }]
           }]
         }
@@ -240,7 +241,10 @@ describe('onomagicBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
@@ -258,7 +262,10 @@ describe('onomagicBidAdapter', function() {
         'netRevenue': true,
         'mediaType': 'banner',
         'ad': `
`,
-        'ttl': 60
+        'ttl': 60,
+        'meta': {
+          'advertiserDomains': ['example.com']
+        }
       }];
 
       let result = spec.interpretResponse(response);
diff --git a/test/spec/modules/ooloAnalyticsAdapter_spec.js b/test/spec/modules/ooloAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..f82f7856fb2
--- /dev/null
+++ b/test/spec/modules/ooloAnalyticsAdapter_spec.js
@@ -0,0 +1,793 @@
+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/events'
+import { config } from 'src/config';
+import { buildAuctionData, generatePageViewId } from 'modules/ooloAnalyticsAdapter';
+
+const auctionId = '0ea14159-2058-4b87-a966-9d7652176a56';
+const auctionStart = 1598513385415
+const timeout = 3000
+const adUnit1 = 'top_1';
+const adUnit2 = 'top_2';
+const bidId1 = '392b5a6b05d648'
+const bidId2 = '392b5a6b05d649'
+const bidId3 = '392b5a6b05d650'
+
+const auctionInit = {
+  timestamp: auctionStart,
+  auctionId: auctionId,
+  timeout: timeout,
+  auctionStart,
+  adUnits: [{
+    code: adUnit1,
+    transactionId: 'abalksdkjfh-12sade'
+  }, {
+    code: adUnit2,
+    transactionId: 'abalksdkjfh-12sadf'
+  }]
+};
+
+const bidRequested = {
+  auctionId,
+  bidderCode: 'appnexus',
+  bidderRequestId: '2946b569352ef2',
+  start: 1598513405254,
+  bids: [
+    {
+      auctionId,
+      bidId: bidId1,
+      bidderRequestId: '2946b569352ef2',
+      bidder: 'appnexus',
+      adUnitCode: adUnit1,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+    {
+      auctionId,
+      bidId: bidId2,
+      bidderRequestId: '2946b569352ef3',
+      bidder: 'rubicon',
+      adUnitCode: adUnit2,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+    {
+      auctionId,
+      bidId: bidId3,
+      bidderRequestId: '2946b569352ef4',
+      bidder: 'ix',
+      adUnitCode: adUnit2,
+      sizes: [[728, 90], [970, 90]],
+      mediaTypes: {
+        banner: {
+          sizes: [[728, 90], [970, 90]],
+        },
+      },
+      params: {
+        placementId: '4799418',
+      },
+      schain: {}
+    },
+  ],
+}
+
+const noBid = {
+  auctionId,
+  adUnitCode: adUnit2,
+  bidId: bidId2,
+  requestId: bidId2
+}
+
+const bidResponse = {
+  auctionId,
+  bidderCode: 'appnexus',
+  mediaType: 'banner',
+  width: 0,
+  height: 0,
+  statusMessage: 'Bid available',
+  adId: '222bb26f9e8bd',
+  cpm: 0.112256,
+  responseTimestamp: 1598513485254,
+  requestTimestamp: 1462919238936,
+  bidder: 'appnexus',
+  adUnitCode: adUnit1,
+  timeToRespond: 401,
+  pbLg: '0.00',
+  pbMg: '0.10',
+  pbHg: '0.11',
+  pbAg: '0.10',
+  size: '0x0',
+  requestId: bidId1,
+  creativeId: '123456',
+  adserverTargeting: {
+    hb_bidder: 'appnexus',
+    hb_adid: '222bb26f9e8bd',
+    hb_pb: '10.00',
+    hb_size: '0x0',
+    foobar: '0x0',
+  },
+  netRevenue: true,
+  currency: 'USD',
+  ttl: 300,
+}
+
+const auctionEnd = {
+  auctionId: auctionId
+};
+
+const bidTimeout = [
+  {
+    adUnitCode: adUnit2,
+    auctionId: auctionId,
+    bidId: bidId3,
+    bidder: 'ix',
+    timeout: timeout
+  }
+];
+
+const bidWon = {
+  auctionId,
+  adUnitCode: adUnit1,
+  bidId: bidId1,
+  cpm: 0.5
+}
+
+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);
+}
+
+describe('oolo Prebid Analytic', () => {
+  let clock
+
+  beforeEach(() => {
+    sinon.stub(events, 'getEvents').returns([]);
+    clock = sinon.useFakeTimers()
+  });
+
+  afterEach(() => {
+    ooloAnalytics.disableAnalytics();
+    events.getEvents.restore()
+    clock.restore();
+  })
+
+  describe('enableAnalytics init options', () => {
+    it('should not enable analytics if invalid config', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: undefined
+        }
+      })
+
+      expect(server.requests).to.have.length(0)
+    })
+
+    it('should send prebid config to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      const conf = {}
+      const pbjsConfig = config.getConfig()
+
+      Object.keys(pbjsConfig).forEach(key => {
+        if (key[0] !== '_') {
+          conf[key] = pbjsConfig[key]
+        }
+      })
+
+      expect(server.requests[1].url).to.contain('/hbconf')
+      expect(JSON.parse(server.requests[1].requestBody)).to.deep.equal(conf)
+    })
+
+    it('should request server config and send page data', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      expect(server.requests[0].url).to.contain('?pid=123')
+
+      const pageData = JSON.parse(server.requests[2].requestBody)
+
+      expect(pageData).to.have.property('timestamp')
+      expect(pageData).to.have.property('screenWidth')
+      expect(pageData).to.have.property('screenHeight')
+      expect(pageData).to.have.property('url')
+      expect(pageData).to.have.property('protocol')
+      expect(pageData).to.have.property('origin')
+      expect(pageData).to.have.property('referrer')
+      expect(pageData).to.have.property('pbVersion')
+      expect(pageData).to.have.property('pvid')
+      expect(pageData).to.have.property('pid')
+      expect(pageData).to.have.property('pbModuleVersion')
+      expect(pageData).to.have.property('domContentLoadTime')
+      expect(pageData).to.have.property('pageLoadTime')
+    })
+  })
+
+  describe('data handling and sending events', () => {
+    it('should send an "auction" event to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(500)
+
+      simulateAuction()
+
+      expect(server.requests.length).to.equal(3)
+      clock.tick(2000)
+      expect(server.requests.length).to.equal(4)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      expect(request).to.include({
+        eventType: 'auction',
+        pid: 123,
+        auctionId,
+        auctionStart,
+        auctionEnd: 0,
+        timeout,
+      })
+      expect(request.pvid).to.be.a('number')
+      expect(request.adUnits).to.have.length(2)
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit1.bids).to.be.an('array')
+      expect(auctionAdUnit1.bids).to.have.length(1)
+
+      // bid response
+      expect(auctionAdUnit1.bids[0].bidId).to.equal(bidId1)
+      expect(auctionAdUnit1.bids[0].bst).to.equal('bidReceived')
+      expect(auctionAdUnit1.bids[0].bidder).to.equal('appnexus')
+      expect(auctionAdUnit1.bids[0].cpm).to.equal(0.112256)
+      expect(auctionAdUnit1.bids[0].cur).to.equal('USD')
+      expect(auctionAdUnit1.bids[0].s).to.equal(bidRequested.start)
+      expect(auctionAdUnit1.bids[0].e).to.equal(bidResponse.responseTimestamp)
+      expect(auctionAdUnit1.bids[0].rs).to.equal(bidRequested.start - auctionStart)
+      expect(auctionAdUnit1.bids[0].re).to.equal(bidResponse.responseTimestamp - auctionStart)
+      expect(auctionAdUnit1.bids[0].h).to.equal(0)
+      expect(auctionAdUnit1.bids[0].w).to.equal(0)
+      expect(auctionAdUnit1.bids[0].mt).to.equal('banner')
+      expect(auctionAdUnit1.bids[0].nrv).to.equal(true)
+      expect(auctionAdUnit1.bids[0].params).to.have.keys('placementId')
+      expect(auctionAdUnit1.bids[0].size).to.equal('0x0')
+      expect(auctionAdUnit1.bids[0].crId).to.equal('123456')
+      expect(auctionAdUnit1.bids[0].ttl).to.equal(bidResponse.ttl)
+      expect(auctionAdUnit1.bids[0].ttr).to.equal(bidResponse.timeToRespond)
+
+      expect(auctionAdUnit2.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit2.bids).to.be.an('array')
+      expect(auctionAdUnit2.bids).to.have.length(2)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].bidId).to.equal(bidId2)
+      expect(auctionAdUnit2.bids[0].bst).to.equal('noBid')
+      expect(auctionAdUnit2.bids[0].bidder).to.equal('rubicon')
+      expect(auctionAdUnit2.bids[0].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].e).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].params).to.have.keys('placementId')
+
+      // timeout
+      expect(auctionAdUnit2.bids[1].bidId).to.equal(bidId3)
+      expect(auctionAdUnit2.bids[1].bst).to.equal('bidTimedOut')
+      expect(auctionAdUnit2.bids[1].bidder).to.equal('ix')
+      expect(auctionAdUnit2.bids[1].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[1].e).to.be.a('undefined')
+    })
+
+    it('should push events to a queue and process them once server configuration returns', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit);
+      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+      events.emit(constants.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);
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      expect(request).to.include({
+        eventType: 'auction',
+        pid: 123,
+        auctionId,
+        auctionStart,
+        auctionEnd: 0,
+        timeout,
+      })
+      expect(request.pvid).to.be.a('number')
+      expect(request.adUnits).to.have.length(2)
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit1.bids).to.be.an('array')
+      expect(auctionAdUnit1.bids).to.have.length(1)
+
+      // bid response
+      expect(auctionAdUnit1.bids[0].bidId).to.equal(bidId1)
+      expect(auctionAdUnit1.bids[0].bst).to.equal('bidReceived')
+      expect(auctionAdUnit1.bids[0].bidder).to.equal('appnexus')
+      expect(auctionAdUnit1.bids[0].cpm).to.equal(0.112256)
+      expect(auctionAdUnit1.bids[0].cur).to.equal('USD')
+      expect(auctionAdUnit1.bids[0].s).to.equal(bidRequested.start)
+      expect(auctionAdUnit1.bids[0].e).to.equal(bidResponse.responseTimestamp)
+      expect(auctionAdUnit1.bids[0].rs).to.equal(bidRequested.start - auctionStart)
+      expect(auctionAdUnit1.bids[0].re).to.equal(bidResponse.responseTimestamp - auctionStart)
+      expect(auctionAdUnit1.bids[0].h).to.equal(0)
+      expect(auctionAdUnit1.bids[0].w).to.equal(0)
+      expect(auctionAdUnit1.bids[0].mt).to.equal('banner')
+      expect(auctionAdUnit1.bids[0].nrv).to.equal(true)
+      expect(auctionAdUnit1.bids[0].params).to.have.keys('placementId')
+      expect(auctionAdUnit1.bids[0].size).to.equal('0x0')
+      expect(auctionAdUnit1.bids[0].crId).to.equal('123456')
+      expect(auctionAdUnit1.bids[0].ttl).to.equal(bidResponse.ttl)
+      expect(auctionAdUnit1.bids[0].ttr).to.equal(bidResponse.timeToRespond)
+
+      expect(auctionAdUnit2.auctionId).to.equal(auctionId)
+      expect(auctionAdUnit2.bids).to.be.an('array')
+      expect(auctionAdUnit2.bids).to.have.length(2)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].bidId).to.equal(bidId2)
+      expect(auctionAdUnit2.bids[0].bst).to.equal('noBid')
+      expect(auctionAdUnit2.bids[0].bidder).to.equal('rubicon')
+      expect(auctionAdUnit2.bids[0].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].e).to.be.a('number')
+      expect(auctionAdUnit2.bids[0].params).to.have.keys('placementId')
+
+      // timeout
+      expect(auctionAdUnit2.bids[1].bidId).to.equal(bidId3)
+      expect(auctionAdUnit2.bids[1].bst).to.equal('bidTimedOut')
+      expect(auctionAdUnit2.bids[1].bidder).to.equal('ix')
+      expect(auctionAdUnit2.bids[1].s).to.be.a('number')
+      expect(auctionAdUnit2.bids[1].e).to.be.a('undefined')
+    })
+
+    it('should send "auction" event without all the fields that were set to undefined', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+
+      simulateAuction()
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+
+      const auctionAdUnit1 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit1)[0]
+      const auctionAdUnit2 = request.adUnits.filter(adUnit => adUnit.adunid === adUnit2)[0]
+
+      expect(auctionAdUnit1.code).to.equal(undefined)
+      expect(auctionAdUnit1.transactionId).to.equal(undefined)
+      expect(auctionAdUnit1.adUnitCode).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].auctionStart).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bids).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].refererInfo).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidRequestsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderRequestId).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderRequestsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].bidderWinsCount).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].schain).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].src).to.equal(undefined)
+      expect(auctionAdUnit1.bids[0].transactionId).to.equal(undefined)
+
+      // no bid
+      expect(auctionAdUnit2.bids[0].schain).to.equal(undefined)
+      expect(auctionAdUnit2.bids[0].src).to.equal(undefined)
+      expect(auctionAdUnit2.bids[0].transactionId).to.equal(undefined)
+    })
+
+    it('should mark bid winner and send to the server along with the auction data', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+      clock.tick(1500)
+
+      // no bidWon
+      expect(server.requests).to.have.length(4)
+
+      const request = JSON.parse(server.requests[3].requestBody);
+      expect(request.adUnits[0].bids[0].isW).to.equal(true)
+    })
+
+    it('should take BID_WON_TIMEOUT from server config if exists', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {},
+        'BID_WON_TIMEOUT': 500
+      }))
+
+      simulateAuction()
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+      clock.tick(499)
+
+      // no auction data
+      expect(server.requests).to.have.length(3)
+
+      clock.tick(1)
+
+      // auction data
+      expect(server.requests).to.have.length(4)
+      const request = JSON.parse(server.requests[3].requestBody);
+      expect(request.adUnits[0].bids[0].isW).to.equal(true)
+    })
+
+    it('should send a "bidWon" event to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      clock.tick(1500)
+      events.emit(constants.EVENTS.BID_WON, bidWon);
+
+      expect(server.requests).to.have.length(5)
+
+      const request = JSON.parse(server.requests[4].requestBody);
+
+      expect(request.eventType).to.equal('bidWon')
+      expect(request.auctionId).to.equal(auctionId)
+      expect(request.adunid).to.equal(adUnit1)
+      expect(request.bid.bst).to.equal('bidWon')
+      expect(request.bid.cur).to.equal('USD')
+      expect(request.bid.cpm).to.equal(0.5)
+    })
+
+    it('should sent adRenderFailed to the server', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(500)
+      simulateAuction()
+      clock.tick(1500)
+      events.emit(constants.EVENTS.AD_RENDER_FAILED, { bidId: 'abcdef', reason: 'exception' });
+
+      expect(server.requests).to.have.length(5)
+
+      const request = JSON.parse(server.requests[4].requestBody);
+
+      expect(request.eventType).to.equal('adRenderFailed')
+      expect(request.pvid).to.equal(PAGEVIEW_ID)
+      expect(request.bidId).to.equal('abcdef')
+      expect(request.reason).to.equal('exception')
+    })
+
+    it('should pick fields according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'bidRequested': {
+            'sendRaw': 0,
+            'pickFields': ['transactionId']
+          },
+          'noBid': {
+            'sendRaw': 0,
+            'pickFields': ['src']
+          },
+          'bidResponse': {
+            'sendRaw': 0,
+            'pickFields': ['adUrl', 'statusMessage']
+          },
+          'auctionEnd': {
+            'sendRaw': 0,
+            'pickFields': ['winningBids']
+          },
+        }
+      }))
+
+      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' });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.adUnits[0].bids[0].transactionId).to.equal('123')
+      expect(request.adUnits[0].bids[0].adUrl).to.equal('...')
+      expect(request.adUnits[0].bids[0].statusMessage).to.equal('msg2')
+      expect(request.adUnits[1].bids[0].src).to.equal('client')
+    })
+
+    it('should omit fields according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 0,
+            'omitFields': ['custom_1']
+          },
+          'bidResponse': {
+            'sendRaw': 0,
+            'omitFields': ['custom_2', 'custom_4', 'custom_5']
+          }
+        }
+      }))
+
+      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 });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.custom_1).to.equal(undefined)
+      expect(request.custom_6).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_2).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_4).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_5).to.equal(undefined)
+      expect(request.adUnits[0].bids[0].custom_7).to.equal(undefined)
+    })
+
+    it('should omit fields from raw data according to server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+            'omitRawFields': ['custom_1']
+          },
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit, custom_1: true });
+
+      clock.tick(1500)
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request.eventType).to.equal('auctionInit')
+      expect(request.custom_1).to.equal(undefined)
+    })
+
+    it('should send raw data to custom endpoint if exists in server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+            'endpoint': 'https://pbjs.com'
+          },
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, { ...auctionInit });
+
+      expect(server.requests[3].url).to.equal('https://pbjs.com')
+    })
+
+    it('should send raw events based on server configuration', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+      clock.next()
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 0,
+          },
+          'bidRequested': {
+            'sendRaw': 1,
+          }
+        }
+      }))
+
+      events.emit(constants.EVENTS.AUCTION_INIT, auctionInit)
+      events.emit(constants.EVENTS.BID_REQUESTED, bidRequested);
+
+      const request = JSON.parse(server.requests[3].requestBody)
+
+      expect(request).to.deep.equal({
+        eventType: 'bidRequested',
+        pid: 123,
+        pvid: PAGEVIEW_ID,
+        pbModuleVersion: '1.0.0',
+        ...bidRequested
+      })
+    })
+
+    it('should queue events and raw events until server configuration resolves', () => {
+      ooloAnalytics.enableAnalytics({
+        provider: 'oolo',
+        options: {
+          pid: 123
+        }
+      })
+
+      simulateAuction()
+      clock.tick(1500)
+
+      expect(server.requests).to.have.length(3)
+
+      server.requests[0].respond(200, {}, JSON.stringify({
+        'events': {
+          'auctionInit': {
+            'sendRaw': 1,
+          },
+          'bidRequested': {
+            'sendRaw': 1,
+          }
+        }
+      }))
+
+      expect(server.requests).to.have.length(5)
+      expect(JSON.parse(server.requests[3].requestBody).eventType).to.equal('auctionInit')
+      expect(JSON.parse(server.requests[4].requestBody).eventType).to.equal('bidRequested')
+    })
+  });
+
+  describe('buildAuctionData', () => {
+    let auction = {
+      auctionId,
+      auctionStart,
+      auctionEnd,
+      adUnitCodes: ['mid_1'],
+      auctionStatus: 'running',
+      bidderRequests: [],
+      bidsReceived: [],
+      noBids: [],
+      winningBids: [],
+      timestamp: 1234567,
+      config: {},
+      adUnits: {
+        mid_1: {
+          adUnitCode: 'mid_1',
+          code: 'mid_1',
+          transactionId: '123dsafasdf',
+          bids: {
+            [bidId1]: {
+              adUnitCode: 'mid_1',
+              cpm: 0.5
+            }
+          }
+        }
+      }
+    }
+
+    it('should turn adUnits and bids objects into arrays', () => {
+      const auctionData = buildAuctionData(auction, [])
+
+      expect(auctionData.adUnits).to.be.an('array')
+      expect(auctionData.adUnits[0].bids).to.be.an('array')
+    })
+
+    it('should remove fields from the auction', () => {
+      const auctionData = buildAuctionData(auction, [])
+      const auctionFields = Object.keys(auctionData)
+      const adUnitFields = Object.keys(auctionData.adUnits[0])
+
+      expect(auctionFields).not.to.contain('adUnitCodes')
+      expect(auctionFields).not.to.contain('auctionStatus')
+      expect(auctionFields).not.to.contain('bidderRequests')
+      expect(auctionFields).not.to.contain('bidsReceived')
+      expect(auctionFields).not.to.contain('noBids')
+      expect(auctionFields).not.to.contain('winningBids')
+      expect(auctionFields).not.to.contain('timestamp')
+      expect(auctionFields).not.to.contain('config')
+
+      expect(adUnitFields).not.to.contain('adUnitCoe')
+      expect(adUnitFields).not.to.contain('code')
+      expect(adUnitFields).not.to.contain('transactionId')
+    })
+  })
+
+  describe('generatePageViewId', () => {
+    it('should generate a 19 digits number', () => {
+      expect(generatePageViewId()).length(19)
+    })
+  })
+});
diff --git a/test/spec/modules/openxAnalyticsAdapter_spec.js b/test/spec/modules/openxAnalyticsAdapter_spec.js
index 805435abf80..b946efe922d 100644
--- a/test/spec/modules/openxAnalyticsAdapter_spec.js
+++ b/test/spec/modules/openxAnalyticsAdapter_spec.js
@@ -1,114 +1,192 @@
 import { expect } from 'chai';
-import openxAdapter from 'modules/openxAnalyticsAdapter.js';
-import { config } from 'src/config.js';
+import openxAdapter, {AUCTION_STATES} from 'modules/openxAnalyticsAdapter.js';
 import events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import * as utils from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
+import find from 'core-js-pure/features/array/find.js';
 
 const {
-  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON }
+  EVENTS: { AUCTION_INIT, BID_REQUESTED, BID_RESPONSE, BID_TIMEOUT, BID_WON, AUCTION_END }
 } = CONSTANTS;
-
 const SLOT_LOADED = 'slotOnload';
+const CURRENT_TIME = 1586000000000;
 
 describe('openx analytics adapter', function() {
-  it('should require publisher id', function() {
-    sinon.spy(utils, 'logError');
+  describe('when validating the configuration', function () {
+    let spy;
+    beforeEach(function () {
+      spy = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(function() {
+      utils.logError.restore();
+    });
+
+    it('should require organization id when no configuration is passed', function() {
+      openxAdapter.enableAnalytics();
+      expect(spy.firstCall.args[0]).to.match(/publisherPlatformId/);
+      expect(spy.firstCall.args[0]).to.match(/to exist/);
+    });
 
-    openxAdapter.enableAnalytics();
-    expect(
-      utils.logError.calledWith(
-        'OpenX analytics adapter: publisherId is required.'
-      )
-    ).to.be.true;
+    it('should require publisher id when no orgId is passed', function() {
+      openxAdapter.enableAnalytics({
+        provider: 'openx',
+        options: {
+          publisherAccountId: 12345
+        }
+      });
+      expect(spy.firstCall.args[0]).to.match(/publisherPlatformId/);
+      expect(spy.firstCall.args[0]).to.match(/to exist/);
+    });
 
-    utils.logError.restore();
+    it('should validate types', function() {
+      openxAdapter.enableAnalytics({
+        provider: 'openx',
+        options: {
+          orgId: 'test platformId',
+          sampling: 'invalid-float'
+        }
+      });
+
+      expect(spy.firstCall.args[0]).to.match(/sampling/);
+      expect(spy.firstCall.args[0]).to.match(/type 'number'/);
+    });
   });
 
-  describe('sending analytics event', function() {
-    const auctionInit = { auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79' };
+  describe('when tracking analytic events', function () {
+    const AD_UNIT_CODE = 'test-div-1';
+    const SLOT_LOAD_WAIT_TIME = 10;
+
+    const DEFAULT_V2_ANALYTICS_CONFIG = {
+      orgId: 'test-org-id',
+      publisherAccountId: 123,
+      publisherPlatformId: 'test-platform-id',
+      sample: 1.0,
+      enableV2: true,
+      payloadWaitTime: SLOT_LOAD_WAIT_TIME,
+      payloadWaitTimePadding: SLOT_LOAD_WAIT_TIME
+    };
+
+    const auctionInit = {
+      auctionId: 'test-auction-id',
+      timestamp: CURRENT_TIME,
+      timeout: 3000,
+      adUnitCodes: [AD_UNIT_CODE],
+    };
 
     const bidRequestedOpenX = {
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      auctionStart: 1540944528017,
+      auctionId: 'test-auction-id',
+      auctionStart: CURRENT_TIME,
+      timeout: 2000,
       bids: [
         {
-          adUnitCode: 'div-1',
-          bidId: '2f0c647b904e25',
+          adUnitCode: AD_UNIT_CODE,
+          bidId: 'test-openx-request-id',
           bidder: 'openx',
-          params: { unit: '540249866' },
-          transactionId: 'ac66c3e6-3118-4213-a3ae-8cdbe4f72873'
+          params: { unit: 'test-openx-ad-unit-id' },
+          userId: {
+            tdid: 'test-tradedesk-id',
+            empty_id: '',
+            null_id: null,
+            bla_id: '',
+            digitrustid: { data: { id: '1' } },
+            lipbid: { lipb: '2' }
+          }
         }
       ],
-      start: 1540944528021
+      start: CURRENT_TIME + 10
     };
 
     const bidRequestedCloseX = {
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-      auctionStart: 1540944528017,
+      auctionId: 'test-auction-id',
+      auctionStart: CURRENT_TIME,
+      timeout: 1000,
       bids: [
         {
-          adUnitCode: 'div-1',
-          bidId: '43d454020e9409',
+          adUnitCode: AD_UNIT_CODE,
+          bidId: 'test-closex-request-id',
           bidder: 'closex',
-          params: { unit: '513144370' },
-          transactionId: 'ac66c3e6-3118-4213-a3ae-8cdbe4f72873'
+          params: { unit: 'test-closex-ad-unit-id' },
+          userId: {
+            bla_id: '2',
+            tdid: 'test-tradedesk-id'
+          }
         }
       ],
-      start: 1540944528026
+      start: CURRENT_TIME + 20
     };
 
     const bidResponseOpenX = {
-      requestId: '2f0c647b904e25',
-      adId: '33dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
+      adUnitCode: AD_UNIT_CODE,
       cpm: 0.5,
+      netRevenue: true,
+      requestId: 'test-openx-request-id',
+      mediaType: 'banner',
+      width: 300,
+      height: 250,
+      adId: 'test-openx-ad-id',
+      auctionId: 'test-auction-id',
       creativeId: 'openx-crid',
-      responseTimestamp: 1540944528184,
-      ts: '2DAABBgABAAECAAIBAAsAAgAAAJccGApKSGt6NUZxRXYyHBbinsLj'
+      currency: 'USD',
+      timeToRespond: 100,
+      responseTimestamp: CURRENT_TIME + 30,
+      ts: 'test-openx-ts'
     };
 
     const bidResponseCloseX = {
-      requestId: '43d454020e9409',
-      adId: '43dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
+      adUnitCode: AD_UNIT_CODE,
       cpm: 0.3,
+      netRevenue: true,
+      requestId: 'test-closex-request-id',
+      mediaType: 'video',
+      width: 300,
+      height: 250,
+      adId: 'test-closex-ad-id',
+      auctionId: 'test-auction-id',
       creativeId: 'closex-crid',
-      responseTimestamp: 1540944528196,
-      ts: 'hu1QWo6iD3MHs6NG_AQAcFtyNqsj9y4S0YRbX7Kb06IrGns0BABb'
+      currency: 'USD',
+      timeToRespond: 200,
+      dealId: 'test-closex-deal-id',
+      responseTimestamp: CURRENT_TIME + 40,
+      ts: 'test-closex-ts'
     };
 
     const bidTimeoutOpenX = {
       0: {
-        adUnitCode: 'div-1',
-        auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-        bidId: '2f0c647b904e25'
-      }
-    };
+        adUnitCode: AD_UNIT_CODE,
+        auctionId: 'test-auction-id',
+        bidId: 'test-openx-request-id'
+      }};
 
     const bidTimeoutCloseX = {
       0: {
-        adUnitCode: 'div-1',
-        auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79',
-        bidId: '43d454020e9409'
+        adUnitCode: AD_UNIT_CODE,
+        auctionId: 'test-auction-id',
+        bidId: 'test-closex-request-id'
       }
     };
 
     const bidWonOpenX = {
-      requestId: '2f0c647b904e25',
-      adId: '33dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79'
+      requestId: 'test-openx-request-id',
+      adId: 'test-openx-ad-id',
+      adUnitCode: AD_UNIT_CODE,
+      auctionId: 'test-auction-id'
+    };
+
+    const auctionEnd = {
+      auctionId: 'test-auction-id',
+      timestamp: CURRENT_TIME,
+      auctionEnd: CURRENT_TIME + 100,
+      timeout: 3000,
+      adUnitCodes: [AD_UNIT_CODE],
     };
 
     const bidWonCloseX = {
-      requestId: '43d454020e9409',
-      adId: '43dddbb61d359a',
-      adUnitCode: 'div-1',
-      auctionId: 'add5eb0f-587d-441d-86ec-bbb722c70f79'
+      requestId: 'test-closex-request-id',
+      adId: 'test-closex-ad-id',
+      adUnitCode: AD_UNIT_CODE,
+      auctionId: 'test-auction-id'
     };
 
     function simulateAuction(events) {
@@ -116,328 +194,446 @@ describe('openx analytics adapter', function() {
 
       events.forEach(event => {
         const [eventType, args] = event;
-        openxAdapter.track({ eventType, args });
         if (eventType === BID_RESPONSE) {
           highestBid = highestBid || args;
           if (highestBid.cpm < args.cpm) {
             highestBid = args;
           }
         }
-      });
 
-      openxAdapter.track({
-        eventType: SLOT_LOADED,
-        args: {
-          slot: {
-            getAdUnitPath: () => {
-              return '/90577858/test_ad_unit';
-            },
-            getTargetingKeys: () => {
-              return [];
-            },
-            getTargeting: sinon
-              .stub()
-              .withArgs('hb_adid')
-              .returns(highestBid ? [highestBid.adId] : [])
-          }
+        if (eventType === SLOT_LOADED) {
+          const slotLoaded = {
+            slot: {
+              getAdUnitPath: () => {
+                return '/12345678/test_ad_unit';
+              },
+              getSlotElementId: () => {
+                return AD_UNIT_CODE;
+              },
+              getTargeting: (key) => {
+                if (key === 'hb_adid') {
+                  return highestBid ? [highestBid.adId] : [];
+                } else {
+                  return [];
+                }
+              }
+            }
+          };
+          openxAdapter.track({ eventType, args: slotLoaded });
+        } else {
+          openxAdapter.track({ eventType, args });
         }
       });
     }
 
-    function getQueryData(url) {
-      const queryArgs = url.split('?')[1].split('&');
-      return queryArgs.reduce((data, arg) => {
-        const [key, val] = arg.split('=');
-        data[key] = val;
-        return data;
-      }, {});
-    }
+    let clock;
 
-    before(function() {
+    beforeEach(function() {
       sinon.stub(events, 'getEvents').returns([]);
-      openxAdapter.enableAnalytics({
-        options: {
-          publisherId: 'test123'
-        }
-      });
+      clock = sinon.useFakeTimers(CURRENT_TIME);
     });
 
-    after(function() {
+    afterEach(function() {
       events.getEvents.restore();
-      openxAdapter.disableAnalytics();
+      clock.restore();
     });
 
-    beforeEach(function() {
-      openxAdapter.reset();
-    });
+    describe('when there is an auction', function () {
+      let auction;
+      let auction2;
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
 
-    afterEach(function() {});
+        simulateAuction([
+          [AUCTION_INIT, auctionInit],
+          [SLOT_LOADED]
+        ]);
 
-    it('should not send request if no bid response', function() {
-      simulateAuction([
-        [AUCTION_INIT, auctionInit],
-        [BID_REQUESTED, bidRequestedOpenX]
-      ]);
+        simulateAuction([
+          [AUCTION_INIT, {...auctionInit, auctionId: 'second-auction-id'}],
+          [SLOT_LOADED]
+        ]);
 
-      expect(server.requests.length).to.equal(0);
-    });
+        clock.tick(SLOT_LOAD_WAIT_TIME);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+        auction2 = JSON.parse(server.requests[1].requestBody)[0];
+      });
+
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
+
+      it('should track auction start time', function () {
+        expect(auction.startTime).to.equal(auctionInit.timestamp);
+      });
+
+      it('should track auction time limit', function () {
+        expect(auction.timeLimit).to.equal(auctionInit.timeout);
+      });
+
+      it('should track the \'default\' test code', function () {
+        expect(auction.testCode).to.equal('default');
+      });
 
-    it('should send 1 request to the right endpoint', function() {
-      simulateAuction([
-        [AUCTION_INIT, auctionInit],
-        [BID_REQUESTED, bidRequestedOpenX],
-        [BID_RESPONSE, bidResponseOpenX]
-      ]);
+      it('should track auction count', function () {
+        expect(auction.auctionOrder).to.equal(1);
+        expect(auction2.auctionOrder).to.equal(2);
+      });
 
-      expect(server.requests.length).to.equal(1);
+      it('should track the orgId', function () {
+        expect(auction.orgId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.orgId);
+      });
 
-      const endpoint = server.requests[0].url.split('?')[0];
-      // note IE11 returns the default secure port, so we look for this alternate value as well in these tests
-      expect(endpoint).to.be.oneOf(['https://ads.openx.net/w/1.0/pban', 'https://ads.openx.net:443/w/1.0/pban']);
+      it('should track the orgId', function () {
+        expect(auction.publisherPlatformId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.publisherPlatformId);
+      });
+
+      it('should track the orgId', function () {
+        expect(auction.publisherAccountId).to.equal(DEFAULT_V2_ANALYTICS_CONFIG.publisherAccountId);
+      });
     });
 
-    describe('hb.ct, hb.rid, dddid, hb.asiid, hb.pubid', function() {
-      it('should always be in the query string', function() {
+    describe('when there is a custom test code', function () {
+      let auction;
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({
+          options: {
+            ...DEFAULT_V2_ANALYTICS_CONFIG,
+            testCode: 'test-code'
+          }
+        });
+
         simulateAuction([
           [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
+          [SLOT_LOADED],
         ]);
+        clock.tick(SLOT_LOAD_WAIT_TIME);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.ct': String(bidRequestedOpenX.auctionStart),
-          'hb.rid': auctionInit.auctionId,
-          dddid: bidRequestedOpenX.bids[0].transactionId,
-          'hb.asiid': '/90577858/test_ad_unit',
-          'hb.pubid': 'test123'
-        });
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
+
+      it('should track the custom test code', function () {
+        expect(auction.testCode).to.equal('test-code');
       });
     });
 
-    describe('hb.cur', function() {
-      it('should be in the query string if currency is set', function() {
-        sinon
-          .stub(config, 'getConfig')
-          .withArgs('currency.adServerCurrency')
-          .returns('bitcoin');
+    describe('when there is campaign (utm) data', function () {
+      let auction;
+      beforeEach(function () {
+
+      });
+
+      afterEach(function () {
+        openxAdapter.reset();
+        utils.getWindowLocation.restore();
+        openxAdapter.disableAnalytics();
+      });
+
+      it('should track values from query params when they exist', function () {
+        sinon.stub(utils, 'getWindowLocation').returns({search: '?' +
+            'utm_campaign=test%20campaign-name&' +
+            'utm_source=test-source&' +
+            'utm_medium=test-medium&'
+        });
+
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
 
         simulateAuction([
           [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
+          [SLOT_LOADED],
         ]);
+        clock.tick(SLOT_LOAD_WAIT_TIME);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+
+        // ensure that value are URI decoded
+        expect(auction.campaign.name).to.equal('test campaign-name');
+        expect(auction.campaign.source).to.equal('test-source');
+        expect(auction.campaign.medium).to.equal('test-medium');
+        expect(auction.campaign.content).to.be.undefined;
+        expect(auction.campaign.term).to.be.undefined;
+      });
 
-        config.getConfig.restore();
+      it('should override query params if configuration parameters exist', function () {
+        sinon.stub(utils, 'getWindowLocation').returns({search: '?' +
+            'utm_campaign=test-campaign-name&' +
+            'utm_source=test-source&' +
+            'utm_medium=test-medium&' +
+            'utm_content=test-content&' +
+            'utm_term=test-term'
+        });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.cur': 'bitcoin'
+        openxAdapter.enableAnalytics({
+          options: {
+            ...DEFAULT_V2_ANALYTICS_CONFIG,
+            campaign: {
+              name: 'test-config-name',
+              source: 'test-config-source',
+              medium: 'test-config-medium'
+            }
+          }
         });
-      });
 
-      it('should not be in the query string if currency is not set', function() {
         simulateAuction([
           [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
+          [SLOT_LOADED],
         ]);
-
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.key('hb.cur');
+        clock.tick(SLOT_LOAD_WAIT_TIME);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+
+        expect(auction.campaign.name).to.equal('test-config-name');
+        expect(auction.campaign.source).to.equal('test-config-source');
+        expect(auction.campaign.medium).to.equal('test-config-medium');
+        expect(auction.campaign.content).to.equal('test-content');
+        expect(auction.campaign.term).to.equal('test-term');
       });
     });
 
-    describe('hb.dcl, hb.dl, hb.tta, hb.ttr', function() {
-      it('should be in the query string if browser supports performance API', function() {
-        const timing = {
-          fetchStart: 1540944528000,
-          domContentLoadedEventEnd: 1540944528010,
-          loadEventEnd: 1540944528110
-        };
-        const originalPerf = window.top.performance;
-        window.top.performance = { timing };
+    describe('when there are bid requests', function () {
+      let auction;
+      let openxBidder;
+      let closexBidder;
 
-        const renderTime = 1540944528100;
-        sinon.stub(Date, 'now').returns(renderTime);
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
 
         simulateAuction([
           [AUCTION_INIT, auctionInit],
+          [BID_REQUESTED, bidRequestedCloseX],
           [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
+          [SLOT_LOADED],
         ]);
+        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+        openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
+        closexBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
+      });
 
-        window.top.performance = originalPerf;
-        Date.now.restore();
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.dcl': String(timing.domContentLoadedEventEnd - timing.fetchStart),
-          'hb.dl': String(timing.loadEventEnd - timing.fetchStart),
-          'hb.tta': String(bidRequestedOpenX.auctionStart - timing.fetchStart),
-          'hb.ttr': String(renderTime - timing.fetchStart)
-        });
+      it('should track the bidder', function () {
+        expect(openxBidder.bidder).to.equal('openx');
+        expect(closexBidder.bidder).to.equal('closex');
+      });
+
+      it('should track the adunit code', function () {
+        expect(auction.adUnits[0].code).to.equal(AD_UNIT_CODE);
+      });
+
+      it('should track the user ids', function () {
+        expect(auction.userIdProviders).to.deep.equal(['bla_id', 'digitrustid', 'lipbid', 'tdid']);
       });
 
-      it('should not be in the query string if browser does not support performance API', function() {
-        const originalPerf = window.top.performance;
-        window.top.performance = undefined;
+      it('should not have responded', function () {
+        expect(openxBidder.hasBidderResponded).to.equal(false);
+        expect(closexBidder.hasBidderResponded).to.equal(false);
+      });
+    });
+
+    describe('when there are request timeouts', function () {
+      let auction;
+      let openxBidRequest;
+      let closexBidRequest;
+
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
 
         simulateAuction([
           [AUCTION_INIT, auctionInit],
+          [BID_REQUESTED, bidRequestedCloseX],
           [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
+          [BID_TIMEOUT, bidTimeoutCloseX],
+          [BID_TIMEOUT, bidTimeoutOpenX],
+          [AUCTION_END, auctionEnd]
         ]);
+        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
 
-        window.top.performance = originalPerf;
+        openxBidRequest = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
+        closexBidRequest = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
+      });
+
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
+
+      it('should track the timeout', function () {
+        expect(openxBidRequest.timedOut).to.equal(true);
+        expect(closexBidRequest.timedOut).to.equal(true);
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.keys(
-          'hb.dcl',
-          'hb.dl',
-          'hb.tta',
-          'hb.ttr'
-        );
+      it('should track the timeout value ie timeLimit', function () {
+        expect(openxBidRequest.timeLimit).to.equal(2000);
+        expect(closexBidRequest.timeLimit).to.equal(1000);
       });
     });
 
-    describe('ts, auid', function() {
-      it('OpenX is in auction and has a bid response', function() {
+    describe('when there are bid responses', function () {
+      let auction;
+      let openxBidResponse;
+      let closexBidResponse;
+
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
+
         simulateAuction([
           [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
           [BID_REQUESTED, bidRequestedCloseX],
+          [BID_REQUESTED, bidRequestedOpenX],
           [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX]
+          [BID_RESPONSE, bidResponseCloseX],
+          [AUCTION_END, auctionEnd]
         ]);
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          ts: bidResponseOpenX.ts,
-          auid: bidRequestedOpenX.bids[0].params.unit
-        });
+        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
+
+        openxBidResponse = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx').bidResponses[0];
+        closexBidResponse = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex').bidResponses[0];
       });
 
-      it('OpenX is in auction but no bid response', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          auid: bidRequestedOpenX.bids[0].params.unit
-        });
-        expect(queryData).to.not.have.key('ts');
+      it('should track the cpm in microCPM', function () {
+        expect(openxBidResponse.microCpm).to.equal(bidResponseOpenX.cpm * 1000000);
+        expect(closexBidResponse.microCpm).to.equal(bidResponseCloseX.cpm * 1000000);
       });
 
-      it('OpenX is not in auction', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX]
-        ]);
+      it('should track if the bid is in net revenue', function () {
+        expect(openxBidResponse.netRevenue).to.equal(bidResponseOpenX.netRevenue);
+        expect(closexBidResponse.netRevenue).to.equal(bidResponseCloseX.netRevenue);
+      });
+
+      it('should track the mediaType', function () {
+        expect(openxBidResponse.mediaType).to.equal(bidResponseOpenX.mediaType);
+        expect(closexBidResponse.mediaType).to.equal(bidResponseCloseX.mediaType);
+      });
+
+      it('should track the currency', function () {
+        expect(openxBidResponse.currency).to.equal(bidResponseOpenX.currency);
+        expect(closexBidResponse.currency).to.equal(bidResponseCloseX.currency);
+      });
+
+      it('should track the ad width and height', function () {
+        expect(openxBidResponse.width).to.equal(bidResponseOpenX.width);
+        expect(openxBidResponse.height).to.equal(bidResponseOpenX.height);
+
+        expect(closexBidResponse.width).to.equal(bidResponseCloseX.width);
+        expect(closexBidResponse.height).to.equal(bidResponseCloseX.height);
+      });
+
+      it('should track the bid dealId', function () {
+        expect(openxBidResponse.dealId).to.equal(bidResponseOpenX.dealId); // no deal id defined
+        expect(closexBidResponse.dealId).to.equal(bidResponseCloseX.dealId); // deal id defined
+      });
+
+      it('should track the bid\'s latency', function () {
+        expect(openxBidResponse.latency).to.equal(bidResponseOpenX.timeToRespond);
+        expect(closexBidResponse.latency).to.equal(bidResponseCloseX.timeToRespond);
+      });
+
+      it('should not have any bid winners', function () {
+        expect(openxBidResponse.winner).to.equal(false);
+        expect(closexBidResponse.winner).to.equal(false);
+      });
+
+      it('should track the bid currency', function () {
+        expect(openxBidResponse.currency).to.equal(bidResponseOpenX.currency);
+        expect(closexBidResponse.currency).to.equal(bidResponseCloseX.currency);
+      });
+
+      it('should track the auction end time', function () {
+        expect(auction.endTime).to.equal(auctionEnd.auctionEnd);
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.not.have.keys('auid', 'ts');
+      it('should track that the auction ended', function () {
+        expect(auction.state).to.equal(AUCTION_STATES.ENDED);
       });
     });
 
-    describe('hb.exn, hb.sts, hb.ets, hb.bv, hb.crid, hb.to', function() {
-      it('2 bidders in auction', function() {
+    describe('when there are bidder wins', function () {
+      let auction;
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
+
         simulateAuction([
           [AUCTION_INIT, auctionInit],
           [BID_REQUESTED, bidRequestedOpenX],
           [BID_REQUESTED, bidRequestedCloseX],
           [BID_RESPONSE, bidResponseOpenX],
-          [BID_RESPONSE, bidResponseCloseX]
+          [BID_RESPONSE, bidResponseCloseX],
+          [AUCTION_END, auctionEnd],
+          [BID_WON, bidWonOpenX]
         ]);
 
-        const queryData = getQueryData(server.requests[0].url);
-        const auctionStart = bidRequestedOpenX.auctionStart;
-        expect(queryData).to.include({
-          'hb.exn': [
-            bidRequestedOpenX.bids[0].bidder,
-            bidRequestedCloseX.bids[0].bidder
-          ].join(','),
-          'hb.sts': [
-            bidRequestedOpenX.start - auctionStart,
-            bidRequestedCloseX.start - auctionStart
-          ].join(','),
-          'hb.ets': [
-            bidResponseOpenX.responseTimestamp - auctionStart,
-            bidResponseCloseX.responseTimestamp - auctionStart
-          ].join(','),
-          'hb.bv': [bidResponseOpenX.cpm, bidResponseCloseX.cpm].join(','),
-          'hb.crid': [
-            bidResponseOpenX.creativeId,
-            bidResponseCloseX.creativeId
-          ].join(','),
-          'hb.to': [false, false].join(',')
-        });
+        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
       });
 
-      it('OpenX timed out', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_REQUESTED, bidRequestedCloseX],
-          [BID_RESPONSE, bidResponseCloseX],
-          [BID_TIMEOUT, bidTimeoutOpenX]
-        ]);
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        const auctionStart = bidRequestedOpenX.auctionStart;
-        expect(queryData).to.include({
-          'hb.exn': [
-            bidRequestedOpenX.bids[0].bidder,
-            bidRequestedCloseX.bids[0].bidder
-          ].join(','),
-          'hb.sts': [
-            bidRequestedOpenX.start - auctionStart,
-            bidRequestedCloseX.start - auctionStart
-          ].join(','),
-          'hb.ets': [
-            undefined,
-            bidResponseCloseX.responseTimestamp - auctionStart
-          ].join(','),
-          'hb.bv': [0, bidResponseCloseX.cpm].join(','),
-          'hb.crid': [undefined, bidResponseCloseX.creativeId].join(','),
-          'hb.to': [true, false].join(',')
-        });
+      it('should track that bidder as the winner', function () {
+        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
+        expect(openxBidder.bidResponses[0]).to.contain({winner: true});
+      });
+
+      it('should track that bidder as the losers', function () {
+        let closexBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'closex');
+        expect(closexBidder.bidResponses[0]).to.contain({winner: false});
       });
     });
 
-    describe('hb.we, hb.g1', function() {
-      it('OpenX won', function() {
+    describe('when a winning bid renders', function () {
+      let auction;
+      beforeEach(function () {
+        openxAdapter.enableAnalytics({options: DEFAULT_V2_ANALYTICS_CONFIG});
+
         simulateAuction([
           [AUCTION_INIT, auctionInit],
           [BID_REQUESTED, bidRequestedOpenX],
+          [BID_REQUESTED, bidRequestedCloseX],
           [BID_RESPONSE, bidResponseOpenX],
-          [BID_WON, bidWonOpenX]
+          [BID_RESPONSE, bidResponseCloseX],
+          [AUCTION_END, auctionEnd],
+          [BID_WON, bidWonOpenX],
+          [SLOT_LOADED]
         ]);
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.we': '0',
-          'hb.g1': 'false'
-        });
+        clock.tick(SLOT_LOAD_WAIT_TIME * 2);
+        auction = JSON.parse(server.requests[0].requestBody)[0];
       });
 
-      it('DFP won', function() {
-        simulateAuction([
-          [AUCTION_INIT, auctionInit],
-          [BID_REQUESTED, bidRequestedOpenX],
-          [BID_RESPONSE, bidResponseOpenX]
-        ]);
+      afterEach(function () {
+        openxAdapter.reset();
+        openxAdapter.disableAnalytics();
+      });
 
-        const queryData = getQueryData(server.requests[0].url);
-        expect(queryData).to.include({
-          'hb.we': '-1',
-          'hb.g1': 'true'
-        });
+      it('should track that winning bid rendered', function () {
+        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
+        expect(openxBidder.bidResponses[0]).to.contain({rendered: true});
+      });
+
+      it('should track that winning bid render time', function () {
+        let openxBidder = find(auction.adUnits[0].bidRequests, bidderRequest => bidderRequest.bidder === 'openx');
+        expect(openxBidder.bidResponses[0]).to.contain({renderTime: CURRENT_TIME});
+      });
+
+      it('should track that the auction completed', function () {
+        expect(auction.state).to.equal(AUCTION_STATES.COMPLETED);
       });
     });
   });
diff --git a/test/spec/modules/openxBidAdapter_spec.js b/test/spec/modules/openxBidAdapter_spec.js
index a6fbc9666b9..2a380277e55 100644
--- a/test/spec/modules/openxBidAdapter_spec.js
+++ b/test/spec/modules/openxBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import {spec, USER_ID_CODE_TO_QUERY_ARG} from 'modules/openxBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
+import {BANNER, VIDEO} from 'src/mediaTypes.js';
 import {userSync} from 'src/userSync.js';
 import {config} from 'src/config.js';
 import * as utils from 'src/utils.js';
@@ -290,6 +291,38 @@ describe('OpenxAdapter', function () {
           expect(spec.isBidRequestValid(videoBidWithMediaType)).to.equal(false);
         });
       });
+
+      describe('and request config uses test', () => {
+        const videoBidWithTest = {
+          bidder: 'openx',
+          params: {
+            unit: '12345678',
+            delDomain: 'test-del-domain',
+            test: true
+          },
+          adUnitCode: 'adunit-code',
+          mediaTypes: {
+            video: {
+              playerSize: [640, 480]
+            }
+          },
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          transactionId: '4008d88a-8137-410b-aa35-fbfdabcb478e'
+        };
+
+        let mockBidderRequest = {refererInfo: {}};
+
+        it('should return true when required params found', function () {
+          expect(spec.isBidRequestValid(videoBidWithTest)).to.equal(true);
+        });
+
+        it('should send video bid request to openx url via GET, with vtest=1 video parameter', function () {
+          const request = spec.buildRequests([videoBidWithTest], mockBidderRequest);
+          expect(request[0].data.vtest).to.equal(1);
+        });
+      });
     });
   });
 
@@ -308,7 +341,8 @@ describe('OpenxAdapter', function () {
       },
       'bidId': 'test-bid-id-1',
       'bidderRequestId': 'test-bid-request-1',
-      'auctionId': 'test-auction-1'
+      'auctionId': 'test-auction-1',
+      'ortb2Imp': { ext: { data: { pbadslot: '/12345/my-gpt-tag-0' } } }
     }, {
       'bidder': 'openx',
       'params': {
@@ -323,7 +357,8 @@ describe('OpenxAdapter', function () {
       },
       'bidId': 'test-bid-id-2',
       'bidderRequestId': 'test-bid-request-2',
-      'auctionId': 'test-auction-2'
+      'auctionId': 'test-auction-2',
+      'ortb2Imp': { ext: { data: { pbadslot: '/12345/my-gpt-tag-1' } } }
     }];
 
     const bidRequestsWithPlatform = [{
@@ -417,7 +452,12 @@ describe('OpenxAdapter', function () {
 
     it('should send the adunit codes', function () {
       const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
-      expect(request[0].data.divIds).to.equal(`${encodeURIComponent(bidRequestsWithMediaTypes[0].adUnitCode)},${encodeURIComponent(bidRequestsWithMediaTypes[1].adUnitCode)}`);
+      expect(request[0].data.divids).to.equal(`${encodeURIComponent(bidRequestsWithMediaTypes[0].adUnitCode)},${encodeURIComponent(bidRequestsWithMediaTypes[1].adUnitCode)}`);
+    });
+
+    it('should send the gpids', function () {
+      const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+      expect(request[0].data.aucs).to.equal(`${encodeURIComponent('/12345/my-gpt-tag-0')},${encodeURIComponent('/12345/my-gpt-tag-1')}`);
     });
 
     it('should send ad unit ids when any are defined', function () {
@@ -508,25 +548,6 @@ describe('OpenxAdapter', function () {
       expect(dataParams.tps).to.equal(btoa('test1=testval1.&test2=testval2_,testval3'));
     });
 
-    it('should send out custom floors on bids that have customFloors specified', function () {
-      const bidRequest = Object.assign({},
-        bidRequestsWithMediaTypes[0],
-        {
-          params: {
-            'unit': '12345678',
-            'delDomain': 'test-del-domain',
-            'customFloor': 1.500001
-          }
-        }
-      );
-
-      const request = spec.buildRequests([bidRequest], mockBidderRequest);
-      const dataParams = request[0].data;
-
-      expect(dataParams.aumfs).to.exist;
-      expect(dataParams.aumfs).to.equal('1500');
-    });
-
     it('should send out custom bc parameter, if override is present', function () {
       const bidRequest = Object.assign({},
         bidRequestsWithMediaTypes[0],
@@ -1029,14 +1050,24 @@ describe('OpenxAdapter', function () {
       const EXAMPLE_DATA_BY_ATTR = {
         britepoolid: '1111-britepoolid',
         criteoId: '1111-criteoId',
-        digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        id5id: '1111-id5id',
+        fabrickId: '1111-fabrickid',
+        haloId: '1111-haloid',
+        id5id: {uid: '1111-id5id'},
         idl_env: '1111-idl_env',
+        IDP: '1111-zeotap-idplusid',
+        idxId: '1111-idxid',
+        intentIqId: '1111-intentiqid',
         lipb: {lipbid: '1111-lipb'},
+        lotamePanoramaId: '1111-lotameid',
+        merkleId: '1111-merkleid',
         netId: 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
-        parrableid: 'eidVersion.encryptionKeyReference.encryptedValue',
+        parrableId: { eid: 'eidVersion.encryptionKeyReference.encryptedValue' },
         pubcid: '1111-pubcid',
+        quantcastId: '1111-quantcastid',
+        sharedId: '1111-sharedid',
+        tapadId: '111-tapadid',
         tdid: '1111-tdid',
+        verizonMediaId: '1111-verizonmediaid',
       };
 
       // generates the same set of tests for each id provider
@@ -1074,12 +1105,15 @@ describe('OpenxAdapter', function () {
             let userIdValue;
             // handle cases where userId key refers to an object
             switch (userIdProviderKey) {
-              case 'digitrustid':
-                userIdValue = EXAMPLE_DATA_BY_ATTR.digitrustid.data.id;
-                break;
               case 'lipb':
                 userIdValue = EXAMPLE_DATA_BY_ATTR.lipb.lipbid;
                 break;
+              case 'parrableId':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.parrableId.eid;
+                break;
+              case 'id5id':
+                userIdValue = EXAMPLE_DATA_BY_ATTR.id5id.uid;
+                break;
               default:
                 userIdValue = EXAMPLE_DATA_BY_ATTR[userIdProviderKey];
             }
@@ -1089,6 +1123,109 @@ describe('OpenxAdapter', function () {
         });
       });
     });
+
+    describe('floors', function () {
+      it('should send out custom floors on bids that have customFloors specified', function () {
+        const bidRequest = Object.assign({},
+          bidRequestsWithMediaTypes[0],
+          {
+            params: {
+              'unit': '12345678',
+              'delDomain': 'test-del-domain',
+              'customFloor': 1.500001
+            }
+          }
+        );
+
+        const request = spec.buildRequests([bidRequest], mockBidderRequest);
+        const dataParams = request[0].data;
+
+        expect(dataParams.aumfs).to.exist;
+        expect(dataParams.aumfs).to.equal('1500');
+      });
+
+      context('with floors module', function () {
+        let adServerCurrencyStub;
+
+        beforeEach(function () {
+          adServerCurrencyStub = sinon
+            .stub(config, 'getConfig')
+            .withArgs('currency.adServerCurrency')
+        });
+
+        afterEach(function () {
+          config.getConfig.restore();
+        });
+
+        it('should send out floors on bids', function () {
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {
+                  currency: 'AUS',
+                  floor: 9.99
+                }
+              }
+            }
+          );
+
+          const bidRequest2 = Object.assign({},
+            bidRequestsWithMediaTypes[1],
+            {
+              getFloor: () => {
+                return {
+                  currency: 'AUS',
+                  floor: 18.881
+                }
+              }
+            }
+          );
+
+          const request = spec.buildRequests([bidRequest1, bidRequest2], mockBidderRequest);
+          const dataParams = request[0].data;
+
+          expect(dataParams.aumfs).to.exist;
+          expect(dataParams.aumfs).to.equal('9990,18881');
+        });
+
+        it('should send out floors on bids in the default currency', function () {
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {};
+              }
+            }
+          );
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(BANNER);
+          expect(getFloorSpy.args[0][0].currency).to.equal('USD');
+        });
+
+        it('should send out floors on bids in the ad server currency if defined', function () {
+          adServerCurrencyStub.returns('bitcoin');
+
+          const bidRequest1 = Object.assign({},
+            bidRequestsWithMediaTypes[0],
+            {
+              getFloor: () => {
+                return {};
+              }
+            }
+          );
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(BANNER);
+          expect(getFloorSpy.args[0][0].currency).to.equal('bitcoin');
+        });
+      })
+    })
   });
 
   describe('buildRequests for video', function () {
@@ -1108,7 +1245,8 @@ describe('OpenxAdapter', function () {
       'bidId': '30b31c1838de1e',
       'bidderRequestId': '22edbae2733bf6',
       'auctionId': '1d1a030790a475',
-      'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e'
+      'transactionId': '4008d88a-8137-410b-aa35-fbfdabcb478e',
+      'ortb2Imp': { ext: { data: { pbadslot: '/12345/my-gpt-tag-0' } } }
     }];
     const mockBidderRequest = {refererInfo: {}};
 
@@ -1124,6 +1262,12 @@ describe('OpenxAdapter', function () {
       expect(dataParams.auid).to.equal('12345678');
       expect(dataParams.vht).to.equal(480);
       expect(dataParams.vwd).to.equal(640);
+      expect(dataParams.aucs).to.equal(encodeURIComponent('/12345/my-gpt-tag-0'));
+    });
+
+    it('shouldn\'t have the test parameter', function () {
+      const request = spec.buildRequests(bidRequestsWithMediaTypes, mockBidderRequest);
+      expect(request[0].data.vtest).to.be.undefined;
     });
 
     it('should send a bc parameter', function () {
@@ -1178,48 +1322,181 @@ describe('OpenxAdapter', function () {
         expect(request[0].data.ju).to.not.equal(myUrl);
       });
 
-      describe('when using the openRtb param', function () {
-        it('should covert the param to a JSON string', function () {
-          let myOpenRTBObject = {};
+      describe('when using the openrtb video params', function () {
+        it('should parse legacy params.video.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
 
-          expect(request[0].data.openrtb).to.equal(JSON.stringify(myOpenRTBObject));
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
         });
 
-        it("should use the bidRequest's playerSize when it is available", function () {
-          const width = 200;
-          const height = 100;
-          const myOpenRTBObject = {v: height, w: width};
+        it('should parse legacy params.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
+          videoBidRequest.params.openrtb = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy params.video', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
+          videoBidRequest.params.video = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy params.video as full openrtb', function () {
+          let myOpenRTBObject = {imp: [{video: {mimes: ['application/javascript']}}]};
+          videoBidRequest.params.video = myOpenRTBObject;
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse legacy video.openrtb', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript']};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should omit filtered values for legacy', function () {
+          let myOpenRTBObject = {mimes: ['application/javascript'], dont: 'use'};
+          videoBidRequest.params.video = {
+            openrtb: myOpenRTBObject
+          };
+          const expected = {imp: [{video: {w: 640, h: 480, mimes: ['application/javascript']}}]}
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+
+          expect(request[0].data.openrtb).to.equal(JSON.stringify(expected));
+        });
+
+        it('should parse mediatypes.video', function () {
+          videoBidRequest.mediaTypes.video.mimes = ['application/javascript']
+          videoBidRequest.mediaTypes.video.minduration = 15
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
           const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
+          expect(openRtbRequestParams.imp[0].video.mimes).to.eql(['application/javascript']);
+          expect(openRtbRequestParams.imp[0].video.minduration).to.equal(15);
+        });
 
-          expect(openRtbRequestParams.w).to.not.equal(width);
-          expect(openRtbRequestParams.v).to.not.equal(height);
+        it('should filter mediatypes.video', function () {
+          videoBidRequest.mediaTypes.video.mimes = ['application/javascript']
+          videoBidRequest.mediaTypes.video.minnothing = 15
+          const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
+          const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
+          expect(openRtbRequestParams.imp[0].video.mimes).to.eql(['application/javascript']);
+          expect(openRtbRequestParams.imp[0].video.minnothing).to.equal(undefined);
         });
 
-        it('should use the the openRTB\'s sizing when the bidRequest\'s playerSize is not available', function () {
+        it("should use the bidRequest's playerSize", function () {
           const width = 200;
           const height = 100;
           const myOpenRTBObject = {v: height, w: width};
           videoBidRequest.params.video = {
             openrtb: myOpenRTBObject
           };
-          videoBidRequest.mediaTypes.video.playerSize = undefined;
-
           const request = spec.buildRequests([videoBidRequest], mockBidderRequest);
           const openRtbRequestParams = JSON.parse(request[0].data.openrtb);
 
-          expect(openRtbRequestParams.w).to.equal(width);
-          expect(openRtbRequestParams.v).to.equal(height);
+          expect(openRtbRequestParams.imp[0].video.w).to.equal(640);
+          expect(openRtbRequestParams.imp[0].video.h).to.equal(480);
         });
       });
     });
+
+    describe('floors', function () {
+      it('should send out custom floors on bids that have customFloors specified', function () {
+        const bidRequest = Object.assign({},
+          bidRequestsWithMediaTypes[0],
+          {
+            params: {
+              'unit': '12345678',
+              'delDomain': 'test-del-domain',
+              'customFloor': 1.500001
+            }
+          }
+        );
+
+        const request = spec.buildRequests([bidRequest], mockBidderRequest);
+        const dataParams = request[0].data;
+
+        expect(dataParams.aumfs).to.exist;
+        expect(dataParams.aumfs).to.equal('1500');
+      });
+
+      context('with floors module', function () {
+        let adServerCurrencyStub;
+        function makeBidWithFloorInfo(floorInfo) {
+          return Object.assign(utils.deepClone(bidRequestsWithMediaTypes[0]),
+            {
+              getFloor: () => {
+                return floorInfo;
+              }
+            });
+        }
+
+        beforeEach(function () {
+          adServerCurrencyStub = sinon
+            .stub(config, 'getConfig')
+            .withArgs('currency.adServerCurrency')
+        });
+
+        afterEach(function () {
+          config.getConfig.restore();
+        });
+
+        it('should send out floors on bids', function () {
+          const floors = [9.99, 18.881];
+          const bidRequests = floors.map(floor => {
+            return makeBidWithFloorInfo({
+              currency: 'AUS',
+              floor: floor
+            });
+          });
+          const request = spec.buildRequests(bidRequests, mockBidderRequest);
+
+          expect(request[0].data.aumfs).to.exist;
+          expect(request[0].data.aumfs).to.equal('9990');
+          expect(request[1].data.aumfs).to.exist;
+          expect(request[1].data.aumfs).to.equal('18881');
+        });
+
+        it('should send out floors on bids in the default currency', function () {
+          const bidRequest1 = makeBidWithFloorInfo({});
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(VIDEO);
+          expect(getFloorSpy.args[0][0].currency).to.equal('USD');
+        });
+
+        it('should send out floors on bids in the ad server currency if defined', function () {
+          adServerCurrencyStub.returns('bitcoin');
+
+          const bidRequest1 = makeBidWithFloorInfo({});
+
+          let getFloorSpy = sinon.spy(bidRequest1, 'getFloor');
+
+          spec.buildRequests([bidRequest1], mockBidderRequest);
+          expect(getFloorSpy.args[0][0].mediaType).to.equal(VIDEO);
+          expect(getFloorSpy.args[0][0].currency).to.equal('bitcoin');
+        });
+      })
+    })
   });
 
   describe('buildRequest for multi-format ad', function () {
@@ -1249,7 +1526,7 @@ describe('OpenxAdapter', function () {
       const request = spec.buildRequests([multiformatBid], mockBidderRequest);
       const dataParams = request[0].data;
 
-      expect(dataParams.divIds).to.have.string(multiformatBid.adUnitCode);
+      expect(dataParams.divids).to.have.string(multiformatBid.adUnitCode);
     });
   });
 
@@ -1354,7 +1631,11 @@ describe('OpenxAdapter', function () {
         expect(bid.meta.brandId).to.equal(DEFAULT_TEST_ARJ_AD_UNIT.brand_id);
       });
 
-      it('should return a brand ID', function () {
+      it('should return an adomain', function () {
+        expect(bid.meta.advertiserDomains).to.deep.equal([]);
+      });
+
+      it('should return a dsp ID', function () {
         expect(bid.meta.dspid).to.equal(DEFAULT_TEST_ARJ_AD_UNIT.adv_id);
       });
     });
@@ -1634,6 +1915,13 @@ describe('OpenxAdapter', function () {
       expect(JSON.stringify(Object.keys(result[0]).sort())).to.eql(JSON.stringify(Object.keys(expectedResponse[0]).sort()));
     });
 
+    it('should return correct bid response with MediaType and deal_id', function () {
+      const bidResponseOverride = { 'deal_id': 'OX-mydeal' };
+      const bidResponseWithDealId = Object.assign({}, bidResponse, bidResponseOverride);
+      const result = spec.interpretResponse({body: bidResponseWithDealId}, bidRequestsWithMediaType);
+      expect(result[0].dealId).to.equal(bidResponseOverride.deal_id);
+    });
+
     it('should handle nobid responses for bidRequests with MediaTypes', function () {
       const bidResponse = {'vastUrl': '', 'pub_rev': '', 'width': '', 'height': '', 'adid': '', 'pixels': ''};
       const result = spec.interpretResponse({body: bidResponse}, bidRequestsWithMediaTypes);
diff --git a/test/spec/modules/optimeraRtdProvider_spec.js b/test/spec/modules/optimeraRtdProvider_spec.js
new file mode 100644
index 00000000000..1d2c0d99a0a
--- /dev/null
+++ b/test/spec/modules/optimeraRtdProvider_spec.js
@@ -0,0 +1,84 @@
+import * as optimeraRTD from '../../../modules/optimeraRtdProvider.js';
+let utils = require('src/utils.js');
+
+describe('Optimera RTD sub module', () => {
+  it('should init, return true, and set the params', () => {
+    const conf = {
+      dataProviders: [{
+        name: 'optimeraRTD',
+        params: {
+          clientID: '9999',
+          optimeraKeyName: 'optimera',
+          device: 'de'
+        }
+      }]
+    };
+    expect(optimeraRTD.init(conf.dataProviders[0])).to.equal(true);
+    expect(optimeraRTD.clientID).to.equal('9999');
+    expect(optimeraRTD.optimeraKeyName).to.equal('optimera');
+    expect(optimeraRTD.device).to.equal('de');
+  });
+});
+
+describe('Optimera RTD score file url is properly set', () => {
+  it('Proerly set the score file url', () => {
+    optimeraRTD.setScores();
+    expect(optimeraRTD.scoresURL).to.equal('https://dyv1bugovvq1g.cloudfront.net/9999/localhost:9876/context.html.js');
+  });
+});
+
+describe('Optimera RTD score file properly sets targeting values', () => {
+  const scores = {
+    'div-0': ['A1', 'A2'],
+    'div-1': ['A3', 'A4'],
+    'device': {
+      'de': {
+        'div-0': ['A5', 'A6'],
+        'div-1': ['A7', 'A8'],
+      },
+      'mo': {
+        'div-0': ['A9', 'B0'],
+        'div-1': ['B1', 'B2'],
+      }
+    }
+  };
+  it('Properly set the score file url', () => {
+    optimeraRTD.setScores(JSON.stringify(scores));
+    expect(optimeraRTD.optimeraTargeting['div-0']).to.include.ordered.members(['A5', 'A6']);
+    expect(optimeraRTD.optimeraTargeting['div-1']).to.include.ordered.members(['A7', 'A8']);
+  });
+});
+
+describe('Optimera RTD targeting object is properly formed', () => {
+  const adDivs = ['div-0', 'div-1'];
+  it('applyTargeting properly created the targeting object', () => {
+    const targeting = optimeraRTD.returnTargetingData(adDivs);
+    expect(targeting).to.deep.include({'div-0': {'optimera': ['A5', 'A6']}});
+    expect(targeting).to.deep.include({'div-1': {'optimera': ['A7', 'A8']}});
+  });
+});
+
+describe('Optimera RTD error logging', () => {
+  let utilsLogErrorStub;
+
+  beforeEach(function () {
+    utilsLogErrorStub = sinon.stub(utils, 'logError');
+  });
+  afterEach(function () {
+    utilsLogErrorStub.restore();
+  });
+
+  it('ommitting clientID should log an error', () => {
+    const conf = {
+      dataProviders: [{
+        name: 'optimeraRTD',
+        params: {
+          optimeraKeyName: 'optimera',
+          device: 'de'
+        }
+      }]
+    };
+    optimeraRTD.init(conf.dataProviders[0]);
+    expect(utils.logError.called).to.equal(true);
+  });
+});
diff --git a/test/spec/modules/optimonAnalyticsAdapter_spec.js b/test/spec/modules/optimonAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..b5b76ce3fde
--- /dev/null
+++ b/test/spec/modules/optimonAnalyticsAdapter_spec.js
@@ -0,0 +1,40 @@
+import * as utils from 'src/utils.js';
+import { expect } from 'chai';
+import optimonAnalyticsAdapter from '../../../modules/optimonAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import events from 'src/events';
+import constants from 'src/constants.json'
+
+const AD_UNIT_CODE = 'demo-adunit-1';
+const PUBLISHER_CONFIG = {
+  pubId: 'optimon_test',
+  pubAdxAccount: 123456789,
+  pubTimezone: 'Asia/Jerusalem'
+};
+
+describe('Optimon Analytics Adapter', () => {
+  const optmn_currentWindow = utils.getWindowSelf();
+  let optmn_queue = [];
+
+  beforeEach(() => {
+    optmn_currentWindow.OptimonAnalyticsAdapter = (...optmn_args) => optmn_queue.push(optmn_args);
+    adapterManager.enableAnalytics({
+      provider: 'optimon'
+    });
+    optmn_queue = []
+  });
+
+  afterEach(() => {
+    optimonAnalyticsAdapter.disableAnalytics();
+  });
+
+  it('should forward all events to the queue', () => {
+    const optmn_arguments = [AD_UNIT_CODE, PUBLISHER_CONFIG];
+
+    events.emit(constants.EVENTS.AUCTION_END, optmn_arguments)
+    events.emit(constants.EVENTS.BID_TIMEOUT, optmn_arguments)
+    events.emit(constants.EVENTS.BID_WON, optmn_arguments)
+
+    expect(optmn_queue.length).to.eql(3);
+  });
+});
diff --git a/test/spec/modules/orbidderBidAdapter_spec.js b/test/spec/modules/orbidderBidAdapter_spec.js
index eec6ccd19f6..42cc25ae04f 100644
--- a/test/spec/modules/orbidderBidAdapter_spec.js
+++ b/test/spec/modules/orbidderBidAdapter_spec.js
@@ -1,8 +1,6 @@
 import {expect} from 'chai';
 import {spec} from 'modules/orbidderBidAdapter.js';
 import {newBidder} from 'src/adapters/bidderFactory.js';
-import openxAdapter from '../../../modules/openxAnalyticsAdapter.js';
-import {detectReferer} from 'src/refererDetection.js';
 
 describe('orbidderBidAdapter', () => {
   const adapter = newBidder(spec);
@@ -93,7 +91,7 @@ describe('orbidderBidAdapter', () => {
     it('sends bid request to endpoint via https using post', () => {
       expect(request.method).to.equal('POST');
       expect(request.url.indexOf('https://')).to.equal(0);
-      expect(request.url).to.equal(`${spec.orbidderHost}/bid`);
+      expect(request.url).to.equal(`${spec.hostname}/bid`);
     });
 
     it('contains prebid version parameter', () => {
@@ -106,7 +104,7 @@ describe('orbidderBidAdapter', () => {
       expect(request.data.pageUrl).to.equal('https://localhost:9876/');
       // expect(request.data.referrer).to.equal('');
       Object.keys(defaultBidRequest).forEach((key) => {
-        expect(defaultBidRequest[key]).to.equal(request.data[key]);
+        expect(request.data[key]).to.deep.equal(defaultBidRequest[key]);
       });
     });
 
@@ -191,6 +189,47 @@ describe('orbidderBidAdapter', () => {
       });
     });
 
+    it('should get correct bid response with advertiserDomains', () => {
+      const serverResponse = [
+        {
+          'width': 300,
+          'height': 250,
+          'creativeId': '29681110',
+          'ad': '',
+          'cpm': 0.5,
+          'requestId': '30b31c1838de1e',
+          'ttl': 60,
+          'netRevenue': true,
+          'currency': 'EUR',
+          'advertiserDomains': ['cm.tavira.pt']
+        }
+      ];
+
+      const expectedResponse = [
+        {
+          'requestId': '30b31c1838de1e',
+          'cpm': 0.5,
+          'creativeId': '29681110',
+          'width': 300,
+          'height': 250,
+          'ttl': 60,
+          'currency': 'EUR',
+          'ad': '',
+          'netRevenue': true,
+          'meta': {
+            'advertiserDomains': ['cm.tavira.pt']
+          }
+        }
+      ];
+
+      const result = spec.interpretResponse({body: serverResponse});
+
+      expect(result.length).to.equal(expectedResponse.length);
+      Object.keys(expectedResponse[0]).forEach((key) => {
+        expect(result[0][key]).to.deep.equal(expectedResponse[0][key]);
+      });
+    });
+
     it('handles broken server response', () => {
       const serverResponse = [
         {
diff --git a/test/spec/modules/outbrainBidAdapter_spec.js b/test/spec/modules/outbrainBidAdapter_spec.js
new file mode 100644
index 00000000000..a5f23240a7c
--- /dev/null
+++ b/test/spec/modules/outbrainBidAdapter_spec.js
@@ -0,0 +1,562 @@
+import {expect} from 'chai';
+import {spec} from 'modules/outbrainBidAdapter.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr';
+
+describe('Outbrain Adapter', function () {
+  describe('Bid request and response', function () {
+    const commonBidRequest = {
+      bidder: 'outbrain',
+      params: {
+        publisher: {
+          id: 'publisher-id'
+        },
+      },
+      bidId: '2d6815a92ba1ba',
+      auctionId: '12043683-3254-4f74-8934-f941b085579e',
+    }
+    const nativeBidRequestParams = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [
+            120,
+            100
+          ],
+          sendId: true
+        },
+        title: {
+          required: true,
+          sendId: true
+        },
+        sponsoredBy: {
+          required: false
+        }
+      },
+    }
+
+    const displayBidRequestParams = {
+      sizes: [
+        [
+          300,
+          250
+        ]
+      ]
+    }
+
+    describe('isBidRequestValid', function () {
+      before(() => {
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      it('should fail when bid is invalid', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed when bid contains native params', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should succeed when bid contains sizes', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...displayBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if publisher id is not set', function () {
+        const bid = {
+          bidder: 'outbrain',
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed with outbrain config', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        })
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if bidder url is not set', function () {
+        const bid = {
+          bidder: 'outbrain',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+    })
+
+    describe('buildRequests', function () {
+      before(() => {
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      const commonBidderRequest = {
+        refererInfo: {
+          referer: 'https://example.com/'
+        }
+      }
+
+      it('should build native request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const expectedNativeAssets = {
+          assets: [
+            {
+              required: 1,
+              id: 3,
+              img: {
+                type: 3,
+                w: 120,
+                h: 100
+              }
+            },
+            {
+              required: 1,
+              id: 0,
+              title: {}
+            },
+            {
+              required: 0,
+              id: 5,
+              data: {
+                type: 1
+              }
+            }
+          ]
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              native: {
+                request: JSON.stringify(expectedNativeAssets)
+              }
+            }
+          ],
+          ext: {
+            prebid: {
+              channel: {
+                name: 'pbjs', version: '$prebid.version$'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      });
+
+      it('should build display request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...displayBidRequestParams,
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              banner: {
+                format: [
+                  {
+                    w: 300,
+                    h: 250
+                  }
+                ]
+              }
+            }
+          ],
+          ext: {
+            prebid: {
+              channel: {
+                name: 'pbjs', version: '$prebid.version$'
+              }
+            }
+          }
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      })
+
+      it('should pass optional parameters in request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        bidRequest.params.tagid = 'test-tag'
+        bidRequest.params.publisher.name = 'test-publisher'
+        bidRequest.params.publisher.domain = 'test-publisher.com'
+        bidRequest.params.bcat = ['bad-category']
+        bidRequest.params.badv = ['bad-advertiser']
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].tagid).to.equal('test-tag')
+        expect(resData.site.publisher.name).to.equal('test-publisher')
+        expect(resData.site.publisher.domain).to.equal('test-publisher.com')
+        expect(resData.bcat).to.deep.equal(['bad-category'])
+        expect(resData.badv).to.deep.equal(['bad-advertiser'])
+      });
+
+      it('should pass bidder timeout', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.tmax).to.equal(500)
+      });
+
+      it('should pass GDPR consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentString',
+          }
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.consent).to.equal('consentString')
+        expect(resData.regs.ext.gdpr).to.equal(1)
+      });
+
+      it('should pass us privacy consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          uspConsent: 'consentString'
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.us_privacy).to.equal('consentString')
+      });
+
+      it('should pass coppa consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        config.setConfig({coppa: true})
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.coppa).to.equal(1)
+
+        config.resetConfig()
+      });
+    })
+
+    describe('interpretResponse', function () {
+      it('should return empty array if no valid bids', function () {
+        const res = spec.interpretResponse({}, [])
+        expect(res).to.be.an('array').that.is.empty
+      });
+
+      it('should interpret native response', function () {
+        const serverResponse = {
+          body: {
+            id: '0a73e68c-9967-4391-b01b-dda2d9fc54e4',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '82822cf5-259c-11eb-8a52-f29e5275aa57',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '{"ver":"1.2","assets":[{"id":3,"required":1,"img":{"url":"http://example.com/img/url","w":120,"h":100}},{"id":0,"required":1,"title":{"text":"Test title"}},{"id":5,"data":{"value":"Test sponsor"}}],"link":{"url":"http://example.com/click/url"},"eventtrackers":[{"event":1,"method":1,"url":"http://example.com/impression"}]}',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3487171',
+                    crid: '28023739',
+                    cat: [
+                      'IAB10-2'
+                    ]
+                  }
+                ],
+                seat: 'acc-5537'
+              }
+            ],
+            bidid: '82822cf5-259c-11eb-8a52-b48e7518c657',
+            cur: 'USD'
+          },
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...nativeBidRequestParams,
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '28023739',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'native',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+            native: {
+              clickTrackers: undefined,
+              clickUrl: 'http://example.com/click/url',
+              image: {
+                url: 'http://example.com/img/url',
+                width: 120,
+                height: 100
+              },
+              title: 'Test title',
+              sponsoredBy: 'Test sponsor',
+              impressionTrackers: [
+                'http://example.com/impression',
+              ]
+            }
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+
+      it('should interpret display response', function () {
+        const serverResponse = {
+          body: {
+            id: '6b2eedc8-8ff5-46ef-adcf-e701b508943e',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: 'd90fe7fa-28d7-11eb-8ce4-462a842a7cf9',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '
ad
',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3865084',
+                    crid: '29998660',
+                    cat: [
+                      'IAB10-2'
+                    ],
+                    w: 300,
+                    h: 250
+                  }
+                ],
+                seat: 'acc-6536'
+              }
+            ],
+            bidid: 'd90fe7fa-28d7-11eb-8ce4-13d94bfa26f9',
+            cur: 'USD'
+          }
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...displayBidRequestParams
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '29998660',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'banner',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            ad: '
ad
',
+            width: 300,
+            height: 250,
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://usersync-url.com';
+    beforeEach(() => {
+      config.setConfig({
+        outbrain: {
+          usersyncUrl: usersyncUrl,
+        }
+      }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should return user sync if pixel enabled with outbrain config', function () {
+      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})
+      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})
+      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([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo`
+      }]);
+      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([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=`
+      }]);
+    });
+
+    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([{
+        type: 'image', url: `${usersyncUrl}?gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
+      }]);
+    });
+  })
+
+  describe('onBidWon', function () {
+    it('should make an ajax call with the original cpm', function () {
+      const bid = {
+        nurl: 'http://example.com/win/${AUCTION_PRICE}',
+        cpm: 2.1,
+        originalCpm: 1.1,
+      }
+      spec.onBidWon(bid)
+      expect(server.requests[0].url).to.equals('http://example.com/win/1.1')
+    });
+  })
+})
diff --git a/test/spec/modules/ozoneBidAdapter_spec.js b/test/spec/modules/ozoneBidAdapter_spec.js
index c8a636efb4c..f9941b41189 100644
--- a/test/spec/modules/ozoneBidAdapter_spec.js
+++ b/test/spec/modules/ozoneBidAdapter_spec.js
@@ -6,12 +6,13 @@ import {getGranularityKeyName, getGranularityObject} from '../../../modules/ozon
 import * as utils from '../../../src/utils.js';
 const OZONEURI = 'https://elb.the-ozone-project.com/openrtb2/auction';
 const BIDDER_CODE = 'ozone';
+
 /*
 
 NOTE - use firefox console to deep copy the objects to use here
 
  */
-var originalPropertyBag = {'lotameWasOverridden': 0, 'pageId': null};
+var originalPropertyBag = {'pageId': null};
 var validBidRequests = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -21,7 +22,21 @@ var validBidRequests = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    sizes: [[300, 250], [300, 600]],
+    transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
+  }
+];
+var validBidRequestsNoCustomData = [
+  {
+    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', placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -36,7 +51,7 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   },
@@ -49,11 +64,13 @@ var validBidRequestsMulti = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c0',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
+// use 'pubcid', 'tdid', 'id5id', 'parrableId', 'idl_env', 'criteoId'
+// see http://prebid.org/dev-docs/modules/userId.html
 var validBidRequestsWithUserIdData = [
   {
     adUnitCode: 'div-gpt-ad-1460505748561-0',
@@ -63,10 +80,76 @@ var validBidRequestsWithUserIdData = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     sizes: [[300, 250], [300, 600]],
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87',
-    userId: {'pubcid': '12345678', 'id5id': 'ID5-someId', 'criteortus': {'ozone': {'userid': 'critId123'}}, 'idl_env': 'liverampId', 'lipb': {'lipbid': 'lipbidId123'}, 'parrableid': 'parrableid123'}
+    userId: {
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'lipb': {'lipbid': 'lipbidId123'},
+      'parrableId': {'eid': '01.5678.parrableid'},
+      'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
+    },
+    userIdAsEids: [
+      {
+        'source': 'pubcid.org',
+        'uids': [
+          {
+            'id': '12345678',
+            'atype': 1
+          }
+        ]
+      },
+      {
+        'source': 'adserver.org',
+        'uids': [{
+          'id': '1111tdid',
+          'atype': 1,
+          'ext': {
+            'rtiPartner': 'TDID'
+          }
+        }]
+      },
+      {
+        'source': 'id5-sync.com',
+        'uids': [{
+          'id': 'ID5-someId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'criteoId',
+        'uids': [{
+          'id': '1111criteoId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'idl_env',
+        'uids': [{
+          'id': 'liverampId',
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'lipb',
+        'uids': [{
+          'id': {'lipbid': 'lipbidId123'},
+          'atype': 1,
+        }]
+      },
+      {
+        'source': 'parrableId',
+        'uids': [{
+          'id': {'eid': '01.5678.parrableid'},
+          'atype': 1,
+        }]
+      }
+    ]
+
   }
 ];
 var validBidRequestsMinimal = [
@@ -91,7 +174,7 @@ var validBidRequestsNoSizes = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
 ];
@@ -105,7 +188,7 @@ var validBidRequestsWithBannerMediaType = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, banner: { format: [{ w: 300, h: 250 }, { w: 300, h: 600 }], h: 250, topframe: 1, w: 300 } } ] },
     mediaTypes: {banner: {sizes: [[300, 250], [300, 600]]}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -119,7 +202,7 @@ var validBidRequestsWithNonBannerMediaTypesAndValidOutstreamVideo = [
     bidder: 'ozone',
     bidderRequestId: '1c1586b27a1b5c8',
     crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-    params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, placementId: '1310000099', siteId: '1234567890', id: 'fea37168-78f1-4a23-a40e-88437a99377e', auctionId: '27dcb421-95c6-4024-a624-3c03816c5f99', imp: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
+    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: [ { id: '2899ec066a91ff8', tagid: 'undefined', secure: 1, video: {skippable: true, playback_method: ['auto_play_sound_off'], targetDiv: 'some-different-div-id-to-my-adunitcode'} } ] },
     mediaTypes: {video: {mimes: ['video/mp4'], 'context': 'outstream', 'sizes': [640, 480], playerSize: [640, 480]}, native: {info: 'dummy data'}},
     transactionId: '2e63c0ed-b10c-4008-aed5-84582cecfe87'
   }
@@ -161,43 +244,21 @@ var validBidRequests1OutstreamVideo2020 = [
           }
         }
       ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
+      'userId': {
+        'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      },
+      'userIdAsEids': [
+        {
+          'source': 'pubcid.org',
+          'uids': [
+            {
+              'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
+              'atype': 1
+            }
+          ]
         }
-      }
-    },
-    'userId': {
-      'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
+      ]
     },
-    'userIdAsEids': [
-      {
-        'source': 'pubcid.org',
-        'uids': [
-          {
-            'id': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56',
-            'atype': 1
-          }
-        ]
-      }
-    ],
     'mediaTypes': {
       'video': {
         'playerSize': [
@@ -272,32 +333,10 @@ var validBidderRequest1OutstreamVideo2020 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'userId': {
-          'id5id': 'ID5-ZHMOpSv9CkZNiNd1oR4zc62AzCgSS73fPjmQ6Od7OA',
+          'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
           'pubcid': '2ada6ae6-aeca-4e07-8922-a99b3aaf8a56'
         },
         'userIdAsEids': [
@@ -370,7 +409,7 @@ var validBidderRequest = {
       bidder: 'ozone',
       bidderRequestId: '1c1586b27a1b5c8',
       crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, 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' } ] },
+      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'
     }],
@@ -399,7 +438,7 @@ var bidderRequestWithFullGdpr = {
       bidder: 'ozone',
       bidderRequestId: '1c1586b27a1b5c8',
       crumbs: {pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'},
-      params: { publisherId: '9876abcd12-3', customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}], lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}}, 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' } ] },
+      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'
     }],
@@ -491,17 +530,6 @@ var bidderRequestWithPartialGdpr = {
       params: {
         publisherId: '9876abcd12-3',
         customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {
-          'Profile': {
-            'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4',
-            'Audiences': {
-              'Audience': [{'id': '99999', 'abbr': 'sports'}, {
-                'id': '88888',
-                'abbr': 'movie'
-              }, {'id': '77777', 'abbr': 'blogger'}]
-            }
-          }
-        },
         placementId: '1310000099',
         siteId: '1234567890',
         id: 'fea37168-78f1-4a23-a40e-88437a99377e',
@@ -982,29 +1010,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1069,29 +1075,7 @@ var multiRequest1 = [
             'pt9': '|k0xw2vqzp33kklb3j5w4|||'
           }
         }
-      ],
-      'lotameData': {
-        'Profile': {
-          'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-          'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-          'Audiences': {
-            'Audience': [
-              {
-                'id': '439847',
-                'abbr': 'all'
-              },
-              {
-                'id': '446197',
-                'abbr': 'Arts, Culture & Literature'
-              },
-              {
-                'id': '446198',
-                'abbr': 'Business'
-              }
-            ]
-          }
-        }
-      }
+      ]
     },
     'mediaTypes': {
       'banner': {
@@ -1165,29 +1149,7 @@ var multiBidderRequest1 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'mediaTypes': {
           'banner': {
@@ -1252,29 +1214,7 @@ var multiBidderRequest1 = {
                 'pt9': '|k0xw2vqzp33kklb3j5w4|||'
               }
             }
-          ],
-          'lotameData': {
-            'Profile': {
-              'tpid': '4e5c21fc7c181c2b1eb3a73d543a27f6',
-              'pid': '3a45fd4872fa01f35c49586d8dcb7c60',
-              'Audiences': {
-                'Audience': [
-                  {
-                    'id': '439847',
-                    'abbr': 'all'
-                  },
-                  {
-                    'id': '446197',
-                    'abbr': 'Arts, Culture & Literature'
-                  },
-                  {
-                    'id': '446198',
-                    'abbr': 'Business'
-                  }
-                ]
-              }
-            }
-          }
+          ]
         },
         'mediaTypes': {
           'banner': {
@@ -1588,8 +1528,7 @@ describe('ozone Adapter', function () {
         placementId: '1310000099',
         publisherId: '9876abcd12-3',
         siteId: '1234567890',
-        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}],
-        lotameData: {'Profile': {'tpid': 'c8ef27a0d4ba771a81159f0d2e792db4', 'Audiences': {'Audience': [{'id': '99999', 'abbr': 'sports'}, {'id': '88888', 'abbr': 'movie'}, {'id': '77777', 'abbr': 'blogger'}]}}},
+        customData: [{'settings': {}, 'targeting': {'gender': 'bart', 'age': 'low'}}]
       },
       siteId: 1234567890
     }
@@ -1883,26 +1822,11 @@ describe('ozone Adapter', function () {
     it('should not validate customParams - this is a renamed key', function () {
       expect(spec.isBidRequestValid(xBadCustomParams)).to.equal(false);
     });
-
-    var xBadLotame = {
-      bidder: BIDDER_CODE,
-      params: {
-        'placementId': '1234567890',
-        'publisherId': '9876abcd12-3',
-        'lotameData': 'this should be an object',
-        siteId: '1234567890'
-      }
-    };
-    it('should not validate lotameData being sent', function () {
-      expect(spec.isBidRequestValid(xBadLotame)).to.equal(false);
-    });
-
     var xBadVideoContext2 = {
       bidder: BIDDER_CODE,
       params: {
         'placementId': '1234567890',
         'publisherId': '9876abcd12-3',
-        'lotameData': {},
         siteId: '1234567890'
       },
       mediaTypes: {
@@ -1937,35 +1861,6 @@ describe('ozone Adapter', function () {
       instreamVid.mediaTypes.video.context = 'instream';
       expect(spec.isBidRequestValid(instreamVid)).to.equal(true);
     });
-    // validate lotame override parameters
-    it('should validate lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
-    it('should validate missing lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate invalid lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123 "this ain\\t right!" eee'};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(false);
-    });
-    it('should validate no lotame override params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {};
-      };
-      expect(spec.isBidRequestValid(validBidReq)).to.equal(true);
-    });
   });
 
   describe('buildRequests', function () {
@@ -1989,19 +1884,27 @@ describe('ozone Adapter', function () {
       const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
+      expect(data.imp[0].ext.ozone.customData).to.be.an('array');
+      expect(request).not.to.have.key('lotameData');
+      expect(request).not.to.have.key('customData');
+    });
+
+    it('adds all parameters inside the ext object only - lightning', function () {
+      let localBidReq = JSON.parse(JSON.stringify(validBidRequests));
+      const request = spec.buildRequests(localBidReq, validBidderRequest.bidderRequest);
+      expect(request.data).to.be.a('string');
+      var data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(request).not.to.have.key('lotameData');
       expect(request).not.to.have.key('customData');
     });
 
     it('ignores ozoneData in & after version 2.1.1', function () {
-      let validBidRequestsWithOzoneData = validBidRequests;
+      let validBidRequestsWithOzoneData = JSON.parse(JSON.stringify(validBidRequests));
       validBidRequestsWithOzoneData[0].params.ozoneData = {'networkID': '3048', 'dfpSiteID': 'd.thesun', 'sectionID': 'homepage', 'path': '/', 'sec_id': 'null', 'sec': 'sec', 'topics': 'null', 'kw': 'null', 'aid': 'null', 'search': 'null', 'article_type': 'null', 'hide_ads': '', 'article_slug': 'null'};
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = spec.buildRequests(validBidRequestsWithOzoneData, validBidderRequest.bidderRequest);
       expect(request.data).to.be.a('string');
       var data = JSON.parse(request.data);
-      expect(data.ext.ozone.lotameData).to.be.an('object');
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.ozoneData).to.be.undefined;
       expect(request).not.to.have.key('lotameData');
@@ -2018,7 +1921,7 @@ describe('ozone Adapter', function () {
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
 
-    it('handles no ozone, lotame or custom data', function () {
+    it('handles no ozone or custom data', function () {
       const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
       expect(request).to.have.all.keys(['bidderRequest', 'data', 'method', 'url']);
     });
@@ -2080,6 +1983,7 @@ describe('ozone Adapter', function () {
       expect(payload.regs.ext.gdpr).to.equal(1);
       expect(payload.user.ext.consent).to.equal(consentString);
     });
+
     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.bidderRequest;
@@ -2116,15 +2020,15 @@ describe('ozone Adapter', function () {
       let bidRequests = validBidRequests;
       // values from http://prebid.org/dev-docs/modules/userId.html#pubcommon-id
       bidRequests[0]['userId'] = {
-        'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': '2222',
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
         'idl_env': '3333',
-        'lipb': {'lipbid': '4444'},
         'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
         'pubcid': '5555',
-        'tdid': '6666'
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
       };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, bidderRequest);
       const payload = JSON.parse(request.data);
       let firstBid = payload.imp[0].ext.ozone;
@@ -2136,66 +2040,209 @@ describe('ozone Adapter', function () {
       let bidRequests = validBidRequests;
       // values from http://prebid.org/dev-docs/modules/userId.html#pubcommon-id
       bidRequests[0]['userId'] = {
-        'criteortus': '1111',
         'digitrustid': {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
-        'id5id': '2222',
+        'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
         'idl_env': '3333',
-        'lipb': {'lipbid': '4444'},
         'parrableid': 'eidVersion.encryptionKeyReference.encryptedValue',
         // 'pubcid': '5555', // remove pubcid from here to emulate the OLD module & cause the failover code to kick in
-        'tdid': '6666'
+        'tdid': '6666',
+        'sharedid': {'id': '01EAJWWNEPN3CYMM5N8M5VXY22', 'third': '01EAJWWNEPN3CYMM5N8M5VXY22'}
       };
+      bidRequests[0]['userIdAsEids'] = validBidRequestsWithUserIdData[0]['userIdAsEids'];
       const request = spec.buildRequests(bidRequests, validBidderRequest.bidderRequest);
       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)', function() {
+    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.bidderRequest);
+      /*
+      'pubcid': '12345678',
+      'tdid': '1111tdid',
+      'id5id': { uid: '1111', ext: { linkType: 2, abTestingControlGroup: false } },
+      'criteoId': '1111criteoId',
+      'idl_env': 'liverampId',
+      'parrableId': {'eid': '01.5678.parrableid'}
+       */
+
       const payload = JSON.parse(request.data);
       expect(payload.user).to.exist;
       expect(payload.user.ext).to.exist;
       expect(payload.user.ext.eids).to.exist;
-      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid');
+      expect(payload.user.ext.eids[0]['source']).to.equal('pubcid.org');
       expect(payload.user.ext.eids[0]['uids'][0]['id']).to.equal('12345678');
-      expect(payload.user.ext.eids[1]['source']).to.equal('pubcommon');
-      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('12345678');
+      expect(payload.user.ext.eids[1]['source']).to.equal('adserver.org');
+      expect(payload.user.ext.eids[1]['uids'][0]['id']).to.equal('1111tdid');
       expect(payload.user.ext.eids[2]['source']).to.equal('id5-sync.com');
       expect(payload.user.ext.eids[2]['uids'][0]['id']).to.equal('ID5-someId');
-      expect(payload.user.ext.eids[3]['source']).to.equal('criteortus');
-      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('critId123');
-      expect(payload.user.ext.eids[4]['source']).to.equal('liveramp.com');
+      expect(payload.user.ext.eids[3]['source']).to.equal('criteoId');
+      expect(payload.user.ext.eids[3]['uids'][0]['id']).to.equal('1111criteoId');
+      expect(payload.user.ext.eids[4]['source']).to.equal('idl_env');
       expect(payload.user.ext.eids[4]['uids'][0]['id']).to.equal('liverampId');
-      expect(payload.user.ext.eids[5]['source']).to.equal('liveintent.com');
-      expect(payload.user.ext.eids[5]['uids'][0]['id']).to.equal('lipbidId123');
-      expect(payload.user.ext.eids[6]['source']).to.equal('parrable.com');
-      expect(payload.user.ext.eids[6]['uids'][0]['id']).to.equal('parrableid123');
+      expect(payload.user.ext.eids[5]['source']).to.equal('lipb');
+      expect(payload.user.ext.eids[5]['uids'][0]['id']['lipbid']).to.equal('lipbidId123');
+      expect(payload.user.ext.eids[6]['source']).to.equal('parrableId');
+      expect(payload.user.ext.eids[6]['uids'][0]['id']['eid']).to.equal('01.5678.parrableid');
+    });
+
+    it('replaces the auction url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeOrigin = 'http://sometestendpoint';
+      config.setConfig({'ozone': {'endpointOverride': {'origin': fakeOrigin}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      expect(request.url).to.equal(fakeOrigin + '/openrtb2/auction');
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.origin).to.equal(fakeOrigin);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+
+    it('replaces the FULL auction url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeurl = 'http://sometestendpoint/myfullurl';
+      config.setConfig({'ozone': {'endpointOverride': {'auctionUrl': fakeurl}}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      expect(request.url).to.equal(fakeurl);
+      expect(request.method).to.equal('POST');
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.origin).to.equal(fakeurl);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+
+    it('replaces the renderer url for a config override', function () {
+      spec.propertyBag.whitelabel = null;
+      let fakeUrl = 'http://renderer.com';
+      config.setConfig({'ozone': {'endpointOverride': {'rendererUrl': fakeUrl}}});
+      const request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest1OutstreamVideo2020.bidderRequest);
+      const result = spec.interpretResponse(getCleanValidVideoResponse(), validBidderRequest1OutstreamVideo2020);
+      const bid = result[0];
+      expect(bid.renderer).to.be.an.instanceOf(Renderer);
+      expect(bid.renderer.url).to.equal(fakeUrl);
+      config.setConfig({'ozone': {'kvpPrefix': null, 'endpointOverride': null}});
+      spec.propertyBag.whitelabel = null;
+    });
+    it('should generate all the adservertargeting keys correctly named', function () {
+      var specMock = utils.deepClone(spec);
+      config.setConfig({'ozone': {'kvpPrefix': 'xx'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0].adserverTargeting).to.have.own.property('xx_appnexus_crid');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_appnexus_crid')).to.equal('98493581');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_pb')).to.equal(0.5);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_adId')).to.equal('2899ec066a91ff8-0-xx-0');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_size')).to.equal('300x600');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_pb_r')).to.equal('0.50');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'xx_bid')).to.equal('true');
+      config.resetConfig();
+    });
+    it('should create a meta object on each bid returned', function () {
+      var specMock = utils.deepClone(spec);
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const result = spec.interpretResponse(validResponse, request);
+      expect(result[0]).to.have.own.property('meta');
+      expect(result[0].meta.advertiserDomains[0]).to.equal('http://prebid.org');
+      config.resetConfig();
+    });
+
+    it('replaces the kvp prefix ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'ozone': {'kvpPrefix': 'test'}});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone).to.haveOwnProperty('test_rw');
+      config.setConfig({'ozone': {'kvpPrefix': null}});
+      spec.propertyBag.whitelabel = null;
     });
 
+    it('handles an alias ', function () {
+      spec.propertyBag.whitelabel = null;
+      config.setConfig({'lmc': {'kvpPrefix': 'test'}});
+      let br = JSON.parse(JSON.stringify(validBidRequests));
+      br[0]['bidder'] = 'lmc';
+      const request = spec.buildRequests(br, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.lmc).to.haveOwnProperty('test_rw');
+      config.setConfig({'lmc': {'kvpPrefix': null}}); // I cant remove the key so set the value to null
+      spec.propertyBag.whitelabel = null;
+    });
     it('should use oztestmode GET value if set', function() {
+      var specMock = utils.deepClone(spec);
       // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
+    it('should pass through GET params if present: ozf, ozpf, ozrp, ozip', function() {
+      var specMock = utils.deepClone(spec);
+      // mock the getGetParametersAsObject function to simulate GET parameters :
+      specMock.getGetParametersAsObject = function() {
+        return {ozf: '1', ozpf: '0', ozrp: '2', ozip: '123'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.ozf).to.equal(1);
+      expect(data.ext.ozone.ozpf).to.equal(0);
+      expect(data.ext.ozone.ozrp).to.equal(2);
+      expect(data.ext.ozone.ozip).to.equal(123);
+    });
+    it('should pass through GET params if present: ozf, ozpf, ozrp, ozip with alternative values', function() {
+      var specMock = utils.deepClone(spec);
+      // mock the getGetParametersAsObject function to simulate GET parameters :
+      specMock.getGetParametersAsObject = function() {
+        return {ozf: 'false', ozpf: 'true', ozrp: 'xyz', ozip: 'hello'};
+      };
+      const request = specMock.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.ext.ozone.ozf).to.equal(0);
+      expect(data.ext.ozone.ozpf).to.equal(1);
+      expect(data.ext.ozone).to.not.haveOwnProperty('ozrp');
+      expect(data.ext.ozone).to.not.haveOwnProperty('ozip');
+    });
     it('should use oztestmode GET value if set, even if there is no customdata in config', function() {
+      var specMock = utils.deepClone(spec);
       // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
-      spec.getGetParametersAsObject = function() {
+      specMock.getGetParametersAsObject = function() {
         return {'oztestmode': 'mytestvalue_123'};
       };
-      const request = spec.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      const request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
       const data = JSON.parse(request.data);
       expect(data.imp[0].ext.ozone.customData).to.be.an('array');
       expect(data.imp[0].ext.ozone.customData[0].targeting.oztestmode).to.equal('mytestvalue_123');
     });
-    var specMock = utils.deepClone(spec);
+    it('should use GET values auction=dev & cookiesync=dev if set', function() {
+      // mock the getGetParametersAsObject function to simulate GET parameters for oztestmode:
+      var specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {};
+      };
+      let request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      let url = request.url;
+      expect(url).to.equal('https://elb.the-ozone-project.com/openrtb2/auction');
+      let cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://elb.the-ozone-project.com/static/load-cookie.html');
+
+      // now mock the response from getGetParametersAsObject & do the request again
+
+      specMock = utils.deepClone(spec);
+      specMock.getGetParametersAsObject = function() {
+        return {'auction': 'dev', 'cookiesync': 'dev'};
+      };
+      request = specMock.buildRequests(validBidRequestsMinimal, validBidderRequest.bidderRequest);
+      url = request.url;
+      expect(url).to.equal('https://test.ozpr.net/openrtb2/auction');
+      cookieUrl = specMock.getCookieSyncUrl();
+      expect(cookieUrl).to.equal('https://test.ozpr.net/static/load-cookie.html');
+    });
     it('should use a valid ozstoredrequest GET value if set to override the placementId values, and set oz_rw if we find it', function() {
       // mock the getGetParametersAsObject function to simulate GET parameters for ozstoredrequest:
+      var specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': '1122334455'}; // 10 digits are valid
       };
@@ -2206,6 +2253,7 @@ describe('ozone Adapter', function () {
     });
     it('should NOT use an invalid ozstoredrequest GET value if set to override the placementId values, and set oz_rw to 0', function() {
       // mock the getGetParametersAsObject function to simulate GET parameters for ozstoredrequest:
+      var specMock = utils.deepClone(spec);
       specMock.getGetParametersAsObject = function() {
         return {'ozstoredrequest': 'BADVAL'}; // 10 digits are valid
       };
@@ -2215,54 +2263,6 @@ describe('ozone Adapter', function () {
       expect(data.imp[0].ext.prebid.storedrequest.id).to.equal('1310000099');
     });
 
-    it('should pick up the value of valid lotame override parameters when there is a lotame object', function () {
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eee'};
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is an empty lotame object', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      nolotameBidReq[0].params.lotameData = {};
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-    });
-    it('should pick up the value of valid lotame override parameters when there is NO "lotame" key at all', function () {
-      let nolotameBidReq = JSON.parse(JSON.stringify(validBidRequests));
-      delete (nolotameBidReq[0].params['lotameData']);
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': '123eeetpid'};
-      };
-      const request = spec.buildRequests(nolotameBidReq, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.lotameData.Profile.Audiences.Audience[0].id).to.equal('123abc');
-      expect(payload.ext.ozone.lotameData.Profile.tpid).to.equal('123eeetpid');
-      expect(payload.ext.ozone.lotameData.Profile.pid).to.equal('pid123');
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(1);
-      spec.propertyBag = originalPropertyBag; // tidy up
-    });
-    // NOTE - only one negative test case;
-    // you can't send invalid lotame params to buildRequests because 'validate' will have rejected them
-    it('should not use lotame override parameters if they dont exist', function () {
-      expect(spec.propertyBag.lotameWasOverridden).to.equal(0);
-      spec.getGetParametersAsObject = function() {
-        return {}; //  no lotame override params
-      };
-      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
-      const payload = JSON.parse(request.data);
-      expect(payload.ext.ozone.oz_lot_rw).to.equal(0);
-    });
-
     it('should pick up the config value of coppa & set it in the request', function () {
       config.setConfig({'coppa': true});
       const request = spec.buildRequests(validBidRequestsNoSizes, validBidderRequest.bidderRequest);
@@ -2320,6 +2320,72 @@ describe('ozone Adapter', function () {
       const payload = JSON.parse(request.data);
       expect(payload.ext.ozone.oz_kvp_rw).to.equal(0);
     });
+    it('should handle ortb2 site data', function () {
+      config.setConfig({'ortb2': {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          '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'
+        }
+      }});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.user.ext).to.not.have.property('gender');
+      config.resetConfig();
+    });
+    it('should add ortb2 site data when there is no customData already created', function () {
+      config.setConfig({'ortb2': {
+        'site': {
+          'name': 'example_ortb2_name',
+          'domain': 'page.example.com',
+          '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'
+        }
+      }});
+      const request = spec.buildRequests(validBidRequestsNoCustomData, validBidderRequest.bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.imp[0].ext.ozone.customData[0].targeting.name).to.equal('example_ortb2_name');
+      expect(payload.imp[0].ext.ozone.customData[0].targeting).to.not.have.property('gender')
+      config.resetConfig();
+    });
+    it('should add ortb2 user data to the user object', function () {
+      config.setConfig({'ortb2': {
+        'user': {
+          'gender': 'who knows these days'
+        }
+      }});
+      const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.gender).to.equal('who knows these days');
+      config.resetConfig();
+    });
+    it('should not override the user.ext.consent string even if this is set in config ortb2', function () {
+      config.setConfig({'ortb2': {
+        'user': {
+          'ext': {
+            'consent': 'this is the consent override that shouldnt work',
+            'consent2': 'this should be set'
+          }
+        }
+      }});
+      const request = spec.buildRequests(validBidRequests, bidderRequestWithFullGdpr.bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.consent2).to.equal('this should be set');
+      expect(payload.user.ext.consent).to.equal('BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
+      config.resetConfig();
+    });
     it('should have openrtb video params', function() {
       let allowed = ['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 request = spec.buildRequests(validBidRequests1OutstreamVideo2020, validBidderRequest.bidderRequest);
@@ -2331,6 +2397,33 @@ describe('ozone Adapter', function () {
       }
       expect(payload.imp[0].video.ext).to.include({'context': 'outstream'});
     });
+    it('should handle standard floor config correctly', function () {
+      config.setConfig({
+        floors: {
+          enforcement: {
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          data: {
+            currency: 'USD',
+            schema: {
+              fields: ['mediaType']
+            },
+            values: {
+              'video': 1.20,
+              'banner': 0.8
+            }
+          }
+        }
+      });
+      let localBidRequest = JSON.parse(JSON.stringify(validBidRequestsWithBannerMediaType));
+      localBidRequest[0].getFloor = function(x) { return {'currency': 'USD', 'floor': 0.8} };
+      const request = spec.buildRequests(localBidRequest, validBidderRequest.bidderRequest);
+      const payload = JSON.parse(request.data);
+      expect(utils.deepAccess(payload, 'imp.0.floor.banner.currency')).to.equal('USD');
+      expect(utils.deepAccess(payload, 'imp.0.floor.banner.floor')).to.equal(0.8);
+      config.resetConfig();
+    });
   });
 
   describe('interpretResponse', function () {
@@ -2356,11 +2449,20 @@ describe('ozone Adapter', function () {
       const result = spec.interpretResponse(validResponse, request);
       expect(result.length).to.equal(1);
     });
+    it('should build bid array with usp/CCPA', function () {
+      let validBR = JSON.parse(JSON.stringify(bidderRequestWithFullGdpr.bidderRequest));
+      validBR.uspConsent = '1YNY';
+      const request = spec.buildRequests(validBidRequests, validBR);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.uspConsent).to.equal('1YNY');
+    });
 
     it('should build bid array with only partial gdpr', function () {
       var validBidderRequestWithGdpr = bidderRequestWithPartialGdpr.bidderRequest;
       validBidderRequestWithGdpr.gdprConsent = {'gdprApplies': 1, 'consentString': 'This is the gdpr consent string'};
       const request = spec.buildRequests(validBidRequests, validBidderRequestWithGdpr);
+      const payload = JSON.parse(request.data);
+      expect(payload.user.ext.consent).to.be.a('string');
     });
 
     it('should fail ok if no seatbid in server response', function () {
@@ -2464,7 +2566,7 @@ describe('ozone Adapter', function () {
       const request = spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
       const result = spec.interpretResponse(validResponse, request);
       expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adv')).to.be.undefined;
-      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adId')).to.equal('2899ec066a91ff8-0-0');
+      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_adId')).to.equal('2899ec066a91ff8-0-oz-0');
       config.resetConfig();
     });
     it('should ignore a whitelist if enhancedAdserverTargeting is false', function () {
@@ -2511,7 +2613,7 @@ describe('ozone Adapter', function () {
       const result = spec.interpretResponse(validres, request);
       expect(result.length).to.equal(1);
       expect(result[0]['price']).to.equal(0.9);
-      expect(result[0]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('2899ec066a91ff8-0-1');
+      expect(result[0]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('2899ec066a91ff8-0-oz-1');
     });
     it('should correctly process an auction with 2 adunits & multiple bidders one of which bids for both adslots', function() {
       let validres = JSON.parse(JSON.stringify(multiResponse1));
@@ -2521,7 +2623,7 @@ describe('ozone Adapter', function () {
       expect(result[1]['price']).to.equal(0.521);
       expect(result[1]['impid']).to.equal('3025f169863b7f8');
       expect(result[1]['id']).to.equal('18552976939844999');
-      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-2');
+      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-oz-2');
       // change the bid values so a different second bid for an impid by the same bidder gets dropped
       validres = JSON.parse(JSON.stringify(multiResponse1));
       validres.body.seatbid[0].bid[1].price = 1.1;
@@ -2531,7 +2633,7 @@ describe('ozone Adapter', function () {
       expect(result[1]['price']).to.equal(1.1);
       expect(result[1]['impid']).to.equal('3025f169863b7f8');
       expect(result[1]['id']).to.equal('18552976939844681');
-      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-1');
+      expect(result[1]['adserverTargeting']['oz_ozappnexus_adId']).to.equal('3025f169863b7f8-0-oz-1');
     });
   });
 
@@ -2554,6 +2656,20 @@ describe('ozone Adapter', function () {
       expect(result[0].url).to.include('gdpr=1');
       expect(result[0].url).to.include('gdpr_consent=BOh7mtYOh7mtYAcABBENCU-AAAAncgPIXJiiAoao0PxBFkgCAC8ACIAAQAQQAAIAAAIAAAhBGAAAQAQAEQgAAAAAAABAAAAAAAAAAAAAAACAAAAAAAACgAAAAABAAAAQAAAAAAA');
     });
+    it('should append ccpa (usp data)', function() {
+      // get the cookie bag populated
+      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1, '1YYN');
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=1YYN');
+    });
+    it('should use "" if no usp is sent to cookieSync', function() {
+      // get the cookie bag populated
+      spec.buildRequests(validBidRequests, validBidderRequest.bidderRequest);
+      const result = spec.getUserSyncs({iframeEnabled: true}, 'good server response', gdpr1);
+      expect(result).to.be.an('array');
+      expect(result[0].url).to.include('usp_consent=&');
+    });
   });
 
   describe('video object utils', function () {
@@ -2609,6 +2725,14 @@ describe('ozone Adapter', function () {
       const result = playerSizeIsNestedArray(obj);
       expect(result).to.be.null;
     });
+    it('should add oz_appnexus_dealid into ads request if dealid exists in the auction response', function () {
+      const request = spec.buildRequests(validBidRequestsMulti, validBidderRequest.bidderRequest);
+      let validres = JSON.parse(JSON.stringify(validResponse2Bids));
+      validres.body.seatbid[0].bid[0].dealid = '1234';
+      const result = spec.interpretResponse(validres, request);
+      expect(utils.deepAccess(result[0].adserverTargeting, 'oz_appnexus_dealid')).to.equal('1234');
+      expect(utils.deepAccess(result[1].adserverTargeting, 'oz_appnexus_dealid', '')).to.equal('');
+    });
   });
 
   describe('default size', function () {
@@ -2660,44 +2784,6 @@ describe('ozone Adapter', function () {
       config.resetConfig();
     });
   });
-  describe('makeLotameObjectFromOverride', function() {
-    it('should update an object with valid lotame data', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'Audiences': {'Audience': [{'id': 'aud1'}]}}}
-      );
-      expect(result.Profile.Audiences.Audience).to.be.an('array');
-      expect(result.Profile.Audiences.Audience[0]).to.be.an('object');
-      expect(result.Profile.Audiences.Audience[0]).to.deep.include({'id': '12345', 'abbr': '12345'});
-    });
-    it('should return the original object if it seems weird', function () {
-      let objLotameOverride = {'oz_lotametpid': '1234', 'oz_lotameid': '12345', 'oz_lotamepid': '123456'};
-      let objLotameOriginal = {'Profile': {'pid': 'originalpid', 'tpid': 'originaltpid', 'somethingstrange': [{'id': 'aud1'}]}};
-      let result = spec.makeLotameObjectFromOverride(
-        objLotameOverride,
-        objLotameOriginal
-      );
-      expect(result).to.equal(objLotameOriginal);
-    });
-  });
-  describe('lotameDataIsValid', function() {
-    it('should allow a valid minimum lotame object', function() {
-      let obj = {'Profile': {'pid': '', 'tpid': '', 'Audiences': {'Audience': []}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should allow a valid lotame object', function() {
-      let obj = {'Profile': {'pid': '12345', 'tpid': '45678', 'Audiences': {'Audience': [{'id': '1234', 'abbr': '567'}, {'id': '9999', 'abbr': '1111'}]}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.true;
-    });
-    it('should disallow a lotame object without an Audience.id', function() {
-      let obj = {'Profile': {'tpid': '', 'pid': '', 'Audiences': {'Audience': [{'abbr': 'marktest'}]}}};
-      let result = spec.isLotameDataValid(obj);
-      expect(result).to.be.false;
-    });
-  });
   describe('getPageId', function() {
     it('should return the same Page ID for multiple calls', function () {
       let result = spec.getPageId();
@@ -2720,24 +2806,6 @@ describe('ozone Adapter', function () {
       expect(result).to.equal('outstream');
     });
   });
-  describe('getLotameOverrideParams', function() {
-    it('should get 3 valid lotame params that exist in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'oz_lotamepid': 'pid123', 'oz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(3);
-    });
-    it('should get only 1 valid lotame param that exists in GET params', function () {
-      // mock the getGetParametersAsObject function to simulate GET parameters for lotame overrides:
-      spec.getGetParametersAsObject = function() {
-        return {'oz_lotameid': '123abc', 'xoz_lotamepid': 'pid123', 'xoz_lotametpid': 'tpid123'};
-      };
-      let result = spec.getLotameOverrideParams();
-      expect(Object.keys(result).length).to.equal(1);
-    });
-  });
   describe('unpackVideoConfigIntoIABformat', function() {
     it('should correctly unpack a usual video config', function () {
       let mediaTypes = {
diff --git a/test/spec/modules/parrableIdSystem_spec.js b/test/spec/modules/parrableIdSystem_spec.js
index fdfd3042561..e77c0a6460f 100644
--- a/test/spec/modules/parrableIdSystem_spec.js
+++ b/test/spec/modules/parrableIdSystem_spec.js
@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import find from 'core-js-pure/features/array/find.js';
 import { config } from 'src/config.js';
 import * as utils from 'src/utils.js';
 import { newStorageManager } from 'src/storageManager.js';
@@ -11,15 +12,17 @@ import { server } from 'test/mocks/xhr.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: {
-    partner: 'parrable_test_partner_123,parrable_test_partner_456'
+    partners: 'parrable_test_partner_123,parrable_test_partner_456'
   }
 };
+const RESPONSE_HEADERS = { 'Content-Type': 'application/json' };
 
 function getConfigMock() {
   return {
@@ -56,6 +59,11 @@ function serializeParrableId(parrableId) {
   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}`;
+  }
   return str;
 }
 
@@ -64,7 +72,7 @@ function writeParrableCookie(parrableId) {
   storage.setCookie(
     P_COOKIE_NAME,
     cookieValue,
-    (new Date(Date.now() + 5000).toUTCString()),
+    (new Date(Date.now() + EXPIRE_COOKIE_TIME).toUTCString()),
     'lax'
   );
 }
@@ -73,114 +81,318 @@ 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() {
-  describe('parrableIdSystem.getId() callback', function() {
-    let logErrorStub;
-    let callbackSpy = sinon.spy();
+  describe('parrableIdSystem.getId()', function() {
+    describe('response callback function', function() {
+      let logErrorStub;
+      let callbackSpy = sinon.spy();
+
+      let decodeBase64UrlSafe = function (encBase64) {
+        const DEC = {
+          '-': '+',
+          '_': '/',
+          '.': '='
+        };
+        return encBase64.replace(/[-_.]/g, (m) => DEC[m]);
+      }
+
+      beforeEach(function() {
+        logErrorStub = sinon.stub(utils, 'logError');
+        callbackSpy.resetHistory();
+        writeParrableCookie({ eid: P_COOKIE_EID });
+      });
 
-    beforeEach(function() {
-      logErrorStub = sinon.stub(utils, 'logError');
-      callbackSpy.resetHistory();
-      writeParrableCookie({ eid: P_COOKIE_EID });
-    });
+      afterEach(function() {
+        removeParrableCookie();
+        logErrorStub.restore();
+      })
 
-    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);
 
-    it('creates xhr to Parrable that synchronizes the ID', function() {
-      let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK.params);
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
 
-      getIdResult.callback(callbackSpy);
+        expect(getIdResult.callback).to.be.a('function');
+        expect(request.url).to.contain('h.parrable.com');
 
-      let request = server.requests[0];
-      let queryParams = utils.parseQS(request.url.split('?')[1]);
-      let data = JSON.parse(atob(queryParams.data));
+        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().referer,
+          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(getIdResult.callback).to.be.a('function');
-      expect(request.url).to.contain('h.parrable.com');
+        expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+          encodeURIComponent('eid:' + P_XHR_EID)
+        );
+      });
 
-      expect(queryParams).to.not.have.property('us_privacy');
-      expect(data).to.deep.equal({
-        eid: P_COOKIE_EID,
-        trackers: P_CONFIG_MOCK.params.partner.split(','),
-        url: getRefererInfo().referer
+      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);
       });
 
-      server.requests[0].respond(200,
-        { 'Content-Type': 'text/plain' },
-        JSON.stringify({ eid: P_XHR_EID })
-      );
+      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);
 
-      expect(callbackSpy.lastCall.lastArg).to.deep.equal({
-        eid: P_XHR_EID
+        getIdResult.callback(callbackSpy);
+
+        let request = server.requests[0];
+        let queryParams = utils.parseQS(request.url.split('?')[1]);
+        expect(queryParams.data).to.equal(urlSafeBase64EncodedData);
+        btoaStub.restore();
       });
 
-      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.params,
-        null,
-        null
-      ).callback(callbackSpy);
-      uspDataHandler.setConsentData(null);
-      expect(server.requests[0].url).to.contain('us_privacy=' + uspString);
-    });
-
-    it('should log an error and continue to callback if ajax request errors', function () {
-      let callBackSpy = sinon.spy();
-      let submoduleCallback = parrableIdSubmodule.getId({partner: '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;
+      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('parrableIdSystem.getId() 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.params);
-      removeParrableCookie();
+    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
+        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();
       });
     });
 
-    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';
+    describe('GDPR consent', () => {
+      let callbackSpy = sinon.spy();
+
+      const config = {
+        params: {
+          partner: 'partner'
+        }
+      };
 
-      storage.setCookie(oldEidCookieName, oldEid);
-      storage.setCookie(oldOptoutCookieName, 'true');
+      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');
+          }
+        })
+      });
+    });
 
-      let getIdResult = parrableIdSubmodule.getId(P_CONFIG_MOCK.params);
-      expect(getIdResult.id).to.deep.equal({
-        eid: oldEid,
-        ibaOptout: true
+    describe('third party cookie support 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 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)
+          );
+        });
       });
 
-      // 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);
+      describe('when getting tpcSupport from cookie', function () {
+        let request;
+        let dateNowStub;
+        const dateNowMock = Date.now();
+        const tpcSupportTtl = dateNowMock;
+        const tpcUntilExpired = 1;
+
+        before(() => {
+          dateNowStub = sinon.stub(Date, 'now').returns(dateNowMock);
+        });
+
+        after(() => {
+          dateNowStub.restore();
+        });
+
+        it('should send tpcSupport in the XHR', function () {
+          writeParrableCookie({
+            eid: P_COOKIE_EID,
+            tpc: true,
+            tpcUntil: (dateNowMock / 1000) + 1
+          });
+          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.tpcSupport).to.equal(true);
+        });
+
+        it('should unset tpcSupport from cookie when tpcUntil reached', function () {
+          writeParrableCookie({
+            eid: P_COOKIE_EID,
+            tpcSupport: true,
+            tpcUntil: tpcUntilExpired
+          });
+          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 })
+          );
+
+          let queryParams = utils.parseQS(request.url.split('?')[1]);
+          let data = JSON.parse(atob(decodeBase64UrlSafe(queryParams.data)));
+
+          expect(data.tpcSupport).to.equal(undefined);
+          expect(storage.getCookie(P_COOKIE_NAME)).to.equal(
+            encodeURIComponent('eid:' + P_XHR_EID + ',tpc:0,tpcUntil:' + Math.floor((dateNowMock / 1000) + tpcSupportTtl))
+          );
+        });
+      });
     });
   });
 
@@ -189,21 +401,224 @@ describe('Parrable ID System', function() {
       let eid = '01.123.4567890';
       let parrableId = {
         eid,
-        ccpaOptout: true
+        ibaOptout: true
       };
 
       expect(parrableIdSubmodule.decode(parrableId)).to.deep.equal({
-        parrableid: eid
+        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;
 
     beforeEach(function() {
       adUnits = [getAdUnitMock()];
-      writeParrableCookie({ eid: P_COOKIE_EID });
+      writeParrableCookie({ eid: P_COOKIE_EID, ibaOptout: true });
       setSubmoduleRegistry([parrableIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock());
@@ -218,12 +633,94 @@ describe('Parrable ID System', function() {
       requestBidsHook(function() {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
-            expect(bid).to.have.deep.nested.property('userId.parrableid');
-            expect(bid.userId.parrableid).to.equal(P_COOKIE_EID);
+            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 });
+
+      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..43c256b9d13
--- /dev/null
+++ b/test/spec/modules/performaxBidAdapter_spec.js
@@ -0,0 +1,274 @@
+import * as utils from 'src/utils.js';
+import { expect } from 'chai';
+import { spec } from 'modules/performaxBidAdapter';
+
+describe('PerformaxAdapter', function () {
+  let bidRequests, bidderRequest;
+  let serverResponse, serverRequest;
+
+  const URL =
+    'https://dale.performax.cz/hb?slotId[]=3,2&client=hellboy:v0.0.1&auctionId=144b5079-8cbf-49a5-aca7-a68b3296cd6c';
+
+  bidRequests = [
+    {
+      adUnitCode: 'postbid_iframe',
+      auctionId: '144b5079-8cbf-49a5-aca7-a68b3296cd6c',
+      bidId: '2a4332f6b2bc74',
+      bidRequestsCount: 1,
+      bidder: 'performax',
+      bidderRequestId: '1c7d8bf204f11e',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 300]],
+        },
+      },
+      params: {
+        slotId: 3,
+      },
+      sizes: [[300, 300]],
+      src: 'client',
+      transactionId: '14969d09-0068-4d5b-a34e-e35091561dee',
+    },
+    {
+      adUnitCode: 'postbid_iframe2',
+      auctionId: '144b5079-8cbf-49a5-aca7-a68b3296cd6c',
+      bidId: '300bb0ac6a156a',
+      bidRequestsCount: 1,
+      bidder: 'performax',
+      bidderRequestId: '1c7d8bf204f11e',
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 300]],
+        },
+      },
+      params: {
+        slotId: 2,
+      },
+      sizes: [[300, 300]],
+      src: 'client',
+      transactionId: '107cbebd-8c36-4456-b28c-91a19ba80151',
+    },
+  ];
+
+  bidderRequest = {
+    auctionId: '144b5079-8cbf-49a5-aca7-a68b3296cd6c',
+    auctionStart: 1594281941845,
+    bidderCode: 'performax',
+    bidderRequestId: '1c7d8bf204f11e',
+    bids: bidRequests,
+    refererInfo: {
+      canonicalUrl: '',
+      numIframes: 0,
+      reachedTop: true,
+      referer: '',
+    },
+    stack: [''],
+    start: 1594281941935,
+    timeout: 3600,
+  };
+
+  serverResponse = {
+    body: [
+      {
+        ad: {
+          code: '$SYS_ID$ $VAR_NAME$ rest of the code',
+          data: {
+            SYS_ID: 1,
+            VAR_NAME: 'name',
+          },
+          format_id: 2,
+          id: 11,
+          size: {
+            width: 300,
+            height: 300,
+          },
+          tag_ids: [],
+          type: 'creative',
+        },
+        cpm: 30,
+        creativeId: 'creative:11',
+        currency: 'CZK',
+        height: 300,
+        meta: {
+          agencyId: 1,
+          mediaType: 'banner',
+        },
+        netRevenue: true,
+        requestId: '2a4332f6b2bc74',
+        ttl: 60,
+        width: 300,
+      },
+      {
+        ad: {
+          code: '',
+          reason: 'Slot 2 does not allow HB requests',
+          type: 'empty',
+        },
+        cpm: 0,
+        creativeId: null,
+        currency: 'CZK',
+        height: null,
+        meta: {
+          agencyId: null,
+          mediaType: 'banner',
+        },
+        netRevenue: true,
+        requestId: '1c7d8bf204f11e',
+        ttl: 60,
+        width: 300,
+      },
+    ],
+  };
+
+  serverRequest = {
+    data: {
+      bidderRequest: bidderRequest,
+      validBidRequests: bidRequests,
+    },
+    method: 'POST',
+    options: {
+      contentType: 'application/json',
+    },
+    url: URL,
+  };
+
+  describe('Bid validations', function () {
+    it('Valid bid', function () {
+      let validBid = {
+          bidder: 'performax',
+          params: {
+            slotId: 2,
+          },
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('Invalid bid: required param is missing', function () {
+      let invalidBid = {
+          bidder: 'performax',
+          params: {
+            invalidParam: 2,
+          },
+        },
+        isValid = spec.isBidRequestValid(invalidBid);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('Build Url', function () {
+    it('Should return url', function () {
+      let url = spec.buildUrl(bidRequests, bidderRequest);
+      expect(url).to.equal(URL);
+    });
+  });
+
+  describe('Build Request', function () {
+    it('Should not modify bidRequests and bidder Requests', function () {
+      let originalBidRequests = utils.deepClone(bidRequests);
+      let originalBidderRequest = utils.deepClone(bidderRequest);
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+
+      expect(bidRequests).to.deep.equal(originalBidRequests);
+      expect(bidderRequest).to.deep.equal(originalBidderRequest);
+    });
+
+    it('Endpoint checking', function () {
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.url).to.equal(URL);
+      expect(request.method).to.equal('POST');
+      expect(request.options).to.deep.equal({
+        contentType: 'application/json',
+      });
+    });
+
+    it('Request params checking', function () {
+      let request = spec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.validBidRequests).to.deep.equal(bidRequests);
+      expect(request.data.bidderRequest).to.deep.equal(bidderRequest);
+    });
+  });
+
+  describe('Build Html', function () {
+    it('Ad with data: should return build html', function () {
+      let validAd = {
+        code: '$SYS_ID$ $VAR_NAME$ rest of the code',
+        data: {
+          SYS_ID: 1,
+          VAR_NAME: 'name',
+        },
+        format_id: 2,
+        id: 11,
+        size: {
+          width: 300,
+          height: 300,
+        },
+        tag_ids: [],
+        type: 'creative',
+      };
+      let html = spec.buildHtml(validAd);
+      expect(html).to.equal('1 name rest of the code');
+    });
+
+    it('Ad with partial data: should return html without data change', function () {
+      let adWithPartialData = {
+        code: '$SYS_ID$ $VAR_NAME$ rest of the code',
+        data: {
+          VAR_NAME: 'name',
+        },
+        format_id: 2,
+        id: 11,
+        size: {
+          width: 300,
+          height: 300,
+        },
+        tag_ids: [],
+        type: 'creative',
+      };
+      let html = spec.buildHtml(adWithPartialData);
+      expect(html).to.equal('$SYS_ID$ name rest of the code');
+    });
+
+    it('Ad without data: should return html without data change', function () {
+      let adWithoutData = {
+        code: '$SYS_ID$ $VAR_NAME$ rest of the code',
+        format_id: 2,
+        id: 11,
+        size: {
+          width: 300,
+          height: 300,
+        },
+        tag_ids: [],
+        type: 'creative',
+      };
+      let html = spec.buildHtml(adWithoutData);
+      expect(html).to.equal('$SYS_ID$ $VAR_NAME$ rest of the code');
+    });
+  });
+
+  describe('Interpret Response', function () {
+    it('Ad without data: should return html without data change', function () {
+      let ads = spec.interpretResponse(serverResponse, serverRequest);
+      expect(ads).to.have.length(1);
+      expect(ads[0]).to.deep.equal({
+        ad: '1 name rest of the code',
+        cpm: 30,
+        creativeId: 'creative:11',
+        currency: 'CZK',
+        height: 300,
+        meta: {
+          agencyId: 1,
+          mediaType: 'banner',
+        },
+        netRevenue: true,
+        requestId: '2a4332f6b2bc74',
+        ttl: 60,
+        width: 300,
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/permutiveRtdProvider_spec.js b/test/spec/modules/permutiveRtdProvider_spec.js
new file mode 100644
index 00000000000..cf1f3861eab
--- /dev/null
+++ b/test/spec/modules/permutiveRtdProvider_spec.js
@@ -0,0 +1,397 @@
+import { permutiveSubmodule, storage, getSegments, initSegments, isAcEnabled, isPermutiveOnPage } from 'modules/permutiveRtdProvider.js'
+import { deepAccess } from '../../../src/utils.js'
+
+describe('permutiveRtdProvider', function () {
+  before(function () {
+    const data = getTargetingData()
+    setLocalStorage(data)
+  })
+
+  after(function () {
+    const data = getTargetingData()
+    removeLocalStorage(data)
+  })
+
+  describe('permutiveSubmodule', function () {
+    it('should initalise and return true', function () {
+      expect(permutiveSubmodule.init()).to.equal(true)
+    })
+  })
+
+  describe('Getting segments', function () {
+    it('should retrieve segments in the expected structure', function () {
+      const data = transformedTargeting()
+      expect(getSegments(250)).to.deep.equal(data)
+    })
+    it('should enforce max segments', function () {
+      const max = 1
+      const segments = getSegments(max)
+
+      for (const key in segments) {
+        expect(segments[key]).to.have.length(max)
+      }
+    })
+  })
+
+  describe('Default segment targeting', function () {
+    it('sets segment targeting for Xandr', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'appnexus') {
+              expect(deepAccess(params, 'keywords.permutive')).to.eql(data.appnexus)
+              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+    it('sets segment targeting for Magnite', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.rubicon)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+    it('sets segment targeting for Ozone', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'ozone') {
+              expect(deepAccess(params, 'customData.0.targeting.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+    it('sets segment targeting for TrustX', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'trustx') {
+              expect(deepAccess(params, 'keywords.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Custom segment targeting', function () {
+    it('sets custom segment targeting for Magnite', function () {
+      const data = transformedTargeting()
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      config.params.overwrites = {
+        rubicon: function (bid, data, acEnabled, utils, defaultFn) {
+          if (defaultFn) {
+            bid = defaultFn(bid, data, acEnabled)
+          }
+          if (data.gam && data.gam.length) {
+            utils.deepSetValue(bid, 'params.visitor.permutive', data.gam)
+          }
+        }
+      }
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.permutive')).to.eql(data.gam)
+              expect(deepAccess(params, 'visitor.p_standard')).to.eql(data.ac)
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Existing key-value targeting', function () {
+    it('doesn\'t overwrite existing key-values for Xandr', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'appnexus') {
+              expect(deepAccess(params, 'keywords.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for Magnite', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'rubicon') {
+              expect(deepAccess(params, 'visitor.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for Ozone', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'ozone') {
+              expect(deepAccess(params, 'customData.0.targeting.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+    it('doesn\'t overwrite existing key-values for TrustX', function () {
+      const adUnits = getAdUnits()
+      const config = getConfig()
+
+      initSegments({ adUnits }, callback, config)
+
+      function callback () {
+        adUnits.forEach(adUnit => {
+          adUnit.bids.forEach(bid => {
+            const { bidder, params } = bid
+
+            if (bidder === 'trustx') {
+              expect(deepAccess(params, 'keywords.test_kv')).to.eql(['true'])
+            }
+          })
+        })
+      }
+    })
+  })
+
+  describe('Permutive on page', function () {
+    it('checks if Permutive is on page', function () {
+      expect(isPermutiveOnPage()).to.equal(false)
+    })
+  })
+
+  describe('AC is enabled', function () {
+    it('checks if AC is enabled for Xandr', function () {
+      expect(isAcEnabled({ params: { acBidders: ['appnexus'] } }, 'appnexus')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkvb'] } }, 'appnexus')).to.equal(false)
+    })
+    it('checks if AC is enabled for Magnite', function () {
+      expect(isAcEnabled({ params: { acBidders: ['rubicon'] } }, 'rubicon')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdbfkb'] } }, 'rubicon')).to.equal(false)
+    })
+    it('checks if AC is enabled for Ozone', function () {
+      expect(isAcEnabled({ params: { acBidders: ['ozone'] } }, 'ozone')).to.equal(true)
+      expect(isAcEnabled({ params: { acBidders: ['kjdvb'] } }, 'ozone')).to.equal(false)
+    })
+  })
+})
+
+function setLocalStorage (data) {
+  for (const key in data) {
+    storage.setDataInLocalStorage(key, JSON.stringify(data[key]))
+  }
+}
+
+function removeLocalStorage (data) {
+  for (const key in data) {
+    storage.removeDataFromLocalStorage(key)
+  }
+}
+
+function getConfig () {
+  return {
+    name: 'permutive',
+    waitForIt: true,
+    params: {
+      acBidders: ['appnexus', 'rubicon', 'ozone', 'trustx'],
+      maxSegs: 500
+    }
+  }
+}
+
+function transformedTargeting () {
+  const data = getTargetingData()
+
+  return {
+    ac: [...data._pcrprs, ...data._ppam, ...data._psegs.filter(seg => seg >= 1000000)],
+    appnexus: data._papns,
+    rubicon: data._prubicons,
+    gam: data._pdfps
+  }
+}
+
+function getTargetingData () {
+  return {
+    _pdfps: ['gam1', 'gam2'],
+    _prubicons: ['rubicon1', 'rubicon2'],
+    _papns: ['appnexus1', 'appnexus2'],
+    _psegs: ['1234', '1000001', '1000002'],
+    _ppam: ['ppam1', 'ppam2'],
+    _pcrprs: ['pcrprs1', 'pcrprs2']
+  }
+}
+
+function getAdUnits () {
+  const div_1_sizes = [
+    [300, 250],
+    [300, 600]
+  ]
+  const div_2_sizes = [
+    [728, 90],
+    [970, 250]
+  ]
+  return [
+    {
+      code: '/19968336/header-bid-tag-0',
+      mediaTypes: {
+        banner: {
+          sizes: div_1_sizes
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'rubicon',
+          params: {
+            accountId: '9840',
+            siteId: '123564',
+            zoneId: '583584',
+            inventory: {
+              area: ['home']
+            },
+            visitor: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500',
+            customData: [
+              {
+                settings: {},
+                targeting: {
+                  test_kv: ['true']
+                }
+              }
+            ],
+            ozoneData: {}
+          }
+        },
+        {
+          bidder: 'trustx',
+          params: {
+            uid: 45,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        }
+      ]
+    },
+    {
+      code: '/19968336/header-bid-tag-1',
+      mediaTypes: {
+        banner: {
+          sizes: div_2_sizes
+        }
+      },
+      bids: [
+        {
+          bidder: 'appnexus',
+          params: {
+            placementId: 13144370,
+            keywords: {
+              test_kv: ['true']
+            }
+          }
+        },
+        {
+          bidder: 'ozone',
+          params: {
+            publisherId: 'OZONEGMG0001',
+            siteId: '4204204209',
+            placementId: '0420420500',
+            customData: [
+              {
+                targeting: {
+                  test_kv: ['true']
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index d99ec9d421d..9ced2b4620d 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -15,7 +15,10 @@ let CONFIG = {
   bidders: ['appnexus'],
   timeout: 1000,
   cacheMarkup: 2,
-  endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+  endpoint: {
+    p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
+    noP1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+  }
 };
 
 const REQUEST = {
@@ -26,6 +29,7 @@ const REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '0.30.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -80,6 +84,7 @@ const VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -110,6 +115,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
   'secure': 0,
   'url': '',
   'prebid_version': '1.4.0-pre',
+  's2sConfig': CONFIG,
   'ad_units': [
     {
       'code': 'div-gpt-ad-1460505748561-0',
@@ -162,7 +168,7 @@ const OUTSTREAM_VIDEO_REQUEST = {
         }
       }
     }
-  ]
+  ],
 };
 
 let BID_REQUESTS;
@@ -265,6 +271,9 @@ const RESPONSE_OPENRTB = {
               'type': 'banner',
               'event': {
                 'win': 'http://wurl.org?id=333'
+              },
+              'meta': {
+                'dchain': { 'ver': '1.0', 'complete': 0, 'nodes': [ { 'asi': 'magnite.com', 'bsid': '123456789', } ] }
               }
             },
             'bidder': {
@@ -498,10 +507,8 @@ describe('S2S Adapter', function () {
     });
 
     it('should not add outstrean without renderer', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+      config.setConfig({ s2sConfig: CONFIG });
 
-      config.setConfig({ s2sConfig: ortb2Config });
       adapter.callBids(OUTSTREAM_VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
@@ -509,6 +516,42 @@ describe('S2S Adapter', function () {
       expect(requestBid.imp[0].video).to.not.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';
+
+      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);
+      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;
+      expect(requestBid.imp[0].video.context).to.be.undefined;
+    });
+
     it('exists and is a function', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
@@ -519,15 +562,39 @@ describe('S2S Adapter', function () {
       });
 
       it('adds gdpr consent information to ortb2 request depending on presence of module', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
 
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: ortb2Config };
+        let gdprBidRequest = utils.deepClone(BID_REQUESTS);
+        gdprBidRequest[0].gdprConsent = {
+          consentString: 'abc123',
+          gdprApplies: true
+        };
+
+        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        let requestBid = JSON.parse(server.requests[0].requestBody);
+
+        expect(requestBid.regs.ext.gdpr).is.equal(1);
+        expect(requestBid.user.ext.consent).is.equal('abc123');
+
+        config.resetConfig();
+        config.setConfig({ s2sConfig: CONFIG });
+
+        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        requestBid = JSON.parse(server.requests[1].requestBody);
+
+        expect(requestBid.regs).to.not.exist;
+        expect(requestBid.user).to.not.exist;
+      });
+
+      it('adds additional consent information to ortb2 request depending on presence of module', function () {
+        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: CONFIG };
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
         gdprBidRequest[0].gdprConsent = {
           consentString: 'abc123',
+          addtlConsent: 'superduperconsent',
           gdprApplies: true
         };
 
@@ -536,6 +603,7 @@ describe('S2S Adapter', function () {
 
         expect(requestBid.regs.ext.gdpr).is.equal(1);
         expect(requestBid.user.ext.consent).is.equal('abc123');
+        expect(requestBid.user.ext.ConsentedProvidersSettings.consented_providers).is.equal('superduperconsent');
 
         config.resetConfig();
         config.setConfig({ s2sConfig: CONFIG });
@@ -549,7 +617,7 @@ describe('S2S Adapter', function () {
 
       it('check gdpr info gets added into cookie_sync request: have consent data', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
@@ -561,7 +629,10 @@ describe('S2S Adapter', function () {
           gdprApplies: true
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(1);
@@ -572,27 +643,30 @@ describe('S2S Adapter', function () {
 
       it('check gdpr info gets added into cookie_sync request: have consent data but gdprApplies is false', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
 
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
         gdprBidRequest[0].gdprConsent = {
           consentString: 'xyz789abcc',
           gdprApplies: false
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.gdpr).is.equal(0);
         expect(requestBid.gdpr_consent).is.undefined;
       });
 
-      it('checks gdpr info gets added to cookie_sync request: consent data unknown', function () {
+      it('checks gdpr info gets added to cookie_sync request: applies is false', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
 
         let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
         config.setConfig(consentConfig);
@@ -600,13 +674,16 @@ describe('S2S Adapter', function () {
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
         gdprBidRequest[0].gdprConsent = {
           consentString: undefined,
-          gdprApplies: undefined
+          gdprApplies: false
         };
 
-        adapter.callBids(REQUEST, gdprBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
-        expect(requestBid.gdpr).is.undefined;
+        expect(requestBid.gdpr).is.equal(0);
         expect(requestBid.gdpr_consent).is.undefined;
       });
     });
@@ -617,9 +694,7 @@ describe('S2S Adapter', function () {
       });
 
       it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+        config.setConfig({ s2sConfig: CONFIG });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1NYN';
@@ -640,13 +715,16 @@ describe('S2S Adapter', function () {
 
       it('is added to cookie_sync request when in bidRequest', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
         config.setConfig({ s2sConfig: cookieSyncConfig });
 
         let uspBidRequest = utils.deepClone(BID_REQUESTS);
         uspBidRequest[0].uspConsent = '1YNN';
 
-        adapter.callBids(REQUEST, uspBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig;
+
+        adapter.callBids(s2sBidRequest, uspBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
@@ -661,9 +739,7 @@ describe('S2S Adapter', function () {
       });
 
       it('is added to ortb2 request when in bidRequest', function () {
-        let ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        config.setConfig({ s2sConfig: ortb2Config });
+        config.setConfig({ s2sConfig: CONFIG });
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1NYN';
@@ -691,7 +767,7 @@ describe('S2S Adapter', function () {
 
       it('is added to cookie_sync request when in bidRequest', function () {
         let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
         config.setConfig({ s2sConfig: cookieSyncConfig });
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
@@ -701,7 +777,10 @@ describe('S2S Adapter', function () {
           gdprApplies: true
         };
 
-        adapter.callBids(REQUEST, consentBidRequest, addBidResponse, done, ajax);
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = cookieSyncConfig
+
+        adapter.callBids(s2sBidRequest, consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.us_privacy).is.equal('1YNN');
@@ -712,40 +791,6 @@ describe('S2S Adapter', function () {
       });
     });
 
-    it('adds digitrust id is present and user is not optout', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-      let consentConfig = { s2sConfig: ortb2Config };
-      config.setConfig(consentConfig);
-
-      let digiTrustObj = {
-        privacy: {
-          optout: false
-        },
-        id: 'testId',
-        keyv: 'testKeyV'
-      };
-
-      let digiTrustBidRequest = utils.deepClone(BID_REQUESTS);
-      digiTrustBidRequest[0].bids[0].userId = { digitrustid: { data: digiTrustObj } };
-
-      adapter.callBids(REQUEST, digiTrustBidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.user.ext.digitrust).to.deep.equal({
-        id: digiTrustObj.id,
-        keyv: digiTrustObj.keyv
-      });
-
-      digiTrustObj.privacy.optout = true;
-
-      adapter.callBids(REQUEST, digiTrustBidRequest, addBidResponse, done, ajax);
-      requestBid = JSON.parse(server.requests[1].requestBody);
-
-      expect(requestBid.user && request.user.ext && requestBid.user.ext.digitrust).to.not.exist;
-    });
-
     it('adds device and app objects to request', function () {
       const _config = {
         s2sConfig: CONFIG,
@@ -769,7 +814,9 @@ describe('S2S Adapter', function () {
 
     it('adds device and app objects to request for OpenRTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
 
       const _config = {
@@ -793,11 +840,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds debugging value from storedAuctionResponse to OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
         app: { bundle: 'com.test.app' }
       };
@@ -813,13 +857,104 @@ describe('S2S Adapter', function () {
       expect(requestBid.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
     });
 
-    it('adds device.w and device.h even if the config lacks a device object', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+    describe('price floors module', function () {
+      function runTest(expectedFloor, expectedCur) {
+        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+        const requestBid = JSON.parse(server.requests[requestCount].requestBody);
+        expect(requestBid.imp[0].bidfloor).to.equal(expectedFloor);
+        expect(requestBid.imp[0].bidfloorcur).to.equal(expectedCur);
+        requestCount += 1;
+      }
+
+      let getFloorResponse, requestCount;
+      beforeEach(function () {
+        getFloorResponse = {};
+        requestCount = 0;
+      });
+
+      it('should NOT pass bidfloor and bidfloorcur when getFloor not present or returns invalid response', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
+
+        config.setConfig(_config);
+
+        // if no get floor
+        runTest(undefined, undefined);
+
+        // if getFloor returns empty object
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        runTest(undefined, undefined);
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+          })
+        ).to.be.true;
+
+        // if getFloor does not return number
+        getFloorResponse = {currency: 'EUR', floor: 'not a number'};
+        runTest(undefined, undefined);
+
+        // if getFloor does not return currency
+        getFloorResponse = {floor: 1.1};
+        runTest(undefined, undefined);
+      });
+
+      it('should correctly pass bidfloor and bidfloorcur', function () {
+        const _config = {
+          s2sConfig: CONFIG,
+        };
+
+        config.setConfig(_config);
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = {currency: 'USD', floor: '1.23'};
+        runTest(1.23, 'USD');
+        // make sure getFloor was called
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'USD',
+          })
+        ).to.be.true;
+
+        // returns non USD and number floor
+        getFloorResponse = {currency: 'EUR', floor: 0.85};
+        runTest(0.85, 'EUR');
+      });
+
+      it('should correctly pass adServerCurrency when set to getFloor not default', function () {
+        config.setConfig({
+          s2sConfig: CONFIG,
+          currency: { adServerCurrency: 'JPY' },
+        });
+
+        // we have to start requestCount at 1 because a conversion rates fetch occurs when adServerCur is not USD!
+        requestCount = 1;
+
+        BID_REQUESTS[0].bids[0].getFloor = () => getFloorResponse;
+        sinon.spy(BID_REQUESTS[0].bids[0], 'getFloor');
+
+        // returns USD and string floor
+        getFloorResponse = {currency: 'JPY', floor: 97.2};
+        runTest(97.2, 'JPY');
+        // make sure getFloor was called with JPY
+        expect(
+          BID_REQUESTS[0].bids[0].getFloor.calledWith({
+            currency: 'JPY',
+          })
+        ).to.be.true;
       });
+    });
 
+    it('adds device.w and device.h even if the config lacks a device object', function () {
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         app: { bundle: 'com.test.app' },
       };
 
@@ -837,12 +972,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds native request for OpenRTB', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-
       const _config = {
-        s2sConfig: s2sConfig
+        s2sConfig: CONFIG
       };
 
       config.setConfig(_config);
@@ -896,12 +1027,8 @@ describe('S2S Adapter', function () {
     });
 
     it('adds site if app is not present', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-
       const _config = {
-        s2sConfig: s2sConfig,
+        s2sConfig: CONFIG,
         site: {
           publisher: {
             id: '1234',
@@ -936,14 +1063,73 @@ describe('S2S Adapter', function () {
     });
 
     it('adds appnexus aliases to request', function () {
+      config.setConfig({ s2sConfig: CONFIG });
+
+      const aliasBidder = {
+        bidder: 'brealtime',
+        params: { placementId: '123456' }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          brealtime: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        }
+      });
+    });
+
+    it('adds dynamic aliases to request', function () {
+      config.setConfig({ s2sConfig: CONFIG });
+
+      const alias = 'foobar';
+      const aliasBidder = {
+        bidder: alias,
+        params: { placementId: '123456' }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      // TODO: stub this
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias);
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+      expect(requestBid.ext).to.haveOwnProperty('prebid');
+      expect(requestBid.ext.prebid).to.deep.include({
+        aliases: {
+          [alias]: 'appnexus'
+        },
+        auctiontimestamp: 1510852447530,
+        targeting: {
+          includebidderkeys: false,
+          includewinners: true
+        }
+      });
+    });
+
+    it('skips pbs alias when skipPbsAliasing is enabled in adapter', function() {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
       const aliasBidder = {
-        bidder: 'brealtime',
-        params: { placementId: '123456' }
+        bidder: 'mediafuse',
+        params: { aid: 123 }
       };
 
       const request = utils.deepClone(REQUEST);
@@ -955,44 +1141,109 @@ describe('S2S Adapter', function () {
 
       expect(requestBid.ext).to.deep.equal({
         prebid: {
-          aliases: {
-            brealtime: 'appnexus'
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
           },
+          channel: {
+            name: 'pbjs',
+            version: 'v$prebid.version$'
+          }
+        }
+      });
+    });
+
+    it('skips dynamic aliases to request when skipPbsAliasing enabled', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
+      });
+      config.setConfig({ s2sConfig: s2sConfig });
+
+      const alias = 'foobar_1';
+      const aliasBidder = {
+        bidder: alias,
+        params: { aid: 123456 }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      // TODO: stub this
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias, { skipPbsAliasing: true });
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
           auctiontimestamp: 1510852447530,
           targeting: {
             includebidderkeys: false,
             includewinners: true
+          },
+          channel: {
+            name: 'pbjs',
+            version: 'v$prebid.version$'
           }
         }
       });
     });
 
-    it('adds dynamic aliases to request', function () {
+    it('skips pbs alias when skipPbsAliasing is enabled in adapter', function() {
       const s2sConfig = Object.assign({}, CONFIG, {
         endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
-      const alias = 'foobar';
+      const aliasBidder = {
+        bidder: 'mediafuse',
+        params: { aid: 123 }
+      };
+
+      const request = utils.deepClone(REQUEST);
+      request.ad_units[0].bids = [aliasBidder];
+
+      adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.ext).to.deep.equal({
+        prebid: {
+          auctiontimestamp: 1510852447530,
+          targeting: {
+            includebidderkeys: false,
+            includewinners: true
+          }
+        }
+      });
+    });
+
+    it('skips dynamic aliases to request when skipPbsAliasing enabled', function () {
+      const s2sConfig = Object.assign({}, CONFIG, {
+        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+      });
+      config.setConfig({ s2sConfig: s2sConfig });
+
+      const alias = 'foobar_1';
       const aliasBidder = {
         bidder: alias,
-        params: { placementId: '123456' }
+        params: { aid: 123456 }
       };
 
       const request = utils.deepClone(REQUEST);
       request.ad_units[0].bids = [aliasBidder];
 
       // TODO: stub this
-      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias);
+      $$PREBID_GLOBAL$$.aliasBidder('appnexus', alias, { skipPbsAliasing: true });
       adapter.callBids(request, BID_REQUESTS, addBidResponse, done, ajax);
 
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext).to.deep.equal({
         prebid: {
-          aliases: {
-            [alias]: 'appnexus'
-          },
           auctiontimestamp: 1510852447530,
           targeting: {
             includebidderkeys: false,
@@ -1004,7 +1255,9 @@ describe('S2S Adapter', function () {
 
     it('converts appnexus params to expected format for PBS', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       });
       config.setConfig({ s2sConfig: s2sConfig });
 
@@ -1033,13 +1286,16 @@ describe('S2S Adapter', function () {
 
     it('adds limit to the cookie_sync request if userSyncLimit is greater than 0', function () {
       let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
       cookieSyncConfig.userSyncLimit = 1;
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1049,11 +1305,14 @@ describe('S2S Adapter', function () {
 
     it('does not add limit to cooke_sync request if userSyncLimit is missing or 0', function () {
       let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = cookieSyncConfig;
+
       let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
       let requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1064,8 +1323,11 @@ describe('S2S Adapter', function () {
       config.resetConfig();
       config.setConfig({ s2sConfig: cookieSyncConfig });
 
+      const s2sBidRequest2 = utils.deepClone(REQUEST);
+      s2sBidRequest2.s2sConfig = cookieSyncConfig;
+
       bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(REQUEST, bidRequest, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest2, bidRequest, addBidResponse, done, ajax);
       requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
@@ -1075,7 +1337,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig adapterOptions to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1088,8 +1349,11 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
       expect(requestBid.imp[0].ext.appnexus).to.haveOwnProperty('key');
       expect(requestBid.imp[0].ext.appnexus.key).to.be.equal('value')
@@ -1097,7 +1361,6 @@ describe('S2S Adapter', function () {
 
     describe('config site value is added to the oRTB request', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1109,6 +1372,9 @@ describe('S2S Adapter', function () {
         ip: '75.97.0.47'
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       it('and overrides publisher and page', function () {
         config.setConfig({
           s2sConfig: s2sConfig,
@@ -1119,7 +1385,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const requestBid = JSON.parse(server.requests[0].requestBody);
 
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1137,7 +1404,8 @@ describe('S2S Adapter', function () {
           },
           device: device
         });
-        adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+        adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
 
         const requestBid = JSON.parse(server.requests[0].requestBody);
         expect(requestBid.site).to.exist.and.to.be.a('object');
@@ -1149,10 +1417,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when userId is defined on bids, it\'s properties should be copied to user.ext.tpid properties', function () {
-      let ortb2Config = utils.deepClone(CONFIG);
-      ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-
-      let consentConfig = { s2sConfig: ortb2Config };
+      let consentConfig = { s2sConfig: CONFIG };
       config.setConfig(consentConfig);
 
       let userIdBidRequest = utils.deepClone(BID_REQUESTS);
@@ -1160,12 +1425,18 @@ describe('S2S Adapter', function () {
         criteoId: '44VmRDeUE3ZGJ5MzRkRVJHU3BIUlJ6TlFPQUFU',
         tdid: 'abc123',
         pubcid: '1234',
-        parrableid: '01.1563917337.test-eid',
+        parrableId: { eid: '01.1563917337.test-eid' },
         lipb: {
           lipbid: 'li-xyz',
           segments: ['segA', 'segB']
         },
-        idl_env: '0000-1111-2222-3333'
+        idl_env: '0000-1111-2222-3333',
+        id5id: {
+          uid: '11111',
+          ext: {
+            linkType: 'some-link-type'
+          }
+        }
       };
       userIdBidRequest[0].bids[0].userIdAsEids = createEidsArray(userIdBidRequest[0].bids[0].userId);
 
@@ -1186,16 +1457,16 @@ describe('S2S Adapter', function () {
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments.length).is.equal(2);
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments[0]).is.equal('segA');
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveintent.com')[0].ext.segments[1]).is.equal('segB');
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')).is.not.empty;
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].id).is.equal('11111');
+      expect(requestBid.user.ext.eids.filter(eid => eid.source === 'id5-sync.com')[0].uids[0].ext.linkType).is.equal('some-link-type');
       // LiveRamp should exist
       expect(requestBid.user.ext.eids.filter(eid => eid.source === 'liveramp.com')[0].uids[0].id).is.equal('0000-1111-2222-3333');
     });
 
     it('when config \'currency.adServerCurrency\' value is an array: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
       config.setConfig({
         currency: { adServerCurrency: ['USD', 'GB', 'UK', 'AU'] },
-        s2sConfig: s2sConfig
       });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1206,11 +1477,8 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' value is a string: ORTB has property \'cur\' value set to a single item array', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
       config.setConfig({
         currency: { adServerCurrency: 'NZ' },
-        s2sConfig: s2sConfig
       });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1221,9 +1489,7 @@ describe('S2S Adapter', function () {
     });
 
     it('when config \'currency.adServerCurrency\' is unset: ORTB should not define a \'cur\' property', function () {
-      let s2sConfig = utils.deepClone(CONFIG);
-      s2sConfig.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-      config.setConfig({ s2sConfig: s2sConfig });
+      config.setConfig({ s2sConfig: CONFIG });
 
       const bidRequests = utils.deepClone(BID_REQUESTS);
       adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
@@ -1234,7 +1500,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includebidderkeys: false for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1248,7 +1513,11 @@ describe('S2S Adapter', function () {
       };
 
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includebidderkeys');
@@ -1257,7 +1526,6 @@ describe('S2S Adapter', function () {
 
     it('always add ext.prebid.targeting.includewinners: true for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         adapterOptions: {
           appnexus: {
             key: 'value'
@@ -1269,9 +1537,12 @@ describe('S2S Adapter', function () {
         device: { ifa: '6D92078A-8246-4BA4-AE5B-76104861E7DC' },
         app: { bundle: 'com.test.app' },
       };
-
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid.ext.prebid.targeting).to.haveOwnProperty('includewinners');
@@ -1280,7 +1551,6 @@ describe('S2S Adapter', function () {
 
     it('adds s2sConfig video.ext.prebid to request for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           foo: 'bar'
         }
@@ -1291,13 +1561,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         foo: 'bar',
         targeting: {
@@ -1309,7 +1582,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           targeting: {
             includewinners: false,
@@ -1323,13 +1595,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         targeting: {
           includewinners: false,
@@ -1340,7 +1615,6 @@ describe('S2S Adapter', function () {
 
     it('overrides request.ext.prebid properties using s2sConfig video.ext.prebid values for ORTB', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         extPrebid: {
           cache: {
             vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
@@ -1357,13 +1631,16 @@ describe('S2S Adapter', function () {
         app: { bundle: 'com.test.app' },
       };
 
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
       config.setConfig(_config);
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       const requestBid = JSON.parse(server.requests[0].requestBody);
 
       expect(requestBid).to.haveOwnProperty('ext');
       expect(requestBid.ext).to.haveOwnProperty('prebid');
-      expect(requestBid.ext.prebid).to.deep.equal({
+      expect(requestBid.ext.prebid).to.deep.include({
         auctiontimestamp: 1510852447530,
         cache: {
           vastxml: 'vastxml-set-though-extPrebid.cache.vastXml'
@@ -1400,6 +1677,52 @@ describe('S2S Adapter', function () {
       expect(parsedRequestBody.source.ext.schain).to.deep.equal(schainObject);
     });
 
+    it('passes multibid array in request', function () {
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+      const multibid = [{
+        bidder: 'bidderA',
+        maxBids: 2
+      }, {
+        bidder: 'bidderB',
+        maxBids: 2
+      }];
+      const expected = [{
+        bidder: 'bidderA',
+        maxbids: 2
+      }, {
+        bidder: 'bidderB',
+        maxbids: 2
+      }];
+
+      config.setConfig({multibid: multibid});
+
+      adapter.callBids(REQUEST, bidRequests, addBidResponse, done, ajax);
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+      expect(parsedRequestBody.ext.prebid.multibid).to.deep.equal(expected);
+    });
+
+    it('sets and passes pbjs version in request if channel does not exist in s2sConfig', () => {
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+      expect(parsedRequestBody.ext.prebid.channel).to.deep.equal({name: 'pbjs', version: 'v$prebid.version$'});
+    });
+
+    it('does not set pbjs version in request if channel does exist in s2sConfig', () => {
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      const bidRequests = utils.deepClone(BID_REQUESTS);
+
+      utils.deepSetValue(s2sBidRequest, 's2sConfig.extPrebid.channel', {test: 1});
+
+      adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
+
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+      expect(parsedRequestBody.ext.prebid.channel).to.deep.equal({test: 1});
+    });
+
     it('passes first party data in request', () => {
       const s2sBidRequest = utils.deepClone(REQUEST);
       const bidRequests = utils.deepClone(BID_REQUESTS);
@@ -1432,23 +1755,114 @@ describe('S2S Adapter', function () {
 
       const expected = allowedBidders.map(bidder => ({
         bidders: [ bidder ],
-        config: { fpd: { site: context, user } }
+        config: {
+          ortb2: {
+            site: {
+              content: { userrating: 4 },
+              ext: {
+                data: {
+                  pageType: 'article',
+                  category: 'tools'
+                }
+              }
+            },
+            user: {
+              yob: '1984',
+              geo: { country: 'ca' },
+              ext: {
+                data: {
+                  registered: true,
+                  interests: ['cars']
+                }
+              }
+            }
+          }
+        }
       }));
+      const commonContextExpected = utils.mergeDeep({'page': 'http://mytestpage.com', 'publisher': {'id': '1'}}, commonContext);
 
       config.setConfig({ fpd: { context: commonContext, user: commonUser } });
       config.setBidderConfig({ bidders: allowedBidders, config: { fpd: { context, user } } });
       adapter.callBids(s2sBidRequest, bidRequests, addBidResponse, done, ajax);
       const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
       expect(parsedRequestBody.ext.prebid.bidderconfig).to.deep.equal(expected);
-      expect(parsedRequestBody.site.ext.data).to.deep.equal(commonContext);
-      expect(parsedRequestBody.user.ext.data).to.deep.equal(commonUser);
+      expect(parsedRequestBody.site).to.deep.equal(commonContextExpected);
+      expect(parsedRequestBody.user).to.deep.equal(commonUser);
     });
 
     describe('pbAdSlot config', function () {
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {};
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should not send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" is empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: ''
+            }
+          }
+        };
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.pbadslot');
+      });
+
+      it('should send \"imp.ext.data.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a non-empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
+        config.setConfig(consentConfig);
+        const bidRequest = utils.deepClone(REQUEST);
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              pbadslot: '/a/b/c'
+            }
+          }
+        };
+
+        adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+        const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+        expect(parsedRequestBody.imp).to.be.a('array');
+        expect(parsedRequestBody.imp[0]).to.be.a('object');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.pbadslot');
+        expect(parsedRequestBody.imp[0].ext.data.pbadslot).to.equal('/a/b/c');
+      });
+    });
+
+    describe('GAM ad unit config', function () {
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
 
@@ -1457,34 +1871,34 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is undefined', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {};
+        bidRequest.ad_units[0].ortb2Imp = {};
 
         adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
         const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should not send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" is empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should not send \"imp.ext.data.adserver.adslot\" if \"ortb2Imp.ext.data.adserver.adslot\" is empty string', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: ''
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: ''
+              }
+            }
           }
         };
 
@@ -1493,18 +1907,21 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.context.data.adslot');
+        expect(parsedRequestBody.imp[0]).to.not.have.deep.nested.property('ext.data.adslot');
       });
 
-      it('should send \"imp.ext.context.data.adslot\" if \"fpd.context.pbAdSlot\" value is a non-empty string', function () {
-        const ortb2Config = utils.deepClone(CONFIG);
-        ortb2Config.endpoint = 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction';
-        const consentConfig = { s2sConfig: ortb2Config };
+      it('should send both \"adslot\" and \"name\" from \"imp.ext.data.adserver\" if \"ortb2Imp.ext.data.adserver.adslot\" and \"ortb2Imp.ext.data.adserver.name\" values are non-empty strings', function () {
+        const consentConfig = { s2sConfig: CONFIG };
         config.setConfig(consentConfig);
         const bidRequest = utils.deepClone(REQUEST);
-        bidRequest.ad_units[0].fpd = {
-          context: {
-            pbAdSlot: '/a/b/c'
+        bidRequest.ad_units[0].ortb2Imp = {
+          ext: {
+            data: {
+              adserver: {
+                adslot: '/a/b/c',
+                name: 'adserverName1'
+              }
+            }
           }
         };
 
@@ -1513,12 +1930,40 @@ describe('S2S Adapter', function () {
 
         expect(parsedRequestBody.imp).to.be.a('array');
         expect(parsedRequestBody.imp[0]).to.be.a('object');
-        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.context.data.adslot');
-        expect(parsedRequestBody.imp[0].ext.context.data.adslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.adslot');
+        expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.data.adserver.name');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.adslot).to.equal('/a/b/c');
+        expect(parsedRequestBody.imp[0].ext.data.adserver.name).to.equal('adserverName1');
       });
     });
   });
 
+  describe('ext.prebid config', function () {
+    it('should send \"imp.ext.prebid.storedrequest.id\" if \"ortb2Imp.ext.prebid.storedrequest.id\" is set', function () {
+      const consentConfig = { s2sConfig: CONFIG };
+      config.setConfig(consentConfig);
+      const bidRequest = utils.deepClone(REQUEST);
+      const storedRequestId = 'my-id';
+      bidRequest.ad_units[0].ortb2Imp = {
+        ext: {
+          prebid: {
+            storedrequest: {
+              id: storedRequestId
+            }
+          }
+        }
+      };
+
+      adapter.callBids(bidRequest, BID_REQUESTS, addBidResponse, done, ajax);
+      const parsedRequestBody = JSON.parse(server.requests[0].requestBody);
+
+      expect(parsedRequestBody.imp).to.be.a('array');
+      expect(parsedRequestBody.imp[0]).to.be.a('object');
+      expect(parsedRequestBody.imp[0]).to.have.deep.nested.property('ext.prebid.storedrequest.id');
+      expect(parsedRequestBody.imp[0].ext.prebid.storedrequest.id).to.equal(storedRequestId);
+    });
+  });
+
   describe('response handler', function () {
     beforeEach(function () {
       sinon.stub(utils, 'triggerPixel');
@@ -1667,10 +2112,7 @@ describe('S2S Adapter', function () {
       };
       sinon.stub(adapterManager, 'getBidAdapter').returns(rubiconAdapter);
 
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1681,10 +2123,7 @@ describe('S2S Adapter', function () {
     });
 
     it('handles OpenRTB responses and call BIDDER_DONE', function () {
-      const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
-      });
-      config.setConfig({ s2sConfig });
+      config.setConfig({ CONFIG });
 
       adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
@@ -1700,6 +2139,12 @@ describe('S2S Adapter', function () {
       expect(response).to.have.property('bidderCode', 'appnexus');
       expect(response).to.have.property('requestId', '123');
       expect(response).to.have.property('cpm', 0.5);
+      expect(response).to.have.property('meta');
+      expect(response.meta).to.have.property('advertiserDomains');
+      expect(response.meta.advertiserDomains[0]).to.equal('appnexus.com');
+      expect(response.meta).to.have.property('dchain');
+      expect(response.meta.dchain.ver).to.equal('1.0');
+      expect(response.meta.dchain.nodes[0].asi).to.equal('magnite.com');
       expect(response).to.not.have.property('vastUrl');
       expect(response).to.not.have.property('videoCacheKey');
       expect(response).to.have.property('ttl', 60);
@@ -1707,12 +2152,13 @@ describe('S2S Adapter', function () {
 
     it('respects defaultTtl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction',
         defaultTtl: 30
       });
-      config.setConfig({ s2sConfig });
 
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB));
 
       sinon.assert.calledOnce(events.emit);
@@ -1724,11 +2170,16 @@ describe('S2S Adapter', function () {
 
     it('handles OpenRTB video responses', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_VIDEO));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1743,7 +2194,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.cache.vastXml', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1756,7 +2209,10 @@ describe('S2S Adapter', function () {
         }
       });
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1769,7 +2225,9 @@ describe('S2S Adapter', function () {
 
     it('add adserverTargeting object to bids when ext.prebid.targeting is defined', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1781,7 +2239,11 @@ describe('S2S Adapter', function () {
       cacheResponse.seatbid.forEach(item => {
         item.bid[0].ext.prebid.targeting = targetingTestData
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1796,7 +2258,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.targeting', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1807,7 +2271,11 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1820,7 +2288,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.targeting with wurl', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1834,7 +2304,10 @@ describe('S2S Adapter', function () {
           hb_cache_path: '/cache'
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1844,7 +2317,9 @@ describe('S2S Adapter', function () {
 
     it('handles response cache from ext.prebid.targeting with wurl and removes invalid targeting', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
@@ -1860,7 +2335,11 @@ describe('S2S Adapter', function () {
           hb_bidid: '1234567890',
         }
       });
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1875,12 +2354,17 @@ describe('S2S Adapter', function () {
 
     it('add request property pbsBidId with ext.prebid.bidid value', function () {
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
       const cacheResponse = utils.deepClone(RESPONSE_OPENRTB_VIDEO);
 
-      adapter.callBids(VIDEO_REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sVidRequest = utils.deepClone(VIDEO_REQUEST);
+      s2sVidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sVidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(cacheResponse));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1896,11 +2380,16 @@ describe('S2S Adapter', function () {
         bidId: '123'
       });
       const s2sConfig = Object.assign({}, CONFIG, {
-        endpoint: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        endpoint: {
+          p1Consent: 'https://prebidserverurl/openrtb2/auction?querystring=param'
+        }
       });
       config.setConfig({ s2sConfig });
 
-      adapter.callBids(REQUEST, BID_REQUESTS, addBidResponse, done, ajax);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      adapter.callBids(s2sBidRequest, BID_REQUESTS, addBidResponse, done, ajax);
       server.requests[0].respond(200, {}, JSON.stringify(RESPONSE_OPENRTB_NATIVE));
 
       sinon.assert.calledOnce(addBidResponse);
@@ -1937,7 +2426,9 @@ describe('S2S Adapter', function () {
 
       config.setConfig({
         s2sConfig: Object.assign({}, CONFIG, {
-          endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          endpoint: {
+            p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+          }
         })
       });
     });
@@ -2026,7 +2517,9 @@ describe('S2S Adapter', function () {
         bidders: ['appnexus'],
         timeout: 1000,
         adapter: 'prebidServer',
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       };
 
       config.setConfig({ s2sConfig: options });
@@ -2039,7 +2532,9 @@ describe('S2S Adapter', function () {
         enabled: true,
         timeout: 1000,
         adapter: 's2s',
-        endpoint: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        endpoint: {
+          p1Consent: 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction'
+        }
       };
 
       config.setConfig({ s2sConfig: options });
@@ -2086,8 +2581,8 @@ describe('S2S Adapter', function () {
       expect(vendorConfig).to.have.property('adapter', 'prebidServer');
       expect(vendorConfig.bidders).to.deep.equal(['appnexus']);
       expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig).to.have.property('endpoint', 'https://prebid.adnxs.com/pbs/v1/openrtb2/auction');
-      expect(vendorConfig).to.have.property('syncEndpoint', 'https://prebid.adnxs.com/pbs/v1/cookie_sync');
+      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);
     });
 
@@ -2107,8 +2602,8 @@ describe('S2S Adapter', function () {
       expect(vendorConfig).to.have.property('adapter', 'prebidServer');
       expect(vendorConfig.bidders).to.deep.equal(['rubicon']);
       expect(vendorConfig.enabled).to.be.true;
-      expect(vendorConfig).to.have.property('endpoint', 'https://prebid-server.rubiconproject.com/openrtb2/auction');
-      expect(vendorConfig).to.have.property('syncEndpoint', 'https://prebid-server.rubiconproject.com/cookie_sync');
+      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);
     });
 
@@ -2127,8 +2622,8 @@ describe('S2S Adapter', function () {
         'bidders': ['rubicon'],
         'defaultVendor': 'rubicon',
         'enabled': true,
-        'endpoint': 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-        'syncEndpoint': 'https://prebid-server.rubiconproject.com/cookie_sync',
+        '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
       })
     });
@@ -2149,8 +2644,8 @@ describe('S2S Adapter', function () {
         accountId: 'abc',
         bidders: ['rubicon'],
         defaultVendor: 'rubicon',
-        endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
-        syncEndpoint: 'https://prebid-server.rubiconproject.com/cookie_sync',
+        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'},
       })
     });
 
@@ -2198,13 +2693,14 @@ describe('S2S Adapter', function () {
 
       // 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 = 'https://prebid.adnxs.com/pbs/v1/cookie_sync';
+      s2sConfig.syncEndpoint = {p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync'};
       s2sConfig.bidders = ['appnexus', 'rubicon-alias'];
 
-      const request = utils.deepClone(REQUEST);
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
 
       // Add another bidder, `rubicon-alias`
-      request.ad_units[0].bids.push({
+      s2sBidRequest.ad_units[0].bids.push({
         bidder: 'rubicon-alias',
         params: {
           accoundId: 14062,
@@ -2216,8 +2712,6 @@ describe('S2S Adapter', function () {
       // create an alias for the Rubicon Bid Adapter
       adapterManager.aliasBidAdapter('rubicon', 'rubicon-alias');
 
-      config.setConfig({ s2sConfig });
-
       const bidRequest = utils.deepClone(BID_REQUESTS);
       bidRequest.push({
         'bidderCode': 'rubicon-alias',
@@ -2261,10 +2755,41 @@ describe('S2S Adapter', function () {
         'src': 's2s'
       });
 
-      adapter.callBids(request, 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']);
     });
+
+    it('should add cooperative sync flag to cookie_sync request if property is present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.coopSync = false;
+      s2sConfig.syncEndpoint = {p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync'};
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.equal(false);
+    });
+
+    it('should not add cooperative sync flag to cookie_sync request if property is not present', function () {
+      let s2sConfig = utils.deepClone(CONFIG);
+      s2sConfig.syncEndpoint = {p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync'};
+
+      const s2sBidRequest = utils.deepClone(REQUEST);
+      s2sBidRequest.s2sConfig = s2sConfig;
+
+      let bidRequest = utils.deepClone(BID_REQUESTS);
+
+      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      let requestBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(requestBid.coopSync).to.be.undefined;
+    });
   });
 });
diff --git a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
index e87be40314c..2505af0c2a7 100644
--- a/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
+++ b/test/spec/modules/prebidmanagerAnalyticsAdapter_spec.js
@@ -1,6 +1,10 @@
-import prebidmanagerAnalytics from 'modules/prebidmanagerAnalyticsAdapter.js';
+import prebidmanagerAnalytics, {
+  storage
+} from 'modules/prebidmanagerAnalyticsAdapter.js';
 import {expect} from 'chai';
 import {server} from 'test/mocks/xhr.js';
+import * as utils from 'src/utils.js';
+
 let events = require('src/events');
 let constants = require('src/constants.json');
 
@@ -103,19 +107,18 @@ describe('Prebid Manager Analytics Adapter', function () {
   });
 
   describe('build utm tag data', function () {
+    let getDataFromLocalStorageStub;
     beforeEach(function () {
-      localStorage.setItem('pm_utm_source', 'utm_source');
-      localStorage.setItem('pm_utm_medium', 'utm_medium');
-      localStorage.setItem('pm_utm_campaign', 'utm_camp');
-      localStorage.setItem('pm_utm_term', '');
-      localStorage.setItem('pm_utm_content', '');
+      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('');
+      getDataFromLocalStorageStub.withArgs('pm_utm_source').returns('utm_source');
     });
     afterEach(function () {
-      localStorage.removeItem('pm_utm_source');
-      localStorage.removeItem('pm_utm_medium');
-      localStorage.removeItem('pm_utm_campaign');
-      localStorage.removeItem('pm_utm_term');
-      localStorage.removeItem('pm_utm_content');
+      getDataFromLocalStorageStub.restore();
       prebidmanagerAnalytics.disableAnalytics()
     });
     it('should build utm data from local storage', function () {
@@ -135,4 +138,23 @@ describe('Prebid Manager Analytics Adapter', function () {
       expect(pmEvents.utmTags.utm_content).to.equal('');
     });
   });
+
+  describe('build page info', function () {
+    afterEach(function () {
+      prebidmanagerAnalytics.disableAnalytics()
+    });
+    it('should build page info', function () {
+      prebidmanagerAnalytics.enableAnalytics({
+        provider: 'prebidmanager',
+        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/priceFloors_spec.js b/test/spec/modules/priceFloors_spec.js
index 9d35554c27f..548d2789d3e 100644
--- a/test/spec/modules/priceFloors_spec.js
+++ b/test/spec/modules/priceFloors_spec.js
@@ -23,6 +23,38 @@ describe('the price floors module', function () {
   let clock;
   const basicFloorData = {
     modelVersion: 'basic model',
+    modelWeight: 10,
+    modelTimestamp: 1606772895,
+    currency: 'USD',
+    schema: {
+      delimiter: '|',
+      fields: ['mediaType']
+    },
+    values: {
+      'banner': 1.0,
+      'video': 5.0,
+      '*': 2.5
+    }
+  };
+  const basicFloorDataHigh = {
+    floorMin: 7.0,
+    modelVersion: 'basic model',
+    modelWeight: 10,
+    currency: 'USD',
+    schema: {
+      delimiter: '|',
+      fields: ['mediaType']
+    },
+    values: {
+      'banner': 1.0,
+      'video': 5.0,
+      '*': 2.5
+    }
+  };
+  const basicFloorDataLow = {
+    floorMin: 2.3,
+    modelVersion: 'basic model',
+    modelWeight: 10,
     currency: 'USD',
     schema: {
       delimiter: '|',
@@ -46,6 +78,32 @@ describe('the price floors module', function () {
     },
     data: basicFloorData
   }
+  const minFloorConfigHigh = {
+    enabled: true,
+    auctionDelay: 0,
+    floorMin: 7,
+    endpoint: {},
+    enforcement: {
+      enforceJS: true,
+      enforcePBS: false,
+      floorDeals: false,
+      bidAdjustment: true
+    },
+    data: basicFloorDataHigh
+  }
+  const minFloorConfigLow = {
+    enabled: true,
+    auctionDelay: 0,
+    floorMin: 2.3,
+    endpoint: {},
+    enforcement: {
+      enforceJS: true,
+      enforcePBS: false,
+      floorDeals: false,
+      bidAdjustment: true
+    },
+    data: basicFloorDataLow
+  }
   const basicBidRequest = {
     bidder: 'rubicon',
     adUnitCode: 'test_div_1',
@@ -130,6 +188,8 @@ describe('the price floors module', function () {
       let resultingData = getFloorsDataForAuction(inputFloorData, 'test_div_1');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '|',
@@ -147,6 +207,8 @@ describe('the price floors module', function () {
       resultingData = getFloorsDataForAuction(inputFloorData, 'this_is_a_div');
       expect(resultingData).to.deep.equal({
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         currency: 'USD',
         schema: {
           delimiter: '^',
@@ -165,22 +227,66 @@ describe('the price floors module', function () {
     it('selects the right floor for different mediaTypes', function () {
       // banner with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.0,
         matchingFloor: 1.0,
         matchingData: 'banner',
         matchingRule: 'banner'
       });
       // video with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'video', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 5.0,
         matchingFloor: 5.0,
         matchingData: 'video',
         matchingRule: 'video'
       });
       // native (not in the rule list) with * size (not in rule file so does not do anything)
       expect(getFirstMatchingFloor({...basicFloorData}, basicBidRequest, {mediaType: 'native', size: '*'})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 2.5,
         matchingFloor: 2.5,
         matchingData: 'native',
         matchingRule: '*'
       });
+      // banner with floorMin higher than matching rule
+      handleSetFloorsConfig({
+        ...minFloorConfigHigh
+      });
+      expect(getFirstMatchingFloor({...basicFloorDataHigh}, basicBidRequest, {mediaType: 'banner', size: '*'})).to.deep.equal({
+        floorMin: 7,
+        floorRuleValue: 1.0,
+        matchingFloor: 7,
+        matchingData: 'banner',
+        matchingRule: 'banner'
+      });
+      // banner with floorMin higher than matching rule
+      handleSetFloorsConfig({
+        ...minFloorConfigLow
+      });
+      expect(getFirstMatchingFloor({...basicFloorDataLow}, basicBidRequest, {mediaType: 'video', size: '*'})).to.deep.equal({
+        floorMin: 2.3,
+        floorRuleValue: 5,
+        matchingFloor: 5,
+        matchingData: 'video',
+        matchingRule: 'video'
+      });
+    });
+    it('does not alter cached matched input if conversion occurs', function () {
+      let inputData = {...basicFloorData};
+      [0.2, 0.4, 0.6, 0.8].forEach(modifier => {
+        let result = getFirstMatchingFloor(inputData, basicBidRequest, {mediaType: 'banner', size: '*'});
+        // result should always be the same
+        expect(result).to.deep.equal({
+          floorMin: 0,
+          floorRuleValue: 1.0,
+          matchingFloor: 1.0,
+          matchingData: 'banner',
+          matchingRule: 'banner'
+        });
+        // make sure a post retrieval adjustment does not alter the cached floor
+        result.matchingFloor = result.matchingFloor * modifier;
+      });
     });
     it('selects the right floor for different sizes', function () {
       let inputFloorData = {
@@ -199,24 +305,32 @@ describe('the price floors module', function () {
       }
       // banner with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'banner', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: '300x250',
         matchingRule: '300x250'
       });
       // video with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: '300x250',
         matchingRule: '300x250'
       });
       // native (not in the rule list) with 300x600 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'native', size: [600, 300]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 4.4,
         matchingFloor: 4.4,
         matchingData: '600x300',
         matchingRule: '600x300'
       });
       // n/a mediaType with a size not in file should go to catch all
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: undefined, size: [1, 1]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 5.5,
         matchingFloor: 5.5,
         matchingData: '1x1',
         matchingRule: '*'
@@ -240,12 +354,16 @@ describe('the price floors module', function () {
       };
       // banner with 300x250 size
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'banner', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 1.1,
         matchingFloor: 1.1,
         matchingData: 'test_div_1^banner^300x250',
         matchingRule: 'test_div_1^banner^300x250'
       });
       // video with 300x250 size -> No matching rule so should use default
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0.5,
         matchingFloor: 0.5,
         matchingData: 'test_div_1^video^300x250',
         matchingRule: undefined
@@ -253,6 +371,8 @@ describe('the price floors module', function () {
       // remove default and should still return the same floor as above since matches are cached
       delete inputFloorData.default;
       expect(getFirstMatchingFloor(inputFloorData, basicBidRequest, {mediaType: 'video', size: [300, 250]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 0.5,
         matchingFloor: 0.5,
         matchingData: 'test_div_1^video^300x250',
         matchingRule: undefined
@@ -260,6 +380,8 @@ describe('the price floors module', function () {
       // update adUnitCode to test_div_2 with weird other params
       let newBidRequest = { ...basicBidRequest, adUnitCode: 'test_div_2' }
       expect(getFirstMatchingFloor(inputFloorData, newBidRequest, {mediaType: 'badmediatype', size: [900, 900]})).to.deep.equal({
+        floorMin: 0,
+        floorRuleValue: 3.3,
         matchingFloor: 3.3,
         matchingData: 'test_div_2^badmediatype^900x900',
         matchingRule: 'test_div_2^*^*'
@@ -313,10 +435,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(false, {
         skipped: true,
+        floorMin: undefined,
         modelVersion: undefined,
-        location: undefined,
+        modelWeight: undefined,
+        modelTimestamp: undefined,
+        location: 'noData',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should use adUnit level data if not setConfig or fetch has occured', function () {
@@ -343,23 +469,122 @@ describe('the price floors module', function () {
         }
       };
       runStandardAuction([adUnitWithFloors1, adUnitWithFloors2]);
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'adUnit',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined
+      });
+    });
+    it('should use adUnit level data and minFloor should be set', function () {
+      handleSetFloorsConfig({
+        ...minFloorConfigHigh,
+        data: undefined
+      });
+      // attach floor data onto an adUnit and run an auction
+      let adUnitWithFloors1 = {
+        ...getAdUnitMock('adUnit-Div-1'),
+        floors: {
+          ...basicFloorData,
+          modelVersion: 'adUnit Model Version', // change the model name
+        }
+      };
+      let adUnitWithFloors2 = {
+        ...getAdUnitMock('adUnit-Div-2'),
+        floors: {
+          ...basicFloorData,
+          values: {
+            'banner': 5.0,
+            '*': 10.4
+          }
+        }
+      };
+      runStandardAuction([adUnitWithFloors1, adUnitWithFloors2]);
       validateBidRequests(true, {
         skipped: false,
         modelVersion: 'adUnit Model Version',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'adUnit',
         skipRate: 0,
-        fetchStatus: undefined
+        floorMin: 7,
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('bidRequests should have getFloor function and flooring meta data when setConfig occurs', function () {
-      handleSetFloorsConfig({...basicFloorConfig});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider'});
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
+      });
+    });
+    it('should pick the right floorProvider', function () {
+      let inputFloors = {
+        ...basicFloorConfig,
+        floorProvider: 'providerA',
+        data: {
+          ...basicFloorData,
+          floorProvider: 'providerB',
+        }
+      };
+      handleSetFloorsConfig(inputFloors);
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: 'providerB'
+      });
+
+      // if not at data level take top level
+      delete inputFloors.data.floorProvider;
+      handleSetFloorsConfig(inputFloors);
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'providerA'
+      });
+
+      // if none should be undefined
+      delete inputFloors.floorProvider;
+      handleSetFloorsConfig(inputFloors);
+      runStandardAuction();
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'setConfig',
+        skipRate: 0,
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should take the right skipRate depending on input', function () {
@@ -377,10 +602,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 50,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
 
       // if that does not exist uses topLevel skipRate setting
@@ -389,10 +618,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 10,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
 
       // if that is not there defaults to zero
@@ -401,15 +634,20 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should randomly pick a model if floorsSchemaVersion is 2', function () {
       let inputFloors = {
         ...basicFloorConfig,
+        floorProvider: 'floorprovider',
         data: {
           floorsSchemaVersion: 2,
           currency: 'USD',
@@ -462,10 +700,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-1',
+        modelWeight: 10,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
 
       // 11 - 50 should use second model
@@ -473,10 +715,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-2',
+        modelWeight: 40,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
 
       // 51 - 100 should use third model
@@ -484,10 +730,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'model-3',
+        modelWeight: 50,
+        modelTimestamp: undefined,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: 'floorprovider'
       });
     });
     it('should not overwrite previous data object if the new one is bad', function () {
@@ -511,10 +761,14 @@ describe('the price floors module', function () {
       runStandardAuction();
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: undefined
+        fetchStatus: undefined,
+        floorProvider: undefined
       });
     });
     it('should dynamically add new schema fileds and functions if added via setConfig', function () {
@@ -588,10 +842,14 @@ describe('the price floors module', function () {
       // the exposedAdUnits should be from the fetch not setConfig level data
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'timeout'
+        fetchStatus: 'timeout',
+        floorProvider: undefined
       });
       fakeFloorProvider.respond();
     });
@@ -604,7 +862,7 @@ describe('the price floors module', function () {
       fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
 
       // run setConfig indicating fetch
-      handleSetFloorsConfig({...basicFloorConfig, auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
 
       // floor provider should be called
       expect(fakeFloorProvider.requests.length).to.equal(1);
@@ -624,10 +882,53 @@ describe('the price floors module', function () {
       // and fetchStatus is success since fetch worked
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 0,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: 'floorprovider'
+      });
+    });
+    it('it should correctly overwrite floorProvider with fetch provider', function () {
+      // init the fake server with response stuff
+      let fetchFloorData = {
+        ...basicFloorData,
+        floorProvider: 'floorProviderD', // change the floor provider
+        modelVersion: 'fetch model name', // change the model name
+      };
+      fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
+
+      // run setConfig indicating fetch
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorproviderC', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+
+      // floor provider should be called
+      expect(fakeFloorProvider.requests.length).to.equal(1);
+      expect(fakeFloorProvider.requests[0].url).to.equal('http://www.fakeFloorProvider.json');
+
+      // start the auction it should delay and not immediately call `continueAuction`
+      runStandardAuction();
+
+      // exposedAdUnits should be undefined if the auction has not continued
+      expect(exposedAdUnits).to.be.undefined;
+
+      // make the fetch respond
+      fakeFloorProvider.respond();
+
+      // the exposedAdUnits should be from the fetch not setConfig level data
+      // and fetchStatus is success since fetch worked
+      validateBidRequests(true, {
+        skipped: false,
+        floorMin: undefined,
+        modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        location: 'fetch',
+        skipRate: 0,
+        fetchStatus: 'success',
+        floorProvider: 'floorProviderD'
       });
     });
     it('it should correctly overwrite skipRate with fetch skipRate', function () {
@@ -642,7 +943,7 @@ describe('the price floors module', function () {
       fakeFloorProvider.respondWith(JSON.stringify(fetchFloorData));
 
       // run setConfig indicating fetch
-      handleSetFloorsConfig({...basicFloorConfig, auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
+      handleSetFloorsConfig({...basicFloorConfig, floorProvider: 'floorprovider', auctionDelay: 250, endpoint: {url: 'http://www.fakeFloorProvider.json'}});
 
       // floor provider should be called
       expect(fakeFloorProvider.requests.length).to.equal(1);
@@ -662,10 +963,14 @@ describe('the price floors module', function () {
       // and fetchStatus is success since fetch worked
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'fetch model name',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'fetch',
         skipRate: 95,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: 'floorprovider'
       });
     });
     it('Should not break if floor provider returns 404', function () {
@@ -682,10 +987,14 @@ describe('the price floors module', function () {
       // and fetch failed is true
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        floorProvider: undefined
       });
     });
     it('Should not break if floor provider returns non json', function () {
@@ -704,10 +1013,14 @@ describe('the price floors module', function () {
       // and fetchStatus is 'success' but location is setConfig since it had bad data
       validateBidRequests(true, {
         skipped: false,
+        floorMin: undefined,
         modelVersion: 'basic model',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 0,
-        fetchStatus: 'success'
+        fetchStatus: 'success',
+        floorProvider: undefined
       });
     });
     it('should handle not using fetch correctly', function () {
@@ -1003,6 +1316,74 @@ describe('the price floors module', function () {
           floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
         });
       });
+
+      it('should use standard cpmAdjustment if no bidder cpmAdjustment', function () {
+        getGlobal().bidderSettings = {
+          rubicon: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.5;
+            },
+          },
+          standard: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.75;
+            },
+          }
+        };
+        _floorDataForAuction[bidRequest.auctionId] = utils.deepClone(basicFloorConfig);
+        _floorDataForAuction[bidRequest.auctionId].data.values = { '*': 1.0 };
+        let appnexusBid = {
+          ...bidRequest,
+          bidder: 'appnexus'
+        };
+
+        // the conversion should be what the bidder would need to return in order to match the actual floor
+        // rubicon
+        expect(bidRequest.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 2.0 // a 2.0 bid after rubicons cpm adjustment would be 1.0 and thus is the floor after adjust
+        });
+
+        // appnexus
+        expect(appnexusBid.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
+        });
+      });
+
+      it('should work when cpmAdjust function uses bid object', function () {
+        getGlobal().bidderSettings = {
+          rubicon: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.5;
+            },
+          },
+          appnexus: {
+            bidCpmAdjustment: function (bidCpm, bidResponse) {
+              return bidResponse.cpm * 0.75;
+            },
+          }
+        };
+        _floorDataForAuction[bidRequest.auctionId] = utils.deepClone(basicFloorConfig);
+        _floorDataForAuction[bidRequest.auctionId].data.values = { '*': 1.0 };
+        let appnexusBid = {
+          ...bidRequest,
+          bidder: 'appnexus'
+        };
+
+        // the conversion should be what the bidder would need to return in order to match the actual floor
+        // rubicon
+        expect(bidRequest.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 2.0 // a 2.0 bid after rubicons cpm adjustment would be 1.0 and thus is the floor after adjust
+        });
+
+        // appnexus
+        expect(appnexusBid.getFloor()).to.deep.equal({
+          currency: 'USD',
+          floor: 1.3334 // 1.3334 * 0.75 = 1.000005 which is the floor (we cut off getFloor at 4 decimal points)
+        });
+      });
       it('should correctly pick the right attributes if * is passed in and context can be assumed', function () {
         let inputBidReq = {
           bidder: 'rubicon',
@@ -1158,6 +1539,7 @@ describe('the price floors module', function () {
       runBidResponse();
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
+        floorRuleValue: 0.3,
         floorValue: 0.3,
         floorCurrency: 'USD',
         floorRule: 'banner',
@@ -1195,6 +1577,7 @@ describe('the price floors module', function () {
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
         floorValue: 0.5,
+        floorRuleValue: 0.5,
         floorCurrency: 'USD',
         floorRule: 'banner|300x250',
         cpmAfterAdjustments: 0.5,
@@ -1221,6 +1604,7 @@ describe('the price floors module', function () {
       });
       expect(returnedBidResponse).to.haveOwnProperty('floorData');
       expect(returnedBidResponse.floorData).to.deep.equal({
+        floorRuleValue: 5.5,
         floorValue: 5.5,
         floorCurrency: 'USD',
         floorRule: 'video|*',
diff --git a/test/spec/modules/projectLimeLightBidAdapter_spec.js b/test/spec/modules/projectLimeLightBidAdapter_spec.js
index 3ffc017f177..778d8eedf7b 100644
--- a/test/spec/modules/projectLimeLightBidAdapter_spec.js
+++ b/test/spec/modules/projectLimeLightBidAdapter_spec.js
@@ -2,11 +2,12 @@ import {expect} from 'chai';
 import {spec} from '../../../modules/projectLimeLightBidAdapter.js';
 
 describe('ProjectLimeLightAdapter', function () {
-  let bid = {
+  const bid1 = {
     bidId: '2dd581a2b6281d',
     bidder: 'project-limelight',
     bidderRequestId: '145e1d6a7837c9',
     params: {
+      host: 'ads.project-limelight.com',
       adUnitId: 123,
       adUnitType: 'banner'
     },
@@ -14,46 +15,83 @@ describe('ProjectLimeLightAdapter', function () {
     auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
     sizes: [[300, 250]],
     transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
-  };
+  }
+  const bid2 = {
+    bidId: '58ee9870c3164a',
+    bidder: 'project-limelight',
+    bidderRequestId: '209fdaf1c81649',
+    params: {
+      host: 'cpm.project-limelight.com',
+      adUnitId: 456,
+      adUnitType: 'banner'
+    },
+    placementCode: 'placement_1',
+    auctionId: '482f88de-29ab-45c8-981a-d25e39454a34',
+    sizes: [[350, 200]],
+    transactionId: '068867d1-46ec-40bb-9fa0-e24611786fb4'
+  }
+  const bid3 = {
+    bidId: '019645c7d69460',
+    bidder: 'project-limelight',
+    bidderRequestId: 'f2b15f89e77ba6',
+    params: {
+      host: 'ads.project-limelight.com',
+      adUnitId: 789,
+      adUnitType: 'video'
+    },
+    placementCode: 'placement_2',
+    auctionId: 'e4771143-6aa7-41ec-8824-ced4342c96c8',
+    sizes: [[800, 600]],
+    transactionId: '738d5915-6651-43b9-9b6b-d50517350917'
+  }
 
   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');
-    });
+    const serverRequests = spec.buildRequests([bid1, bid2, bid3])
+    it('Creates two ServerRequests', function() {
+      expect(serverRequests).to.exist
+      expect(serverRequests).to.have.lengthOf(2)
+    })
+    serverRequests.forEach(serverRequest => {
+      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', 'secure', 'adUnits')
+        expect(data.deviceWidth).to.be.a('number')
+        expect(data.deviceHeight).to.be.a('number')
+        expect(data.secure).to.be.a('boolean')
+        data.adUnits.forEach(adUnit => {
+          expect(adUnit).to.have.all.keys('id', 'bidId', 'type', 'sizes', 'transactionId')
+          expect(adUnit.id).to.be.a('number')
+          expect(adUnit.bidId).to.be.a('string')
+          expect(adUnit.type).to.be.a('string')
+          expect(adUnit.transactionId).to.be.a('string')
+          expect(adUnit.sizes).to.be.an('array')
+        })
+      })
+    })
     it('Returns valid URL', function () {
-      expect(serverRequest.url).to.equal('https://ads.project-limelight.com/hb');
-    });
-    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', 'secure', 'adUnits');
-      expect(data.deviceWidth).to.be.a('number');
-      expect(data.deviceHeight).to.be.a('number');
-      expect(data.secure).to.be.a('boolean');
-      let adUnits = data['adUnits'];
-      for (let i = 0; i < adUnits.length; i++) {
-        let adUnit = adUnits[i];
-        expect(adUnit).to.have.all.keys('id', 'bidId', 'type', 'sizes', 'transactionId');
-        expect(adUnit.id).to.be.a('number');
-        expect(adUnit.bidId).to.be.a('string');
-        expect(adUnit.type).to.be.a('string');
-        expect(adUnit.transactionId).to.be.a('string');
-        expect(adUnit.sizes).to.be.an('array');
-      }
-    });
+      expect(serverRequests[0].url).to.equal('https://ads.project-limelight.com/hb')
+      expect(serverRequests[1].url).to.equal('https://cpm.project-limelight.com/hb')
+    })
+    it('Returns valid adUnits', function () {
+      validateAdUnit(serverRequests[0].data.adUnits[0], bid1)
+      validateAdUnit(serverRequests[1].data.adUnits[0], bid2)
+      validateAdUnit(serverRequests[0].data.adUnits[1], bid3)
+    })
     it('Returns empty data if no valid requests are passed', function () {
-      serverRequest = spec.buildRequests([]);
-      let data = serverRequest.data;
-      expect(data.adUnits).to.be.an('array').that.is.empty;
-    });
-  });
+      const serverRequests = spec.buildRequests([])
+      expect(serverRequests).to.be.an('array').that.is.empty
+    })
+  })
   describe('interpretBannerResponse', function () {
     let resObject = {
       body: [ {
@@ -167,4 +205,55 @@ describe('ProjectLimeLightAdapter', function () {
       expect(spec.isBidRequestValid(bidFailed)).to.equal(false);
     });
   });
+  describe('interpretResponse', function() {
+    let resObject = {
+      requestId: '123',
+      mediaType: 'banner',
+      cpm: 0.3,
+      width: 320,
+      height: 50,
+      ad: '
Hello ad
',
+      ttl: 1000,
+      creativeId: '123asd',
+      netRevenue: true,
+      currency: 'USD'
+    };
+    it('should skip responses which do not contain required params', function() {
+      let bidResponses = {
+        body: [ {
+          mediaType: 'banner',
+          cpm: 0.3,
+          ttl: 1000,
+          currency: 'USD'
+        }, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([ resObject ]);
+    });
+    it('should skip responses which do not contain expected mediaType', function() {
+      let bidResponses = {
+        body: [ {
+          requestId: '123',
+          mediaType: 'native',
+          cpm: 0.3,
+          creativeId: '123asd',
+          ttl: 1000,
+          currency: 'USD'
+        }, resObject ]
+      }
+      expect(spec.interpretResponse(bidResponses)).to.deep.equal([ resObject ]);
+    });
+  });
 });
+
+function validateAdUnit(adUnit, bid) {
+  expect(adUnit.id).to.equal(bid.params.adUnitId)
+  expect(adUnit.bidId).to.equal(bid.bidId)
+  expect(adUnit.type).to.equal(bid.params.adUnitType.toUpperCase())
+  expect(adUnit.transactionId).to.equal(bid.transactionId)
+  expect(adUnit.sizes).to.deep.equal(bid.sizes.map(size => {
+    return {
+      width: size[0],
+      height: size[1]
+    }
+  }))
+}
diff --git a/test/spec/modules/proxistoreBidAdapter_spec.js b/test/spec/modules/proxistoreBidAdapter_spec.js
index 410c3c59fb6..bdcdca06183 100644
--- a/test/spec/modules/proxistoreBidAdapter_spec.js
+++ b/test/spec/modules/proxistoreBidAdapter_spec.js
@@ -1,55 +1,62 @@
 import { expect } from 'chai';
 let { spec } = require('modules/proxistoreBidAdapter');
-
 const BIDDER_CODE = 'proxistore';
 describe('ProxistoreBidAdapter', function () {
+  const consentString = 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==';
   const bidderRequest = {
-    'bidderCode': BIDDER_CODE,
-    'auctionId': '1025ba77-5463-4877-b0eb-14b205cb9304',
-    'bidderRequestId': '10edf38ec1a719',
-    'gdprConsent': {
-      'gdprApplies': true,
-      'consentString': 'CONSENT_STRING',
-      'vendorData': {
-        'vendorConsents': {
-          '418': true
-        }
-      }
-    }
+    bidderCode: BIDDER_CODE,
+    auctionId: '1025ba77-5463-4877-b0eb-14b205cb9304',
+    bidderRequestId: '10edf38ec1a719',
+    gdprConsent: {
+      apiVersion: 2,
+      gdprApplies: true,
+      consentString: consentString,
+      vendorData: {
+        vendor: {
+          consents: {
+            418: true,
+          },
+        },
+      },
+    },
   };
   let bid = {
     sizes: [[300, 600]],
     params: {
       website: 'example.fr',
-      language: 'fr'
+      language: 'fr',
+    },
+    ortb2: {
+      user: { ext: { data: { segments: [], contextual_categories: {} } } },
     },
     auctionId: 442133079,
     bidId: 464646969,
-    transactionId: 511916005
+    transactionId: 511916005,
   };
   describe('isBidRequestValid', function () {
     it('it should be true if required params are presents and there is no info in the local storage', function () {
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
-
-    it('it should be false if the value in the localstorage is less than 5minutes of the actual time', function() {
+    it('it should be false if the value in the localstorage is less than 5minutes of the actual time', function () {
       const date = new Date();
-      date.setMinutes(date.getMinutes() - 1)
-      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date)
-      expect(spec.isBidRequestValid(bid)).to.equal(false);
+      date.setMinutes(date.getMinutes() - 1);
+      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date);
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
-
-    it('it should be true if the value in the localstorage is more than 5minutes of the actual time', function() {
+    it('it should be true if the value in the localstorage is more than 5minutes of the actual time', function () {
       const date = new Date();
-      date.setMinutes(date.getMinutes() - 10)
-      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date)
+      date.setMinutes(date.getMinutes() - 10);
+      localStorage.setItem(`PX_NoAds_${bid.params.website}`, date);
       expect(spec.isBidRequestValid(bid)).to.equal(true);
     });
   });
-
   describe('buildRequests', function () {
-    const url = 'https://abs.proxistore.com/fr/v3/rtb/prebid/multi';
-    const request = spec.buildRequests([bid], bidderRequest);
+    const url = {
+      cookieBase: 'https://abs.proxistore.com/fr/v3/rtb/prebid/multi',
+      cookieLess:
+        'https://abs.cookieless-proxistore.com/fr/v3/rtb/prebid/multi',
+    };
+    let request = spec.buildRequests([bid], bidderRequest);
     it('should return a valid object', function () {
       expect(request).to.be.an('object');
       expect(request.method).to.exist;
@@ -59,16 +66,45 @@ describe('ProxistoreBidAdapter', function () {
     it('request method should be POST', function () {
       expect(request.method).to.equal('POST');
     });
-    it('should contain a valid url', function () {
-      expect(request.url).equal(url);
-    });
     it('should have the value consentGiven to true bc we have 418 in the vendor list', function () {
       const data = JSON.parse(request.data);
-
-      expect(data.gdpr.consentString).equal(bidderRequest.gdprConsent.consentString);
+      expect(data.gdpr.consentString).equal(
+        bidderRequest.gdprConsent.consentString
+      );
       expect(data.gdpr.applies).to.be.true;
       expect(data.gdpr.consentGiven).to.be.true;
     });
+    it('should contain a valid url', function () {
+      // has gdpr consent
+      expect(request.url).equal(url.cookieBase);
+      // doens't have gpdr consent
+      bidderRequest.gdprConsent.vendorData = null;
+
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieLess);
+
+      // api v2
+      bidderRequest.gdprConsent = {
+        gdprApplies: true,
+        allowAuctionWithoutConsent: true,
+        consentString: consentString,
+        vendorData: {
+          vendor: {
+            consents: {
+              '418': true
+            }
+          },
+        },
+        apiVersion: 2
+      };
+      // has gdpr consent
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieBase);
+
+      bidderRequest.gdprConsent.vendorData.vendor = {};
+      request = spec.buildRequests([bid], bidderRequest);
+      expect(request.url).equal(url.cookieLess);
+    });
     it('should have a property a length of bids equal to one if there is only one bid', function () {
       const data = JSON.parse(request.data);
       expect(data.hasOwnProperty('bids')).to.be.true;
@@ -77,51 +113,54 @@ describe('ProxistoreBidAdapter', function () {
       expect(data.bids[0].hasOwnProperty('id')).to.be.true;
       expect(data.bids[0].sizes).to.be.an('array');
     });
-  });
+    it('should correctly set bidfloor on imp when getfloor in scope', function () {
+      let data = JSON.parse(request.data);
+      expect(data.bids[0].floor).to.be.null;
 
+      // make it respond with a non USD floor should not send it
+      bid.getFloor = function () {
+        return { currency: 'EUR', floor: 1.0 };
+      };
+      let req = spec.buildRequests([bid], bidderRequest);
+      data = JSON.parse(req.data);
+      expect(data.bids[0].floor).equal(1);
+      bid.getFloor = function () {
+        return { currency: 'USD', floor: 1.0 };
+      };
+      req = spec.buildRequests([bid], bidderRequest);
+      data = JSON.parse(req.data);
+      expect(data.bids[0].floor).to.be.null;
+    });
+  });
   describe('interpretResponse', function () {
-    const responses = {
-      body:
-        [{
+    const emptyResponseParam = { body: [] };
+    const fakeResponseParam = {
+      body: [
+        {
+          ad: '',
           cpm: 6.25,
-          creativeId: '48fd47c9-ce35-4fda-804b-17e16c8c36ac',
+          creativeId: '22c3290b-8cd5-4cd6-8e8c-28a2de180ccd',
           currency: 'EUR',
-          dealId: '2019-10_e3ecad8e-d07a-4c90-ad46-cd0f306c8960',
+          dealId: '2021-03_a63ec55e-b9bb-4ca4-b2c9-f456be67e656',
           height: 600,
           netRevenue: true,
-          requestId: '923756713',
+          requestId: '3543724f2a033c9',
+          segments: [],
           ttl: 10,
           vastUrl: null,
           vastXml: null,
           width: 300,
-        }]
+        },
+      ],
     };
-    const badResponse = { body: [] };
-    const interpretedResponse = spec.interpretResponse(responses, bid)[0];
-    it('should send an empty array if body is empty', function () {
-      expect(spec.interpretResponse(badResponse, bid)).to.be.an('array');
-      expect(spec.interpretResponse(badResponse, bid).length).equal(0);
-    });
-    it('should interpret the response correctly if it is valid', function () {
-      expect(interpretedResponse.cpm).equal(6.25);
-      expect(interpretedResponse.creativeId).equal('48fd47c9-ce35-4fda-804b-17e16c8c36ac');
-      expect(interpretedResponse.currency).equal('EUR');
-      expect(interpretedResponse.height).equal(600);
-      expect(interpretedResponse.width).equal(300);
-      expect(interpretedResponse.requestId).equal('923756713');
-      expect(interpretedResponse.netRevenue).to.be.true;
-      expect(interpretedResponse.netRevenue).to.be.true;
-    });
-    it('should have a value in the local storage if the response is empty', function() {
-      spec.interpretResponse(badResponse, bid);
-      expect(localStorage.getItem(`PX_NoAds_${bid.params.website}`)).to.be.string;
-    });
-  });
 
-  describe('interpretResponse', function () {
-    it('should aways return an empty array', function () {
-      expect(spec.getUserSyncs()).to.be.an('array');
-      expect(spec.getUserSyncs().length).equal(0);
+    it('should always return an array', function () {
+      let response = spec.interpretResponse(emptyResponseParam, bid);
+      expect(response).to.be.an('array');
+      expect(response.length).equal(0);
+      response = spec.interpretResponse(fakeResponseParam, bid);
+      expect(response).to.be.an('array');
+      expect(response.length).equal(1);
     });
   });
 });
diff --git a/test/spec/modules/pubCommonId_spec.js b/test/spec/modules/pubCommonId_spec.js
index ab0ef2adc51..a46ff26c4b8 100644
--- a/test/spec/modules/pubCommonId_spec.js
+++ b/test/spec/modules/pubCommonId_spec.js
@@ -234,7 +234,7 @@ describe('Publisher Common ID', function () {
       });
     });
 
-    it('disable auto create', function() {
+    it.skip('disable auto create', function() {
       setConfig({
         create: false
       });
diff --git a/test/spec/modules/pubgeniusBidAdapter_spec.js b/test/spec/modules/pubgeniusBidAdapter_spec.js
index c510be99402..6568f7aa782 100644
--- a/test/spec/modules/pubgeniusBidAdapter_spec.js
+++ b/test/spec/modules/pubgeniusBidAdapter_spec.js
@@ -1,8 +1,9 @@
 import { expect } from 'chai';
 
 import { spec } from 'modules/pubgeniusBidAdapter.js';
-import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { config } from 'src/config.js';
+import { VIDEO } from 'src/mediaTypes.js';
+import { deepClone, parseQueryStringParameters } from 'src/utils.js';
 import { server } from 'test/mocks/xhr.js';
 
 const {
@@ -23,8 +24,8 @@ describe('pubGENIUS adapter', () => {
   });
 
   describe('supportedMediaTypes', () => {
-    it('should contain only banner', () => {
-      expect(supportedMediaTypes).to.deep.equal(['banner']);
+    it('should contain banner and video', () => {
+      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
     });
   });
 
@@ -77,6 +78,51 @@ describe('pubGENIUS adapter', () => {
 
       expect(isBidRequestValid(bid)).to.be.false;
     });
+
+    it('should return false without banner or video', () => {
+      bid.mediaTypes = {};
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
+
+    it('should return true with valid video media type', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+          mimes: ['video/mp4'],
+          protocols: [1],
+        },
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return true with valid video params', () => {
+      bid.params.video = {
+        placement: 1,
+        w: 200,
+        h: 200,
+        mimes: ['video/mp4'],
+        protocols: [1],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should return false without video protocols', () => {
+      bid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[100, 100]],
+        },
+      };
+      bid.params.video = {
+        mimes: ['video/mp4'],
+      };
+
+      expect(isBidRequestValid(bid)).to.be.false;
+    });
   });
 
   describe('buildRequests', () => {
@@ -122,6 +168,7 @@ describe('pubGENIUS adapter', () => {
         bidderCode: 'pubgenius',
         bidderRequestId: 'fakebidderrequestid',
         refererInfo: {},
+        timeout: 1200,
       };
 
       expectedRequest = {
@@ -142,14 +189,14 @@ describe('pubGENIUS adapter', () => {
           tmax: 1200,
           ext: {
             pbadapter: {
-              version: '1.0.0',
+              version: '1.1.0',
             },
           },
         },
       };
 
       config.setConfig({
-        bidderTimeout: 1200,
+        bidderTimeout: 1000,
         pageUrl: undefined,
         coppa: undefined,
       });
@@ -178,8 +225,8 @@ describe('pubGENIUS adapter', () => {
       expect(buildRequests([bidRequest, bidRequest1], bidderRequest)).to.deep.equal(expectedRequest);
     });
 
-    it('should take bid floor in bidder params', () => {
-      bidRequest.params.bidFloor = 0.5;
+    it('should take bid floor from getFloor interface', () => {
+      bidRequest.getFloor = () => ({ floor: 0.5, currency: 'USD' });
       expectedRequest.data.imp[0].bidfloor = 0.5;
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
@@ -200,6 +247,14 @@ describe('pubGENIUS adapter', () => {
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
     });
 
+    it('should use canonical URL over referer in refererInfo', () => {
+      bidderRequest.refererInfo.canonicalUrl = 'http://pageurl.org';
+      bidderRequest.refererInfo.referer = 'http://referer.org';
+      expectedRequest.data.site = { page: 'http://pageurl.org' };
+
+      expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
+    });
+
     it('should take gdprConsent when GDPR does not apply', () => {
       bidderRequest.gdprConsent = {
         gdprApplies: false,
@@ -248,7 +303,7 @@ describe('pubGENIUS adapter', () => {
           }
         ]
       };
-      bidderRequest.schain = deepClone(schain);
+      bidRequest.schain = deepClone(schain);
       expectedRequest.data.source = {
         ext: { schain: deepClone(schain) },
       };
@@ -305,6 +360,47 @@ describe('pubGENIUS adapter', () => {
 
       expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
     });
+
+    it('should build video imp', () => {
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [[200, 100]],
+          mimes: ['video/mp4'],
+          protocols: [2, 3],
+          api: [1, 2],
+          playbackmethod: [3, 4],
+          maxduration: 10,
+          linearity: 1,
+        },
+      };
+      bidRequest.params.video = {
+        minduration: 5,
+        maxduration: 100,
+        skip: 1,
+        skipafter: 1,
+        startdelay: -1,
+      };
+
+      delete expectedRequest.data.imp[0].banner;
+      expectedRequest.data.imp[0].video = {
+        mimes: ['video/mp4'],
+        minduration: 5,
+        maxduration: 100,
+        protocols: [2, 3],
+        w: 200,
+        h: 100,
+        startdelay: -1,
+        placement: 1,
+        skip: 1,
+        skipafter: 1,
+        playbackmethod: [3, 4],
+        api: [1, 2],
+        linearity: 1,
+      };
+
+      expect(buildRequests([bidRequest], bidderRequest)).to.deep.equal(expectedRequest);
+    });
   });
 
   describe('interpretResponse', () => {
@@ -361,6 +457,29 @@ describe('pubGENIUS adapter', () => {
     it('should interpret no bids', () => {
       expect(interpretResponse({ body: {} })).to.deep.equal([]);
     });
+
+    it('should interpret video response', () => {
+      serverResponse.body.seatbid[0].bid[0] = {
+        ...serverResponse.body.seatbid[0].bid[0],
+        nurl: 'http://vasturl/cache?id=x',
+        ext: {
+          pbadapter: {
+            mediaType: 'video',
+            cacheKey: 'x',
+          },
+        },
+      };
+
+      delete expectedBidResponse.ad;
+      expectedBidResponse = {
+        ...expectedBidResponse,
+        vastUrl: 'http://vasturl/cache?id=x',
+        vastXml: 'fake_creative',
+        mediaType: VIDEO,
+      };
+
+      expect(interpretResponse(serverResponse)).to.deep.equal([expectedBidResponse]);
+    });
   });
 
   describe('getUserSyncs', () => {
diff --git a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
index bb9aa20f1b4..890db8205be 100755
--- a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
@@ -1,4 +1,5 @@
 import pubmaticAnalyticsAdapter from 'modules/pubmaticAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager.js';
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
 import {
@@ -11,6 +12,12 @@ let events = require('src/events');
 let ajax = require('src/ajax');
 let utils = require('src/utils');
 
+const DEFAULT_USER_AGENT = window.navigator.userAgent;
+const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
+const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
+const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
+const setUANull = () => { window.navigator.__defineGetter__('userAgent', function () { return null }) };
+
 const {
   EVENTS: {
     AUCTION_INIT,
@@ -31,7 +38,8 @@ const BID = {
   'mediaType': 'video',
   'statusMessage': 'Bid available',
   'bidId': '2ecff0db240757',
-  'adId': 'fake_ad_id',
+  'partnerImpId': 'partnerImpressionID-1',
+  'adId': '2ecff0db240712',
   'source': 's2s',
   'requestId': '2ecff0db240757',
   'currency': 'USD',
@@ -61,6 +69,14 @@ const BID = {
     'hb_size': '640x480',
     'hb_source': 'server'
   },
+  'floorData': {
+    'cpmAfterAdjustments': 6.3,
+    'enforcements': {'enforceJS': true, 'enforcePBS': false, 'floorDeals': false, 'bidAdjustment': true},
+    'floorCurrency': 'USD',
+    'floorRule': 'banner',
+    'floorRuleValue': 1.1,
+    'floorValue': 1.1
+  },
   getStatusCode() {
     return 1;
   }
@@ -69,7 +85,8 @@ const BID = {
 const BID2 = Object.assign({}, BID, {
   adUnitCode: '/19968336/header-bid-tag-1',
   bidId: '3bd4ebb1c900e2',
-  adId: 'fake_ad_id_2',
+  partnerImpId: 'partnerImpressionID-2',
+  adId: '3bd4ebb1c900e2',
   requestId: '3bd4ebb1c900e2',
   width: 728,
   height: 90,
@@ -107,6 +124,30 @@ const MOCK = {
           'publisherId': '1001'
         }
       } ],
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[640, 480]]
+        },
+        'video': {
+          'sizes': [[640, 480]]
+        }
+      },
+      'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
+    },
+    {
+      'code': '/19968336/header-bid-tag-0',
+      'sizes': [[640, 480]],
+      'bids': [ {
+        'bidder': 'pubmatic',
+        'params': {
+          'publisherId': '1001'
+        }
+      } ],
+      'mediaTypes': {
+        'banner': {
+          'sizes': [[640, 480]]
+        }
+      },
       'transactionId': 'ca4af27a-6d02-4f90-949d-d5541fa12014'
     }
     ],
@@ -166,7 +207,18 @@ const MOCK = {
         'sizes': [[640, 480]],
         'bidId': '2ecff0db240757',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorMin': undefined,
+          'floorProvider': 'pubmatic',
+          'location': 'fetch',
+          'modelTimestamp': undefined,
+          'modelVersion': 'floorModelTest',
+          'modelWeight': undefined,
+          'skipRate': 0,
+          'skipped': false
+        }
       },
       {
         'bidder': 'pubmatic',
@@ -185,7 +237,18 @@ const MOCK = {
         'bidId': '3bd4ebb1c900e2',
         'seatBidId': 'aaaa-bbbb-cccc-dddd',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'floorData': {
+          'fetchStatus': 'success',
+          'floorMin': undefined,
+          'floorProvider': 'pubmatic',
+          'location': 'fetch',
+          'modelTimestamp': undefined,
+          'modelVersion': 'floorModelTest',
+          'modelWeight': undefined,
+          'skipRate': 0,
+          'skipped': false
+        }
       }
     ],
     'auctionStart': 1519149536560,
@@ -245,6 +308,7 @@ describe('pubmatic analytics adapter', function () {
   let clock;
 
   beforeEach(function () {
+    setUADefault();
     sandbox = sinon.sandbox.create();
 
     xhr = sandbox.useFakeXMLHttpRequest();
@@ -297,6 +361,10 @@ describe('pubmatic analytics adapter', function () {
         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]);
@@ -310,7 +378,7 @@ describe('pubmatic analytics adapter', function () {
       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&gdEn=1');
+      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');
@@ -320,17 +388,24 @@ describe('pubmatic analytics adapter', function () {
       expect(data.purl).to.equal('http://www.test.com/page.html');
       expect(data.orig).to.equal('www.test.com');
       expect(data.tst).to.equal(1519767016);
-      expect(data.cns).to.equal('here-goes-gdpr-consent-string');
-      expect(data.gdpr).to.equal(1);
+      expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(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].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].mt).to.be.an('array');
+      expect(data.s[0].mt[0]).to.equal(0);
       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].ps[0].pn).to.equal('pubmatic');
-      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240712');
+      expect(data.s[0].ps[0].piid).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');
@@ -347,13 +422,21 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       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(undefined);
       // slot 2
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(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].ps.length).to.equal(1);
+      expect(data.s[1].fskp).to.equal(0);
       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].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');
@@ -371,6 +454,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       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(undefined);
 
       // tracker slot1
       let firstTracker = requests[0].url;
@@ -381,14 +465,16 @@ describe('pubmatic analytics adapter', function () {
       expect(decodeURIComponent(data.purl)).to.equal('http://www.test.com/page.html');
       expect(data.tst).to.equal('1519767014');
       expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
-      expect(data.bidid).to.equal('2ecff0db240757');
+      expect(data.bidid).to.equal('2ecff0db240712');
       expect(data.pid).to.equal('1111');
       expect(data.pdvid).to.equal('20');
       expect(decodeURIComponent(data.slot)).to.equal('/19968336/header-bid-tag-0');
       expect(decodeURIComponent(data.kgpv)).to.equal('/19968336/header-bid-tag-0');
       expect(data.pn).to.equal('pubmatic');
+      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');
     });
 
     it('bidCpmAdjustment: USD: Logger: best case + win tracker', function() {
@@ -413,19 +499,27 @@ describe('pubmatic analytics adapter', function () {
       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&gdEn=1');
+      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.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(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].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].mt).to.be.an('array');
+      expect(data.s[0].mt[0]).to.equal(0);
       expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].fskp).to.equal(0);
       expect(data.s[0].ps).to.be.an('array');
       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].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240712');
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].eg).to.equal(1.23);
       expect(data.s[0].ps[0].en).to.equal(2.46);
@@ -433,6 +527,8 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[0].ps[0].af).to.equal('video');
       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(undefined);
+
       // tracker slot1
       let firstTracker = requests[0].url;
       expect(firstTracker.split('?')[0]).to.equal('https://t.pubmatic.com/wt');
@@ -446,6 +542,10 @@ describe('pubmatic analytics adapter', function () {
     });
 
     it('bidCpmAdjustment: JPY: Logger: best case + win tracker', function() {
+      config.setConfig({
+        testGroupId: 25
+      });
+
       setConfig({
         adServerCurrency: 'JPY',
         rates: {
@@ -475,19 +575,24 @@ describe('pubmatic analytics adapter', function () {
       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&gdEn=1');
+      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.tgid).to.equal(0);// test group id should be between 0-15 else set to 0
       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].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].mt).to.be.an('array');
+      expect(data.s[0].mt[0]).to.equal(0);
       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].ps[0].pn).to.equal('pubmatic');
-      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240757');
+      expect(data.s[0].ps[0].bc).to.equal('pubmatic');
+      expect(data.s[0].ps[0].bidid).to.equal('2ecff0db240712');
       expect(data.s[0].ps[0].kgpv).to.equal('/19968336/header-bid-tag-0');
       expect(data.s[0].ps[0].eg).to.equal(1);
       expect(data.s[0].ps[0].en).to.equal(200);
@@ -508,6 +613,10 @@ describe('pubmatic analytics adapter', function () {
     });
 
     it('Logger: when bid is not submitted, default bid status 1 check: pubmatic set as s2s', function() {
+      config.setConfig({
+        testGroupId: '25'
+      });
+
       events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
       events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
       events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
@@ -520,11 +629,18 @@ describe('pubmatic analytics adapter', function () {
       expect(requests.length).to.equal(2); // 1 logger and 1 win-tracker
       let request = requests[1]; // logger is executed late, trackers execute first
       let data = getLoggerJsonFromRequest(request.requestBody);
+      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].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
       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].db).to.equal(1);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -543,6 +659,7 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal(undefined);
       expect(data.s[1].ps[0].ocpm).to.equal(0);
       expect(data.s[1].ps[0].ocry).to.equal('USD');
+      expect(data.s[1].ps[0].frv).to.equal(undefined);
     });
 
     it('Logger: post-timeout check without bid response', function() {
@@ -557,10 +674,16 @@ describe('pubmatic analytics adapter', function () {
       let request = requests[0];
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
       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].db).to.equal(1);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -599,10 +722,16 @@ describe('pubmatic analytics adapter', function () {
       let request = requests[0];
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
       expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
       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].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -621,9 +750,11 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       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(undefined);
     });
 
     it('Logger: currency conversion check', function() {
+      setUANull();
       setConfig({
         adServerCurrency: 'JPY',
         rates: {
@@ -651,13 +782,18 @@ describe('pubmatic analytics adapter', function () {
       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&gdEn=1');
+      expect(request.url).to.equal('https://t.pubmatic.com/wl?pubid=9999');
       let data = getLoggerJsonFromRequest(request.requestBody);
       expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(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].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].db).to.equal(0);
       expect(data.s[1].ps[0].kgpv).to.equal('this-is-a-kgpv');
@@ -676,6 +812,610 @@ describe('pubmatic analytics adapter', function () {
       expect(data.s[1].ps[0].af).to.equal('banner');
       expect(data.s[1].ps[0].ocpm).to.equal(100);
       expect(data.s[1].ps[0].ocry).to.equal('JPY');
+      expect(data.dvc).to.deep.equal({'plt': 3});
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      setUAMobile();
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      expect(data.s[1].ps[0].ocpm).to.equal(1.52);
+      expect(data.s[1].ps[0].ocry).to.equal('USD');
+
+      expect(data.dvc).to.deep.equal({'plt': 2});
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      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, BID2_COPY);
+      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, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      expect(data.dvc).to.deep.equal({'plt': 1});
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      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, BID2_COPY);
+      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, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fmv).to.equal('floorModelTest');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].ft).to.equal(1);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fmv).to.equal('floorModelTest');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].ft).to.equal(1);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      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, BID2_COPY);
+      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, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fmv).to.equal('floorModelTest');
+      expect(data.s[1].fskp).to.equal(0);
+      expect(data.s[1].ft).to.equal(1);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.params', function() {
+      setUAMobile();
+      const BID_REQUESTED_COPY = utils.deepClone(MOCK.BID_REQUESTED);
+      BID_REQUESTED_COPY.bids[1].params.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, BID_REQUESTED_COPY);
+      events.emit(BID_RESPONSE, MOCK.BID_RESPONSE[0]);
+      events.emit(BID_RESPONSE, BID2);
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: regexPattern in bid.bidResponse', function() {
+      const BID2_COPY = utils.deepClone(BID2);
+      BID2_COPY.regexPattern = '*';
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      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, BID2_COPY);
+      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, Object.assign({}, BID2_COPY, {
+        'status': 'rendered'
+      }));
+
+      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[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].db).to.equal(0);
+      expect(data.s[1].ps[0].kgpv).to.equal('*');
+      expect(data.s[1].ps[0].kgpsv).to.equal('this-is-a-kgpv');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(0); // bidPriceUSD is not getting set as currency module is not added, so unable to set wb to 1
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // respective tracker slot
+      let firstTracker = requests[1].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.kgpv).to.equal('*');
+    });
+
+    it('Logger: best case + win tracker in case of Bidder Aliases', function() {
+      MOCK.BID_REQUESTED['bids'][0]['bidder'] = 'pubmatic_alias';
+      adapterManager.aliasRegistry['pubmatic_alias'] = 'pubmatic';
+
+      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.pubid).to.equal('9999');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.to).to.equal('3000');
+      expect(data.purl).to.equal('http://www.test.com/page.html');
+      expect(data.orig).to.equal('www.test.com');
+      expect(data.tst).to.equal(1519767016);
+      expect(data.tgid).to.equal(15);
+      expect(data.fmv).to.equal('floorModelTest');
+      expect(data.ft).to.equal(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].au).to.equal('/19968336/header-bid-tag-0');
+      expect(data.s[0].mt).to.be.an('array');
+      expect(data.s[0].mt[0]).to.equal(0);
+      expect(data.s[0].sz).to.deep.equal(['640x480']);
+      expect(data.s[0].fskp).to.equal(0);
+      expect(data.s[0].ps).to.be.an('array');
+      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('2ecff0db240712');
+      expect(data.s[0].ps[0].piid).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');
+      expect(data.s[0].ps[0].psz).to.equal('640x480');
+      expect(data.s[0].ps[0].eg).to.equal(1.23);
+      expect(data.s[0].ps[0].en).to.equal(1.23);
+      expect(data.s[0].ps[0].di).to.equal('');
+      expect(data.s[0].ps[0].dc).to.equal('');
+      expect(data.s[0].ps[0].l1).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);
+      expect(data.s[0].ps[0].wb).to.equal(1);
+      expect(data.s[0].ps[0].af).to.equal('video');
+      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);
+
+      // slot 2
+      expect(data.s[1].sn).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].au).to.equal('/19968336/header-bid-tag-1');
+      expect(data.s[1].mt).to.be.an('array');
+      expect(data.s[1].mt[0]).to.equal(0);
+      expect(data.s[1].mt[1]).to.equal(1);
+      expect(data.s[1].sz).to.deep.equal(['1000x300', '970x250', '728x90']);
+      expect(data.s[1].fskp).to.equal(0);
+      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].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');
+      expect(data.s[1].ps[0].psz).to.equal('728x90');
+      expect(data.s[1].ps[0].eg).to.equal(1.52);
+      expect(data.s[1].ps[0].en).to.equal(1.52);
+      expect(data.s[1].ps[0].di).to.equal('the-deal-id');
+      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].l1).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);
+      expect(data.s[1].ps[0].wb).to.equal(1);
+      expect(data.s[1].ps[0].af).to.equal('banner');
+      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(undefined);
+
+      // 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.pubid).to.equal('9999');
+      expect(decodeURIComponent(data.purl)).to.equal('http://www.test.com/page.html');
+      expect(data.tst).to.equal('1519767014');
+      expect(data.iid).to.equal('25c6d7f5-699a-4bfc-87c9-996f915341fa');
+      expect(data.bidid).to.equal('2ecff0db240712');
+      expect(data.pid).to.equal('1111');
+      expect(data.pdvid).to.equal('20');
+      expect(decodeURIComponent(data.slot)).to.equal('/19968336/header-bid-tag-0');
+      expect(decodeURIComponent(data.kgpv)).to.equal('/19968336/header-bid-tag-0');
+      expect(data.pn).to.equal('pubmatic');
+      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');
     });
   });
 });
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
index 15da34b1cf9..07b7f9eae4f 100644
--- a/test/spec/modules/pubmaticBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {spec} from 'modules/pubmaticBidAdapter.js';
+import {spec, checkVideoPlacement} from 'modules/pubmaticBidAdapter.js';
 import * as utils from 'src/utils.js';
 import {config} from 'src/config.js';
 import { createEidsArray } from 'modules/userId/eids.js';
@@ -58,7 +58,7 @@ describe('PubMatic adapter', function () {
         }
       },
       params: {
-        publisherId: '301',
+        publisherId: '5670',
         adSlot: '/15671365/DMDemo@300x250:0',
         kadfloor: '1.2',
         pmzoneid: 'aabc, ddef',
@@ -90,45 +90,6 @@ describe('PubMatic adapter', function () {
     secoundBid.bidId = '22bddb28db77e';
 
     bidRequests = [firstBid, secoundBid];
-    firstResponse = {
-      'seat': 'seat-id',
-      'ext': {
-        'buyid': 'BUYER-ID-987'
-      },
-      'bid': [{
-        'id': '74858439-49D7-4169-BA5D-44A046315B2F',
-        'impid': '23acc48ad47af5',
-        'price': 1.3,
-        'adm': 'image3.pubmatic.com Layer based creative',
-        'adomain': ['blackrock.com'],
-        'h': 250,
-        'w': 300,
-        'ext': {
-          'deal_channel': 6,
-          'advid': 976,
-          'dspid': 123
-        }
-      }]
-    };
-    secoundResponse = {
-      'ext': {
-        'buyid': 'BUYER-ID-789'
-      },
-      'bid': [{
-        'id': '74858439-49D7-4169-BA5D-44A046315BEF',
-        'impid': '22bddb28db77e',
-        'price': 1.7,
-        'adm': 'image3.pubmatic.com Layer based creative',
-        'adomain': ['hivehome.com'],
-        'h': 250,
-        'w': 300,
-        'ext': {
-          'deal_channel': 5,
-          'advid': 832,
-          'dspid': 422
-        }
-      }]
-    };
 
     videoBidRequests = [{
       code: 'video1',
@@ -164,7 +125,7 @@ describe('PubMatic adapter', function () {
     multipleMediaRequests = [{
       bidder: 'pubmatic',
       params: {
-        publisherId: '301',
+        publisherId: '5670',
         adSlot: '/15671365/DMDemo@300x250:0',
         kadfloor: '1.2',
         pmzoneid: 'aabc, ddef',
@@ -364,7 +325,7 @@ describe('PubMatic adapter', function () {
         },
         bidder: 'pubmatic',
         params: {
-          publisherId: '301',
+          publisherId: '5670',
           adSlot: '/15671365/DMDemo@300x250:0',
           kadfloor: '1.2',
           pmzoneid: 'aabc, ddef',
@@ -433,7 +394,7 @@ describe('PubMatic adapter', function () {
         },
         bidder: 'pubmatic',
         params: {
-          publisherId: '301',
+          publisherId: '5670',
           adSlot: '/15671365/DMDemo@300x250:0',
           kadfloor: '1.2',
           pmzoneid: 'aabc, ddef',
@@ -486,7 +447,7 @@ describe('PubMatic adapter', function () {
         },
         bidder: 'pubmatic',
         params: {
-          publisherId: '301',
+          publisherId: '5670',
           adSlot: '/15671365/DMDemo@300x250:0',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
@@ -547,7 +508,7 @@ describe('PubMatic adapter', function () {
         },
         bidder: 'pubmatic',
         params: {
-          publisherId: '301',
+          publisherId: '5670',
           adSlot: '/15671365/DMDemo@300x250:0',
           video: {
             mimes: ['video/mp4', 'video/x-flv'],
@@ -576,6 +537,46 @@ describe('PubMatic adapter', function () {
       }
     ];
 
+    firstResponse = {
+      'seat': 'seat-id',
+      'ext': {
+        'buyid': 'BUYER-ID-987'
+      },
+      'bid': [{
+        'id': '74858439-49D7-4169-BA5D-44A046315B2F',
+        'impid': '23acc48ad47af5',
+        'price': 1.3,
+        'adm': 'image3.pubmatic.com Layer based creative',
+        'adomain': ['blackrock.com'],
+        'h': 250,
+        'w': 300,
+        'ext': {
+          'deal_channel': 6,
+          'advid': 976,
+          'dspid': 123
+        }
+      }]
+    };
+
+    secoundResponse = {
+      'ext': {
+        'buyid': 'BUYER-ID-789'
+      },
+      'bid': [{
+        'id': '74858439-49D7-4169-BA5D-44A046315BEF',
+        'impid': '22bddb28db77e',
+        'price': 1.7,
+        'adm': 'image3.pubmatic.com Layer based creative',
+        'adomain': ['hivehome.com'],
+        'h': 250,
+        'w': 300,
+        'ext': {
+          'deal_channel': 5,
+          'advid': 832,
+          'dspid': 422
+        }
+      }]
+    };
     bidResponses = {
       'body': {
         'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
@@ -669,7 +670,7 @@ describe('PubMatic adapter', function () {
           }]
         }]
       }
-    }
+    };
 
     outstreamBidRequest =
     [
@@ -687,7 +688,7 @@ describe('PubMatic adapter', function () {
         bidderRequestId: '1c56ad30b9b8ca8',
         transactionId: '92489f71-1bf2-49a0-adf9-000cea934729',
         params: {
-          publisherId: '5890',
+          publisherId: '5670',
           outstreamAU: 'pubmatic-test',
           adSlot: 'Div1@0x0', // ad_id or tagid
           video: {
@@ -701,13 +702,13 @@ describe('PubMatic adapter', function () {
     ];
 
     validOutstreamBidRequest = {
-      auctionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+      'auctionId': '92489f71-1bf2-49a0-adf9-000cea934729',
       auctionStart: 1585918458868,
       bidderCode: 'pubmatic',
       bidderRequestId: '47acc48ad47af5',
       bids: [{
         adUnitCode: 'video1',
-        auctionId: '92489f71-1bf2-49a0-adf9-000cea934729',
+        'auctionId': '92489f71-1bf2-49a0-adf9-000cea934729',
         bidId: '47acc48ad47af5',
         bidRequestsCount: 1,
         bidder: 'pubmatic',
@@ -718,7 +719,7 @@ describe('PubMatic adapter', function () {
           }
         },
         params: {
-          publisherId: '5890',
+          publisherId: '5670',
           outstreamAU: 'pubmatic-test',
           adSlot: 'Div1@0x0', // ad_id or tagid
           video: {
@@ -752,16 +753,16 @@ describe('PubMatic adapter', function () {
           }]
         }]
       }
-    }
+    };
   });
 
   describe('implementation', function () {
   	describe('Bid validations', function () {
   		it('valid bid case', function () {
-		  let validBid = {
+        let validBid = {
 	        bidder: 'pubmatic',
 	        params: {
-	          publisherId: '301',
+	          publisherId: '5670',
 	          adSlot: '/15671365/DMDemo@300x250:0'
 	        }
 	      },
@@ -770,7 +771,7 @@ describe('PubMatic adapter', function () {
   		});
 
       it('invalid bid case: publisherId not passed', function () {
-		    let validBid = {
+        let validBid = {
 	        bidder: 'pubmatic',
 	        params: {
 	          adSlot: '/15671365/DMDemo@300x250:0'
@@ -840,64 +841,211 @@ describe('PubMatic adapter', function () {
           },
           isValid = spec.isBidRequestValid(validBid);
         expect(isValid).to.equal(true);
+        it('should check for context if video is present', function() {
+          let bid = {
+              'bidder': 'pubmatic',
+              'params': {
+                'adSlot': 'SLOT_NHB1@728x90',
+                'publisherId': '5890'
+              },
+              'mediaTypes': {
+                'video': {
+                  'playerSize': [
+                    [640, 480]
+                  ],
+                  'protocols': [1, 2, 5],
+                  'context': 'instream',
+                  'mimes': ['video/flv'],
+                  'skippable': false,
+                  'skip': 1,
+                  'linearity': 2
+                }
+              },
+              'adUnitCode': 'video1',
+              'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+              'sizes': [
+                [640, 480]
+              ],
+              'bidId': '2c95df014cfe97',
+              'bidderRequestId': '1fe59391566442',
+              'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+              'src': 'client',
+              'bidRequestsCount': 1,
+              'bidderRequestsCount': 1,
+              'bidderWinsCount': 0
+            },
+            isValid = spec.isBidRequestValid(bid);
+          expect(isValid).to.equal(true);
+        })
+
+        it('should return false if context is not present in video', function() {
+          let bid = {
+              'bidder': 'pubmatic',
+              'params': {
+                'adSlot': 'SLOT_NHB1@728x90',
+                'publisherId': '5890'
+              },
+              'mediaTypes': {
+                'video': {
+                  'w': 640,
+                  'h': 480,
+                  'protocols': [1, 2, 5],
+                  'mimes': ['video/flv'],
+                  'skippable': false,
+                  'skip': 1,
+                  'linearity': 2
+                }
+              },
+              'adUnitCode': 'video1',
+              'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+              'sizes': [
+                [640, 480]
+              ],
+              'bidId': '2c95df014cfe97',
+              'bidderRequestId': '1fe59391566442',
+              'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+              'src': 'client',
+              'bidRequestsCount': 1,
+              'bidderRequestsCount': 1,
+              'bidderWinsCount': 0
+            },
+            isValid = spec.isBidRequestValid(bid);
+          expect(isValid).to.equal(false);
+        })
+
+        it('bid.mediaTypes.video.mimes OR bid.params.video.mimes should be present and must be a non-empty array', function() {
+          let bid = {
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5890',
+              'video': {}
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'skippable': false,
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '2c95df014cfe97',
+            'bidderRequestId': '1fe59391566442',
+            'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          };
+
+          delete bid.params.video.mimes; // Undefined
+          bid.mediaTypes.video.mimes = 'string'; // NOT array
+          expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+          delete bid.params.video.mimes; // Undefined
+          delete bid.mediaTypes.video.mimes; // Undefined
+          expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+          delete bid.params.video.mimes; // Undefined
+          bid.mediaTypes.video.mimes = ['video/flv']; // Valid
+          expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+          delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+          bid.params.video = {mimes: 'string'}; // NOT array
+          expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+          delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+          delete bid.params.video.mimes; // Undefined
+          expect(spec.isBidRequestValid(bid)).to.equal(false);
+
+          delete bid.mediaTypes.video.mimes; // mediaTypes.video.mimes undefined
+          bid.params.video.mimes = ['video/flv']; // Valid
+          expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+          delete bid.mediaTypes.video.mimes; // Undefined
+          bid.params.video.mimes = ['video/flv']; // Valid
+          expect(spec.isBidRequestValid(bid)).to.equal(true);
+
+          delete bid.mediaTypes.video.mimes; // Undefined
+          delete bid.params.video.mimes; // Undefined
+          expect(spec.isBidRequestValid(bid)).to.equal(false);
+        });
       });
-    });
 
   	describe('Request formation', function () {
   		it('buildRequests function should not modify original bidRequests object', function () {
-        let originalBidRequests = utils.deepClone(bidRequests);
-        let request = spec.buildRequests(bidRequests);
-        expect(bidRequests).to.deep.equal(originalBidRequests);
-      });
+          let originalBidRequests = utils.deepClone(bidRequests);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          expect(bidRequests).to.deep.equal(originalBidRequests);
+        });
 
-      it('buildRequests function should not modify original nativebidRequests object', function () {
-        let originalBidRequests = utils.deepClone(nativeBidRequests);
-        let request = spec.buildRequests(nativeBidRequests);
-        expect(nativeBidRequests).to.deep.equal(originalBidRequests);
-      });
+        it('buildRequests function should not modify original nativebidRequests object', function () {
+          let originalBidRequests = utils.deepClone(nativeBidRequests);
+          let request = spec.buildRequests(nativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          expect(nativeBidRequests).to.deep.equal(originalBidRequests);
+        });
 
-      it('Endpoint checking', function () {
-  		  let request = spec.buildRequests(bidRequests);
-        expect(request.url).to.equal('https://hbopenbid.pubmatic.com/translator?source=prebid-client');
-        expect(request.method).to.equal('POST');
-      });
+        it('Endpoint checking', function () {
+  		  let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          expect(request.url).to.equal('https://hbopenbid.pubmatic.com/translator?source=ow-client');
+          expect(request.method).to.equal('POST');
+        });
 
-      it('should return bidderRequest property', function() {
-        let request = spec.buildRequests(bidRequests, validOutstreamBidRequest);
-        expect(request.bidderRequest).to.equal(validOutstreamBidRequest);
-      });
+        it('should return bidderRequest property', function() {
+          let request = spec.buildRequests(bidRequests, validOutstreamBidRequest);
+          expect(request.bidderRequest).to.equal(validOutstreamBidRequest);
+        });
 
-      it('bidderRequest should be undefined if bidderRequest is not present', function() {
-        let request = spec.buildRequests(bidRequests);
-        expect(request.bidderRequest).to.be.undefined;
-      });
+        it('bidderRequest should be undefined if bidderRequest is not present', function() {
+          let request = spec.buildRequests(bidRequests);
+          expect(request.bidderRequest).to.be.undefined;
+        });
 
-      it('test flag not sent when pubmaticTest=true is absent in page url', function() {
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.test).to.equal(undefined);
-      });
+        it('test flag not sent when pubmaticTest=true is absent in page url', function() {
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.test).to.equal(undefined);
+        });
 
-      // disabled this test case as  it refreshes the whole suite when in karma watch mode
-      // todo: needs a fix
-      xit('test flag set to 1 when pubmaticTest=true is present in page url', function() {
-        window.location.href += '#pubmaticTest=true';
-        // now all the test cases below will have window.location.href with #pubmaticTest=true
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.test).to.equal(1);
-      });
+        // disabled this test case as  it refreshes the whole suite when in karma watch mode
+        // todo: needs a fix
+        xit('test flag set to 1 when pubmaticTest=true is present in page url', function() {
+          window.location.href += '#pubmaticTest=true';
+          // now all the test cases below will have window.location.href with #pubmaticTest=true
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.test).to.equal(1);
+        });
 
   		it('Request params check', function () {
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
   		  expect(data.at).to.equal(1); // auction type
   		  expect(data.cur[0]).to.equal('USD'); // currency
   		  expect(data.site.domain).to.be.a('string'); // domain should be set
   		  expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
   		  expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
-        expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-        expect(data.site.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
   		  expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
   		  expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
   		  expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
@@ -906,7 +1054,7 @@ describe('PubMatic adapter', function () {
   		  expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
   		  expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
   		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
-        expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+          expect(data.source.tid).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
   		  expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
   		  expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
   		  expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
@@ -917,288 +1065,420 @@ describe('PubMatic adapter', function () {
   		  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
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-        expect(data.source.ext.schain).to.deep.equal(bidRequests[0].schain);
+          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);
   		});
 
-      it('Merge the device info from config', function() {
-        let sandbox = sinon.sandbox.create();
-        sandbox.stub(config, 'getConfig').callsFake((key) => {
-          var config = {
-            device: {
-              'newkey': 'new-device-data'
-            }
+        it('Set content from config, set site.content', function() {
+          let sandbox = sinon.sandbox.create();
+          const content = {
+            'id': 'alpha-numeric-id'
           };
-          return config[key];
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              content: content
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.site.content).to.deep.equal(content);
+          sandbox.restore();
         });
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.device.js).to.equal(1);
-        expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
-        expect(data.device.h).to.equal(screen.height);
-        expect(data.device.w).to.equal(screen.width);
-        expect(data.device.language).to.equal(navigator.language);
-        expect(data.device.newkey).to.equal('new-device-data');// additional data from config
-        sandbox.restore();
-      });
 
-      it('Merge the device info from config; data from config overrides the info we have gathered', function() {
-        let sandbox = sinon.sandbox.create();
-        sandbox.stub(config, 'getConfig').callsFake((key) => {
-          var config = {
-            device: {
-              newkey: 'new-device-data',
-              language: 'MARATHI'
-            }
+        it('Merge the device info from config', function() {
+          let sandbox = sinon.sandbox.create();
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              device: {
+                'newkey': 'new-device-data'
+              }
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.device.js).to.equal(1);
+          expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
+          expect(data.device.h).to.equal(screen.height);
+          expect(data.device.w).to.equal(screen.width);
+          expect(data.device.language).to.equal(navigator.language);
+          expect(data.device.newkey).to.equal('new-device-data');// additional data from config
+          sandbox.restore();
+        });
+
+        it('Merge the device info from config; data from config overrides the info we have gathered', function() {
+          let sandbox = sinon.sandbox.create();
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              device: {
+                newkey: 'new-device-data',
+                language: 'MARATHI'
+              }
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.device.js).to.equal(1);
+          expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
+          expect(data.device.h).to.equal(screen.height);
+          expect(data.device.w).to.equal(screen.width);
+          expect(data.device.language).to.equal('MARATHI');// // data overriding from config
+          expect(data.device.newkey).to.equal('new-device-data');// additional data from config
+          sandbox.restore();
+        });
+
+        it('Set app from config, copy publisher and ext from site, unset site', function() {
+          let sandbox = sinon.sandbox.create();
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              app: {
+                bundle: 'org.prebid.mobile.demoapp',
+                domain: 'prebid.org'
+              }
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
+          expect(data.app.domain).to.equal('prebid.org');
+          expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
+          expect(data.site).to.not.exist;
+          sandbox.restore();
+        });
+
+        it('Set app, content from config, copy publisher and ext from site, unset site, config.content in app.content', function() {
+          let sandbox = sinon.sandbox.create();
+          const content = {
+            'id': 'alpha-numeric-id'
           };
-          return config[key];
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              content: content,
+              app: {
+                bundle: 'org.prebid.mobile.demoapp',
+                domain: 'prebid.org'
+              }
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
+          expect(data.app.domain).to.equal('prebid.org');
+          expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
+          expect(data.app.content).to.deep.equal(content);
+          expect(data.site).to.not.exist;
+          sandbox.restore();
         });
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.device.js).to.equal(1);
-        expect(data.device.dnt).to.equal((navigator.doNotTrack == 'yes' || navigator.doNotTrack == '1' || navigator.msDoNotTrack == '1') ? 1 : 0);
-        expect(data.device.h).to.equal(screen.height);
-        expect(data.device.w).to.equal(screen.width);
-        expect(data.device.language).to.equal('MARATHI');// // data overriding from config
-        expect(data.device.newkey).to.equal('new-device-data');// additional data from config
-        sandbox.restore();
-      });
 
-      it('Set app from config, copy publisher and ext from site, unset site', function() {
-        let sandbox = sinon.sandbox.create();
-        sandbox.stub(config, 'getConfig').callsFake((key) => {
-          var config = {
-            app: {
-              bundle: 'org.prebid.mobile.demoapp',
-              domain: 'prebid.org'
-            }
+        it('Set app.content, content from config, copy publisher and ext from site, unset site, config.app.content in app.content', function() {
+          let sandbox = sinon.sandbox.create();
+          const content = {
+            'id': 'alpha-numeric-id'
           };
-          return config[key];
+          const appContent = {
+            id: 'app-content-id-2'
+          };
+          sandbox.stub(config, 'getConfig').callsFake((key) => {
+            var config = {
+              content: content,
+              app: {
+                bundle: 'org.prebid.mobile.demoapp',
+                domain: 'prebid.org',
+                content: appContent
+              }
+            };
+            return config[key];
+          });
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
+          expect(data.app.domain).to.equal('prebid.org');
+          expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
+          expect(data.app.content).to.deep.equal(appContent);
+          expect(data.site).to.not.exist;
+          sandbox.restore();
         });
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.app.bundle).to.equal('org.prebid.mobile.demoapp');
-        expect(data.app.domain).to.equal('prebid.org');
-        expect(data.app.publisher.id).to.equal(bidRequests[0].params.publisherId);
-        expect(data.app.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
-        expect(data.site).to.not.exist;
-        sandbox.restore();
-      });
 
-      it('Request params check: without adSlot', function () {
-        delete bidRequests[0].params.adSlot;
+        it('Request params check: without adSlot', function () {
+          delete bidRequests[0].params.adSlot;
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.at).to.equal(1); // auction type
+          expect(data.cur[0]).to.equal('USD'); // currency
+          expect(data.site.domain).to.be.a('string'); // domain should be set
+          expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
+          expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+          expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
+          expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
+          expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
+          expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+          expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
+          expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+          expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+          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.deep.equal(undefined); // tagid
+          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.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);
+        });
 
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.at).to.equal(1); // auction type
-        expect(data.cur[0]).to.equal('USD'); // currency
-        expect(data.site.domain).to.be.a('string'); // domain should be set
-        expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
-        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
-        expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-        expect(data.site.ext.key_val).to.exist.and.to.equal(bidRequests[0].params.dctr);
-        expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
-        expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
-        expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
-        expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
-        expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
-        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.deep.equal(undefined); // tagid
-        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.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);
-      });
+        it('Request params multi size format object check', function () {
+          let bidRequests = [
+            {
+              bidder: 'pubmatic',
+              params: {
+                publisherId: '301',
+                adSlot: '/15671365/DMDemo@300x250:0',
+                kadfloor: '1.2',
+                pmzoneid: 'aabc, ddef',
+                kadpageurl: 'www.publisher.com',
+                yob: '1986',
+                gender: 'M',
+                lat: '12.3',
+                lon: '23.7',
+                wiid: '1234567890',
+                profId: '100',
+                verId: '200',
+                currency: 'AUD'
+              },
+              placementCode: '/19968336/header-bid-tag-1',
+              bidId: '23acc48ad47af5',
+              requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+              bidderRequestId: '1c56ad30b9b8ca8',
+              transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+            }
+          ];
+          /* case 1 - size passed in adslot */
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
 
-      it('Request params multi size format object check', function () {
-        let bidRequests = [
-          {
-            bidder: 'pubmatic',
-            params: {
-              publisherId: '301',
-              adSlot: '/15671365/DMDemo@300x250:0',
-              kadfloor: '1.2',
-              pmzoneid: 'aabc, ddef',
-              kadpageurl: 'www.publisher.com',
-              yob: '1986',
-              gender: 'M',
-              lat: '12.3',
-              lon: '23.7',
-              wiid: '1234567890',
-              profId: '100',
-              verId: '200',
-              currency: 'AUD'
-            },
-            placementCode: '/19968336/header-bid-tag-1',
-            bidId: '23acc48ad47af5',
-            requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-            bidderRequestId: '1c56ad30b9b8ca8',
-            transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-          }
-        ];
-        /* case 1 - size passed in adslot */
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
+          expect(data.imp[0].banner.w).to.equal(300); // width
+          expect(data.imp[0].banner.h).to.equal(250); // height
 
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
+          /* case 2 - size passed in adslot as well as in sizes array */
+          bidRequests[0].sizes = [[300, 600], [300, 250]];
+          bidRequests[0].mediaTypes = {
+            banner: {
+              sizes: [[300, 600], [300, 250]]
+            }
+          };
+          request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
 
-        /* case 2 - size passed in adslot as well as in sizes array */
-        bidRequests[0].sizes = [[300, 600], [300, 250]];
-        bidRequests[0].mediaTypes = {
-          banner: {
-            sizes: [[300, 600], [300, 250]]
-          }
-        };
-        request = spec.buildRequests(bidRequests);
-        data = JSON.parse(request.data);
+          expect(data.imp[0].banner.w).to.equal(300); // width
+          expect(data.imp[0].banner.h).to.equal(250); // height
 
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
+          /* case 3 - size passed in sizes but not in adslot , also if fluid is present it should be ignored */
+          bidRequests[0].params.adSlot = '/15671365/DMDemo';
+          bidRequests[0].sizes = [[300, 250], [300, 600], 'fluid'];
+          bidRequests[0].mediaTypes = {
+            banner: {
+              sizes: [[300, 250], [300, 600]]
+            }
+          };
+          request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
 
-        /* case 3 - size passed in sizes but not in adslot , also if fluid is present it should be ignored */
-        bidRequests[0].params.adSlot = '/15671365/DMDemo';
-        bidRequests[0].sizes = [[300, 250], [300, 600], 'fluid'];
-        bidRequests[0].mediaTypes = {
-          banner: {
-            sizes: [[300, 250], [300, 600]]
-          }
-        };
-        request = spec.buildRequests(bidRequests);
-        data = JSON.parse(request.data);
+          expect(data.imp[0].banner.w).to.equal(300); // width
+          expect(data.imp[0].banner.h).to.equal(250); // height
+          expect(data.imp[0].banner.format).exist.and.to.be.an('array');
+          expect(data.imp[0].banner.format[0]).exist.and.to.be.an('object');
+          expect(data.imp[0].banner.format[0].w).to.equal(300); // width
+          expect(data.imp[0].banner.format[0].h).to.equal(600); // height
 
-        expect(data.imp[0].banner.w).to.equal(300); // width
-        expect(data.imp[0].banner.h).to.equal(250); // height
-        expect(data.imp[0].banner.format).exist.and.to.be.an('array');
-        expect(data.imp[0].banner.format[0]).exist.and.to.be.an('object');
-        expect(data.imp[0].banner.format[0].w).to.equal(300); // width
-        expect(data.imp[0].banner.format[0].h).to.equal(600); // height
+          expect(data.imp[0].banner.format[1]).to.deep.equal(undefined); // fluid size should not be present
 
-        expect(data.imp[0].banner.format[1]).to.deep.equal(undefined); // fluid size should not be present
+          /* case 4 when fluid is an array */
+          bidRequests[0].sizes = [[300, 250], [300, 600], ['fluid']];
+          request = spec.buildRequests(bidRequests, {
+            'auctionId': 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          expect(data.imp[0].banner.format[1]).to.deep.equal(undefined); // fluid size should not be present
+        });
 
-        /* case 4 when fluid is an array */
-        bidRequests[0].sizes = [[300, 250], [300, 600], ['fluid']];
-        request = spec.buildRequests(bidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].banner.format[1]).to.deep.equal(undefined); // fluid size should not be present
-      });
+        it('Request params currency check', function () {
+          let multipleBidRequests = [
+            {
+              bidder: 'pubmatic',
+              params: {
+                publisherId: '301',
+                adSlot: '/15671365/DMDemo@300x250:0',
+                kadfloor: '1.2',
+                pmzoneid: 'aabc, ddef',
+                kadpageurl: 'www.publisher.com',
+                yob: '1986',
+                gender: 'M',
+                lat: '12.3',
+                lon: '23.7',
+                wiid: '1234567890',
+                profId: '100',
+                verId: '200',
+                currency: 'AUD'
+              },
+              placementCode: '/19968336/header-bid-tag-1',
+              sizes: [[300, 250], [300, 600]],
+              bidId: '23acc48ad47af5',
+              requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+              bidderRequestId: '1c56ad30b9b8ca8',
+              transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+            },
+            {
+              bidder: 'pubmatic',
+              params: {
+                publisherId: '301',
+                adSlot: '/15671365/DMDemo@300x250:0',
+                kadfloor: '1.2',
+                pmzoneid: 'aabc, ddef',
+                kadpageurl: 'www.publisher.com',
+                yob: '1986',
+                gender: 'M',
+                lat: '12.3',
+                lon: '23.7',
+                wiid: '1234567890',
+                profId: '100',
+                verId: '200',
+                currency: 'GBP'
+              },
+              placementCode: '/19968336/header-bid-tag-1',
+              sizes: [[300, 250], [300, 600]],
+              bidId: '23acc48ad47af5',
+              requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+              bidderRequestId: '1c56ad30b9b8ca8',
+              transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+            }
+          ];
 
-      it('Request params currency check', function () {
-        let multipleBidRequests = [
-          {
-            bidder: 'pubmatic',
-            params: {
-              publisherId: '301',
-              adSlot: '/15671365/DMDemo@300x250:0',
-              kadfloor: '1.2',
-              pmzoneid: 'aabc, ddef',
-              kadpageurl: 'www.publisher.com',
-              yob: '1986',
-              gender: 'M',
-              lat: '12.3',
-              lon: '23.7',
-              wiid: '1234567890',
-              profId: '100',
-              verId: '200',
-              currency: 'AUD'
-            },
-            placementCode: '/19968336/header-bid-tag-1',
-            sizes: [[300, 250], [300, 600]],
-            bidId: '23acc48ad47af5',
-            requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-            bidderRequestId: '1c56ad30b9b8ca8',
-            transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-          },
-          {
-            bidder: 'pubmatic',
-            params: {
-              publisherId: '301',
-              adSlot: '/15671365/DMDemo@300x250:0',
-              kadfloor: '1.2',
-              pmzoneid: 'aabc, ddef',
-              kadpageurl: 'www.publisher.com',
-              yob: '1986',
-              gender: 'M',
-              lat: '12.3',
-              lon: '23.7',
-              wiid: '1234567890',
-              profId: '100',
-              verId: '200',
-              currency: 'GBP'
-            },
-            placementCode: '/19968336/header-bid-tag-1',
-            sizes: [[300, 250], [300, 600]],
-            bidId: '23acc48ad47af5',
-            requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-            bidderRequestId: '1c56ad30b9b8ca8',
-            transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-          }
-        ];
-
-        /* case 1 -
+          /* case 1 -
             currency specified in both adunits
             output: imp[0] and imp[1] both use currency specified in bidRequests[0].params.currency
 
         */
-        let request = spec.buildRequests(multipleBidRequests);
-        let data = JSON.parse(request.data);
+          let request = spec.buildRequests(multipleBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
 
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-        expect(data.imp[1].bidfloorcur).to.equal(bidRequests[0].params.currency);
+          expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
+          expect(data.imp[1].bidfloorcur).to.equal(bidRequests[0].params.currency);
 
-        /* case 2 -
+          /* case 2 -
             currency specified in only 1st adunit
             output: imp[0] and imp[1] both use currency specified in bidRequests[0].params.currency
 
         */
-        delete multipleBidRequests[1].params.currency;
-        request = spec.buildRequests(multipleBidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
-        expect(data.imp[1].bidfloorcur).to.equal(bidRequests[0].params.currency);
+          delete multipleBidRequests[1].params.currency;
+          request = spec.buildRequests(multipleBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          expect(data.imp[0].bidfloorcur).to.equal(bidRequests[0].params.currency);
+          expect(data.imp[1].bidfloorcur).to.equal(bidRequests[0].params.currency);
 
-        /* case 3 -
+          /* case 3 -
             currency specified in only 1st adunit
             output: imp[0] and imp[1] both use default currency - USD
 
         */
-        delete multipleBidRequests[0].params.currency;
-        request = spec.buildRequests(multipleBidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].bidfloorcur).to.equal('USD');
-        expect(data.imp[1].bidfloorcur).to.equal('USD');
+          delete multipleBidRequests[0].params.currency;
+          request = spec.buildRequests(multipleBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          expect(data.imp[0].bidfloorcur).to.equal('USD');
+          expect(data.imp[1].bidfloorcur).to.equal('USD');
 
-        /* case 4 -
+          /* case 4 -
             currency not specified in 1st adunit but specified in 2nd adunit
             output: imp[0] and imp[1] both use default currency - USD
 
         */
-        multipleBidRequests[1].params.currency = 'AUD';
-        request = spec.buildRequests(multipleBidRequests);
-        data = JSON.parse(request.data);
-        expect(data.imp[0].bidfloorcur).to.equal('USD');
-        expect(data.imp[1].bidfloorcur).to.equal('USD');
-      });
+          multipleBidRequests[1].params.currency = 'AUD';
+          request = spec.buildRequests(multipleBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          expect(data.imp[0].bidfloorcur).to.equal('USD');
+          expect(data.imp[1].bidfloorcur).to.equal('USD');
+        });
 
-      it('Request params check with GDPR Consent', function () {
-        let bidRequest = {
-          gdprConsent: {
-            consentString: 'kjfdniwjnifwenrif3',
-            gdprApplies: true
-          }
-        };
+        it('Pass auctiondId as wiid if wiid is not passed in params', function () {
+          delete bidRequests[0].params.wiid;
+          delete bidRequests[1].params.wiid;
+          let bidRequest = {
+            'auctionId': 'new-auction-id'
+          };
+          let request = spec.buildRequests(bidRequests, bidRequest);
+          let data = JSON.parse(request.data);
+          expect(data.at).to.equal(1); // auction type
+          expect(data.cur[0]).to.equal('USD'); // currency
+          expect(data.site.domain).to.be.a('string'); // domain should be set
+          expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
+          expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+          expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
+          expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
+          expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
+          expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+          expect(data.ext.wrapper.wiid).to.equal('new-auction-id'); // OpenWrap: Wrapper Impression ID
+          expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+          expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+
+          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].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
+        });
+
+        it('Request params check with GDPR Consent', function () {
+          let bidRequest = {
+            gdprConsent: {
+              consentString: 'kjfdniwjnifwenrif3',
+              gdprApplies: true
+            }
+          };
   		  let request = spec.buildRequests(bidRequests, bidRequest);
   		  let data = JSON.parse(request.data);
-        expect(data.user.ext.consent).to.equal('kjfdniwjnifwenrif3');
-        expect(data.regs.ext.gdpr).to.equal(1);
+          expect(data.user.ext.consent).to.equal('kjfdniwjnifwenrif3');
+          expect(data.regs.ext.gdpr).to.equal(1);
   		  expect(data.at).to.equal(1); // auction type
   		  expect(data.cur[0]).to.equal('USD'); // currency
   		  expect(data.site.domain).to.be.a('string'); // domain should be set
@@ -1213,7 +1493,7 @@ describe('PubMatic adapter', function () {
   		  expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
   		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
   		  expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
-        expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+          expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
   		  expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
 
   		  expect(data.imp[0].id).to.equal(bidRequests[0].bidId); // Prebid bid id is passed as id
@@ -1224,790 +1504,1092 @@ describe('PubMatic adapter', function () {
   		  expect(data.imp[0].ext.pmZoneId).to.equal(bidRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
   		});
 
-      it('Request params check with USP/CCPA Consent', function () {
-        let bidRequest = {
-          uspConsent: '1NYN'
-        };
-        let request = spec.buildRequests(bidRequests, bidRequest);
-        let data = JSON.parse(request.data);
-        expect(data.regs.ext.us_privacy).to.equal('1NYN');// USP/CCPAs
-        expect(data.at).to.equal(1); // auction type
-        expect(data.cur[0]).to.equal('USD'); // currency
-        expect(data.site.domain).to.be.a('string'); // domain should be set
-        expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
-        expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
-        expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
-        expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
-        expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
-        expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
-        expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
-        expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
-
-        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].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
-
-        // second request without USP/CCPA
-        let request2 = spec.buildRequests(bidRequests, {});
-        let data2 = JSON.parse(request2.data);
-        expect(data2.regs).to.equal(undefined);// USP/CCPAs
-      });
+        it('Request params check with USP/CCPA Consent', function () {
+          let bidRequest = {
+            uspConsent: '1NYN'
+          };
+          let request = spec.buildRequests(bidRequests, bidRequest);
+          let data = JSON.parse(request.data);
+          expect(data.regs.ext.us_privacy).to.equal('1NYN');// USP/CCPAs
+          expect(data.at).to.equal(1); // auction type
+          expect(data.cur[0]).to.equal('USD'); // currency
+          expect(data.site.domain).to.be.a('string'); // domain should be set
+          expect(data.site.page).to.equal(bidRequests[0].params.kadpageurl); // forced pageURL
+          expect(data.site.publisher.id).to.equal(bidRequests[0].params.publisherId); // publisher Id
+          expect(data.user.yob).to.equal(parseInt(bidRequests[0].params.yob)); // YOB
+          expect(data.user.gender).to.equal(bidRequests[0].params.gender); // Gender
+          expect(data.device.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.device.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.user.geo.lat).to.equal(parseFloat(bidRequests[0].params.lat)); // Latitude
+          expect(data.user.geo.lon).to.equal(parseFloat(bidRequests[0].params.lon)); // Lognitude
+          expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
+          expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+          expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
+          expect(data.ext.wrapper.profile).to.equal(parseInt(bidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+          expect(data.ext.wrapper.version).to.equal(parseInt(bidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+
+          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].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
+
+          // second request without USP/CCPA
+          let request2 = spec.buildRequests(bidRequests, {});
+          let data2 = JSON.parse(request2.data);
+          expect(data2.regs).to.equal(undefined);// USP/CCPAs
+        });
+
+        describe('FPD', function() {
+          let newRequest;
+
+          it('ortb2.site should be merged in the request', function() {
+            let sandbox = sinon.sandbox.create();
+            sandbox.stub(config, 'getConfig').callsFake(key => {
+              const config = {
+                'ortb2': {
+                  site: {
+                    domain: 'page.example.com',
+                    cat: ['IAB2'],
+                    sectioncat: ['IAB2-2']
+                  }
+                }
+              };
+              return config[key];
+            });
+            const request = spec.buildRequests(bidRequests, {});
+            let data = JSON.parse(request.data);
+            expect(data.site.domain).to.equal('page.example.com');
+            expect(data.site.cat).to.deep.equal(['IAB2']);
+            expect(data.site.sectioncat).to.deep.equal(['IAB2-2']);
+            sandbox.restore();
+          });
+
+          it('ortb2.user should be merged in the request', function() {
+            let sandbox = sinon.sandbox.create();
+            sandbox.stub(config, 'getConfig').callsFake(key => {
+              const config = {
+                'ortb2': {
+                  user: {
+                    yob: 1985
+                  }
+                }
+              };
+              return config[key];
+            });
+            const request = spec.buildRequests(bidRequests, {});
+            let data = JSON.parse(request.data);
+            expect(data.user.yob).to.equal(1985);
+            sandbox.restore();
+          });
+
+          describe('ortb2Imp', function() {
+            describe('ortb2Imp.ext.data.pbadslot', function() {
+              beforeEach(function () {
+                if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                  delete bidRequests[0].ortb2Imp;
+                }
+              });
+
+              it('should not send if imp[].ext.data object is invalid', 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('data');
+              });
+
+              it('should not send if imp[].ext.data.pbadslot is undefined', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                if (data.imp[0].ext.data) {
+                  expect(data.imp[0].ext.data).to.not.have.property('pbadslot');
+                } else {
+                  expect(data.imp[0].ext).to.not.have.property('data');
+                }
+              });
+
+              it('should not send if imp[].ext.data.pbadslot is empty string', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                      pbadslot: ''
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                if (data.imp[0].ext.data) {
+                  expect(data.imp[0].ext.data).to.not.have.property('pbadslot');
+                } else {
+                  expect(data.imp[0].ext).to.not.have.property('data');
+                }
+              });
+
+              it('should send if imp[].ext.data.pbadslot is string', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                      pbadslot: 'abcd'
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                expect(data.imp[0].ext.data).to.have.property('pbadslot');
+                expect(data.imp[0].ext.data.pbadslot).to.equal('abcd');
+              });
+            });
+
+            describe('ortb2Imp.ext.data.adserver', function() {
+              beforeEach(function () {
+                if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                  delete bidRequests[0].ortb2Imp;
+                }
+              });
+
+              it('should not send if imp[].ext.data object is invalid', 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('data');
+              });
+
+              it('should not send if imp[].ext.data.adserver is undefined', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                if (data.imp[0].ext.data) {
+                  expect(data.imp[0].ext.data).to.not.have.property('adserver');
+                } else {
+                  expect(data.imp[0].ext).to.not.have.property('data');
+                }
+              });
+
+              it('should send', function() {
+                let adSlotValue = 'abc';
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                      adserver: {
+                        name: 'GAM',
+                        adslot: adSlotValue
+                      }
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                expect(data.imp[0].ext.data.adserver.name).to.equal('GAM');
+                expect(data.imp[0].ext.data.adserver.adslot).to.equal(adSlotValue);
+                expect(data.imp[0].ext.dfp_ad_unit_code).to.equal(adSlotValue);
+              });
+            });
+
+            describe('ortb2Imp.ext.data.other', function() {
+              beforeEach(function () {
+                if (bidRequests[0].hasOwnProperty('ortb2Imp')) {
+                  delete bidRequests[0].ortb2Imp;
+                }
+              });
+
+              it('should not send if imp[].ext.data object is invalid', 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('data');
+              });
+
+              it('should not send if imp[].ext.data.other is undefined', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                if (data.imp[0].ext.data) {
+                  expect(data.imp[0].ext.data).to.not.have.property('other');
+                } else {
+                  expect(data.imp[0].ext).to.not.have.property('data');
+                }
+              });
+
+              it('ortb2Imp.ext.data.other', function() {
+                bidRequests[0].ortb2Imp = {
+                  ext: {
+                    data: {
+                      other: 1234
+                    }
+                  }
+                };
+                const request = spec.buildRequests(bidRequests, {});
+                let data = JSON.parse(request.data);
+                expect(data.imp[0].ext.data.other).to.equal(1234);
+              });
+            });
+          });
+        });
 
-      describe('setting imp.floor using floorModule', function() {
+        describe('setting imp.floor using floorModule', function() {
         /*
           Use the minimum value among floor from floorModule per mediaType
           If params.adfloor is set then take max(kadfloor, min(floors from floorModule))
           set imp.bidfloor only if it is more than 0
         */
 
-        let newRequest;
-        let floorModuleTestData;
-        let getFloor = function(req) {
-          return floorModuleTestData[req.mediaType];
-        };
-
-        beforeEach(() => {
-          floorModuleTestData = {
-            'banner': {
-              'currency': 'USD',
-              'floor': 1.50
-            },
-            'video': {
-              'currency': 'USD',
-              'floor': 2.50
-            },
-            'native': {
-              'currency': 'USD',
-              'floor': 3.50
-            }
+          let newRequest;
+          let floorModuleTestData;
+          let getFloor = function(req) {
+            return floorModuleTestData[req.mediaType];
           };
-          newRequest = utils.deepClone(bannerVideoAndNativeBidRequests);
-          newRequest[0].getFloor = getFloor;
-        });
-
-        it('bidfloor should be undefined if calculation is <= 0', function() {
-          floorModuleTestData.banner.floor = 0; // lowest of them all
-          newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(undefined);
-        });
 
-        it('ignore floormodule o/p if floor is not number', function() {
-          floorModuleTestData.banner.floor = 'INR';
-          newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(2.5); // video will be lowest now
-        });
+          beforeEach(() => {
+            floorModuleTestData = {
+              'banner': {
+                'currency': 'USD',
+                'floor': 1.50
+              },
+              'video': {
+                'currency': 'USD',
+                'floor': 2.50
+              },
+              'native': {
+                'currency': 'USD',
+                'floor': 3.50
+              }
+            };
+            newRequest = utils.deepClone(bannerVideoAndNativeBidRequests);
+            newRequest[0].getFloor = getFloor;
+          });
 
-        it('ignore floormodule o/p if currency is not matched', function() {
-          floorModuleTestData.banner.currency = 'INR';
-          newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(2.5); // video will be lowest now
-        });
+          it('bidfloor should be undefined if calculation is <= 0', function() {
+            floorModuleTestData.banner.floor = 0; // lowest of them all
+            newRequest[0].params.kadfloor = undefined;
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(undefined);
+          });
 
-        it('kadfloor is not passed, use minimum from floorModule', function() {
-          newRequest[0].params.kadfloor = undefined;
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(1.5);
-        });
+          it('ignore floormodule o/p if floor is not number', function() {
+            floorModuleTestData.banner.floor = 'INR';
+            newRequest[0].params.kadfloor = undefined;
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(2.5); // video will be lowest now
+          });
 
-        it('kadfloor is passed as 3, use kadfloor as it is highest', function() {
-          newRequest[0].params.kadfloor = '3.0';// yes, we want it as a string
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(3);
-        });
+          it('ignore floormodule o/p if currency is not matched', function() {
+            floorModuleTestData.banner.currency = 'INR';
+            newRequest[0].params.kadfloor = undefined;
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(2.5); // video will be lowest now
+          });
 
-        it('kadfloor is passed as 1, use min of fllorModule as it is highest', function() {
-          newRequest[0].params.kadfloor = '1.0';// yes, we want it as a string
-          let request = spec.buildRequests(newRequest);
-          let data = JSON.parse(request.data);
-          data = data.imp[0];
-          expect(data.bidfloor).to.equal(1.5);
-        });
-      });
+          it('kadfloor is not passed, use minimum from floorModule', function() {
+            newRequest[0].params.kadfloor = undefined;
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(1.5);
+          });
 
-      it('should NOT include coppa flag in bid request if coppa config is not present', () => {
-        const request = spec.buildRequests(bidRequests, {});
-        let data = JSON.parse(request.data);
-        if (data.regs) {
-          // in case GDPR is set then data.regs will exist
-          expect(data.regs.coppa).to.equal(undefined);
-        } else {
-          expect(data.regs).to.equal(undefined);
-        }
-      });
+          it('kadfloor is passed as 3, use kadfloor as it is highest', function() {
+            newRequest[0].params.kadfloor = '3.0';// yes, we want it as a string
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(3);
+          });
 
-      it('should include coppa flag in bid request if coppa is set to true', () => {
-        let sandbox = sinon.sandbox.create();
-        sandbox.stub(config, 'getConfig').callsFake(key => {
-          const config = {
-            'coppa': true
-          };
-          return config[key];
+          it('kadfloor is passed as 1, use min of fllorModule as it is highest', function() {
+            newRequest[0].params.kadfloor = '1.0';// yes, we want it as a string
+            let request = spec.buildRequests(newRequest, {
+              auctionId: 'new-auction-id'
+            });
+            let data = JSON.parse(request.data);
+            data = data.imp[0];
+            expect(data.bidfloor).to.equal(1.5);
+          });
         });
-        const request = spec.buildRequests(bidRequests, {});
-        let data = JSON.parse(request.data);
-        expect(data.regs.coppa).to.equal(1);
-        sandbox.restore();
-      });
 
-      it('should NOT include coppa flag in bid request if coppa is set to false', () => {
-        let sandbox = sinon.sandbox.create();
-        sandbox.stub(config, 'getConfig').callsFake(key => {
-          const config = {
-            'coppa': false
-          };
-          return config[key];
-        });
-        const request = spec.buildRequests(bidRequests, {});
-        let data = JSON.parse(request.data);
-        if (data.regs) {
+        it('should NOT include coppa flag in bid request if coppa config is not present', () => {
+          const request = spec.buildRequests(bidRequests, {});
+          let data = JSON.parse(request.data);
+          if (data.regs) {
           // in case GDPR is set then data.regs will exist
-          expect(data.regs.coppa).to.equal(undefined);
-        } else {
-          expect(data.regs).to.equal(undefined);
-        }
-        sandbox.restore();
-      });
-
-      describe('AdsrvrOrgId from userId module', function() {
-        let sandbox;
-        beforeEach(() => {
-          sandbox = sinon.sandbox.create();
-        });
-
-        afterEach(() => {
-          sandbox.restore();
+            expect(data.regs.coppa).to.equal(undefined);
+          } else {
+            expect(data.regs).to.equal(undefined);
+          }
         });
 
-        it('Request should have AdsrvrOrgId config params', function() {
-          bidRequests[0].userId = {};
-          bidRequests[0].userId.tdid = 'TTD_ID_FROM_USER_ID_MODULE';
-          bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-          let request = spec.buildRequests(bidRequests, {});
+        it('should include coppa flag in bid request if coppa is set to true', () => {
+          let sandbox = sinon.sandbox.create();
+          sandbox.stub(config, 'getConfig').callsFake(key => {
+            const config = {
+              'coppa': true
+            };
+            return config[key];
+          });
+          const request = spec.buildRequests(bidRequests, {});
           let data = JSON.parse(request.data);
-          expect(data.user.eids).to.deep.equal([{
-            'source': 'adserver.org',
-            'uids': [{
-              'id': 'TTD_ID_FROM_USER_ID_MODULE',
-              'atype': 1,
-              'ext': {
-                'rtiPartner': 'TDID'
-              }
-            }]
-          }]);
+          expect(data.regs.coppa).to.equal(1);
+          sandbox.restore();
         });
 
-        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': '2018-10-01T07:05:40'
-              }
+        it('should NOT include coppa flag in bid request if coppa is set to false', () => {
+          let sandbox = sinon.sandbox.create();
+          sandbox.stub(config, 'getConfig').callsFake(key => {
+            const config = {
+              'coppa': false
             };
             return config[key];
           });
-          bidRequests[0].userId = {};
-          bidRequests[0].userId.tdid = 'TTD_ID_FROM_USER_ID_MODULE';
-          bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-          let request = spec.buildRequests(bidRequests, {});
+          const request = spec.buildRequests(bidRequests, {});
           let data = JSON.parse(request.data);
-          expect(data.user.eids).to.deep.equal([{
-            'source': 'adserver.org',
-            'uids': [{
-              'id': 'TTD_ID_FROM_USER_ID_MODULE',
-              'atype': 1,
-              'ext': {
-                'rtiPartner': 'TDID'
-              }
-            }]
-          }]);
+          if (data.regs) {
+          // in case GDPR is set then data.regs will exist
+            expect(data.regs.coppa).to.equal(undefined);
+          } else {
+            expect(data.regs).to.equal(undefined);
+          }
+          sandbox.restore();
         });
 
-        it('Request should NOT have adsrvrOrgId params if userId is NOT object', function() {
-          let request = spec.buildRequests(bidRequests, {});
-          let data = JSON.parse(request.data);
-          expect(data.user.eids).to.deep.equal(undefined);
-        });
+        describe('AdsrvrOrgId from userId module', function() {
+          let sandbox;
+          beforeEach(() => {
+            sandbox = sinon.sandbox.create();
+          });
 
-        it('Request should NOT have adsrvrOrgId params if userId.tdid is NOT string', function() {
-          bidRequests[0].userId = {
-            tdid: 1234
-          };
-          let request = spec.buildRequests(bidRequests, {});
-          let data = JSON.parse(request.data);
-          expect(data.user.eids).to.deep.equal(undefined);
-        });
-      });
+          afterEach(() => {
+            sandbox.restore();
+          });
 
-      describe('UserIds from request', function() {
-        describe('pubcommon Id', function() {
-          it('send the pubcommon id if it is present', function() {
+          it('Request should have AdsrvrOrgId config params', function() {
             bidRequests[0].userId = {};
-            bidRequests[0].userId.pubcid = 'pub_common_user_id';
+            bidRequests[0].userId.tdid = 'TTD_ID_FROM_USER_ID_MODULE';
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
             expect(data.user.eids).to.deep.equal([{
-              'source': 'pubcid.org',
+              'source': 'adserver.org',
               'uids': [{
-                'id': 'pub_common_user_id',
-                'atype': 1
+                'id': 'TTD_ID_FROM_USER_ID_MODULE',
+                'atype': 1,
+                'ext': {
+                  'rtiPartner': 'TDID'
+                }
               }]
             }]);
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.pubcid = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.pubcid = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.pubcid = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.pubcid = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-          });
-        });
-
-        describe('ID5 Id', function() {
-          it('send the id5 id if it is present', function() {
+          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': '2018-10-01T07:05:40'
+                }
+              };
+              return config[key];
+            });
             bidRequests[0].userId = {};
-            bidRequests[0].userId.id5id = 'id5-user-id';
+            bidRequests[0].userId.tdid = 'TTD_ID_FROM_USER_ID_MODULE';
             bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
             expect(data.user.eids).to.deep.equal([{
-              'source': 'id5-sync.com',
+              'source': 'adserver.org',
               'uids': [{
-                'id': 'id5-user-id',
-                'atype': 1
+                'id': 'TTD_ID_FROM_USER_ID_MODULE',
+                'atype': 1,
+                'ext': {
+                  'rtiPartner': 'TDID'
+                }
               }]
             }]);
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.id5id = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+          it('Request should NOT have adsrvrOrgId params if userId is NOT object', function() {
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.id5id = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+            expect(data.user.eids).to.deep.equal(undefined);
           });
-        });
 
-        describe('Criteo Id', function() {
-          it('send the criteo id if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.criteoId = 'criteo-user-id';
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+          it('Request should NOT have adsrvrOrgId params if userId.tdid is NOT string', function() {
+            bidRequests[0].userId = {
+              tdid: 1234
+            };
             let request = spec.buildRequests(bidRequests, {});
             let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'criteo.com',
-              'uids': [{
-                'id': 'criteo-user-id',
-                'atype': 1
-              }]
-            }]);
+            expect(data.user.eids).to.deep.equal(undefined);
           });
+        });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.criteoId = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.criteoId = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.criteoId = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.criteoId = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+        describe('UserIds from request', function() {
+          describe('pubcommon Id', function() {
+            it('send the pubcommon id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.pubcid = 'pub_common_user_id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'pubcid.org',
+                'uids': [{
+                  'id': 'pub_common_user_id',
+                  'atype': 1
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.pubcid = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.pubcid = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.pubcid = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.pubcid = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
-        });
 
-        describe('IdentityLink Id', function() {
-          it('send the identity-link id if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.idl_env = 'identity-link-user-id';
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'liveramp.com',
-              'uids': [{
-                'id': 'identity-link-user-id',
-                'atype': 1
-              }]
-            }]);
+          describe('ID5 Id', function() {
+            it('send the id5 id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.id5id = { uid: 'id5-user-id' };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'id5-sync.com',
+                'uids': [{
+                  'id': 'id5-user-id',
+                  'atype': 1
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.id5id = { uid: 1 };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.id5id = { uid: [] };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.id5id = { uid: null };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.id5id = { uid: {} };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.idl_env = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.idl_env = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.idl_env = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.idl_env = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+          describe('Criteo Id', function() {
+            it('send the criteo id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.criteoId = 'criteo-user-id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'criteo.com',
+                'uids': [{
+                  'id': 'criteo-user-id',
+                  'atype': 1
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.criteoId = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.criteoId = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.criteoId = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.criteoId = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
-        });
 
-        describe('LiveIntent Id', function() {
-          it('send the LiveIntent id if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.lipb = { lipbid: 'live-intent-user-id' };
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'liveintent.com',
-              'uids': [{
-                'id': 'live-intent-user-id',
-                'atype': 1
-              }]
-            }]);
+          describe('IdentityLink Id', function() {
+            it('send the identity-link id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.idl_env = 'identity-link-user-id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'liveramp.com',
+                'uids': [{
+                  'id': 'identity-link-user-id',
+                  'atype': 3
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.idl_env = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.idl_env = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.idl_env = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.idl_env = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.lipb = { lipbid: 1 };
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.lipb.lipbid = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.lipb.lipbid = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.lipb.lipbid = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+          describe('LiveIntent Id', function() {
+            it('send the LiveIntent id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.lipb = { lipbid: 'live-intent-user-id' };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'liveintent.com',
+                'uids': [{
+                  'id': 'live-intent-user-id',
+                  'atype': 3
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.lipb = { lipbid: 1 };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.lipb.lipbid = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.lipb.lipbid = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.lipb.lipbid = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
-        });
 
-        describe('Parrable Id', function() {
-          it('send the Parrable id if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.parrableid = 'parrable-user-id';
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'parrable.com',
-              'uids': [{
-                'id': 'parrable-user-id',
-                'atype': 1
-              }]
-            }]);
+          describe('Parrable Id', function() {
+            it('send the Parrable id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.parrableId = { eid: 'parrable-user-id' };
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'parrable.com',
+                'uids': [{
+                  'id': 'parrable-user-id',
+                  'atype': 1
+                }]
+              }]);
+            });
+
+            it('do not pass if not object with eid key', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.parrableid = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.parrableid = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.parrableid = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.parrableid = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.parrableid = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.parrableid = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.parrableid = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.parrableid = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+          describe('Britepool Id', function() {
+            it('send the Britepool id if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.britepoolid = 'britepool-user-id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'britepool.com',
+                'uids': [{
+                  'id': 'britepool-user-id',
+                  'atype': 3
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.britepoolid = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.britepoolid = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.britepoolid = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.britepoolid = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
-        });
 
-        describe('Britepool Id', function() {
-          it('send the Britepool id if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.britepoolid = 'britepool-user-id';
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'britepool.com',
-              'uids': [{
-                'id': 'britepool-user-id',
-                'atype': 1
-              }]
-            }]);
+          describe('NetId', function() {
+            it('send the NetId if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.netId = 'netid-user-id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'netid.de',
+                'uids': [{
+                  'id': 'netid-user-id',
+                  'atype': 1
+                }]
+              }]);
+            });
+
+            it('do not pass if not string', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.netId = 1;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.netId = [];
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.netId = null;
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+              bidRequests[0].userId.netId = {};
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              request = spec.buildRequests(bidRequests, {});
+              data = JSON.parse(request.data);
+              expect(data.user.eids).to.equal(undefined);
+            });
           });
 
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.britepoolid = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.britepoolid = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.britepoolid = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.britepoolid = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+          describe('FlocId', function() {
+            it('send the FlocId if it is present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.flocId = {
+                id: '1234',
+                version: 'chrome1.1'
+              }
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'chrome.com',
+                'uids': [{
+                  'id': '1234',
+                  'atype': 1,
+                  'ext': {
+                    'ver': 'chrome1.1'
+                  }
+                }]
+              }]);
+              expect(data.user.data).to.deep.equal([{
+                id: 'FLOC',
+                name: 'FLOC',
+                ext: {
+                  ver: 'chrome1.1'
+                },
+                segment: [{
+                  id: '1234',
+                  name: 'chrome.com',
+                  value: '1234'
+                }]
+              }]);
+            });
+
+            it('appnend the flocId if userIds are present', function() {
+              bidRequests[0].userId = {};
+              bidRequests[0].userId.netId = 'netid-user-id';
+              bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
+              bidRequests[0].userId.flocId = {
+                id: '1234',
+                version: 'chrome1.1'
+              }
+              let request = spec.buildRequests(bidRequests, {});
+              let data = JSON.parse(request.data);
+              expect(data.user.eids).to.deep.equal([{
+                'source': 'netid.de',
+                'uids': [{
+                  'id': 'netid-user-id',
+                  'atype': 1
+                }]
+              }, {
+                'source': 'chrome.com',
+                'uids': [{
+                  'id': '1234',
+                  'atype': 1,
+                  'ext': {
+                    'ver': 'chrome1.1'
+                  }
+                }]
+              }]);
+            });
           });
         });
 
-        describe('NetId', function() {
-          it('send the NetId if it is present', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.netId = 'netid-user-id';
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.deep.equal([{
-              'source': 'netid.de',
-              'uids': [{
-                'id': 'netid-user-id',
-                'atype': 1
-              }]
-            }]);
-          });
-
-          it('do not pass if not string', function() {
-            bidRequests[0].userId = {};
-            bidRequests[0].userId.netId = 1;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            let request = spec.buildRequests(bidRequests, {});
-            let data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.netId = [];
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.netId = null;
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
-            bidRequests[0].userId.netId = {};
-            bidRequests[0].userIdAsEids = createEidsArray(bidRequests[0].userId);
-            request = spec.buildRequests(bidRequests, {});
-            data = JSON.parse(request.data);
-            expect(data.user.eids).to.equal(undefined);
+        it('Request params check for video ad', function () {
+          let request = spec.buildRequests(videoBidRequests, {
+            auctionId: 'new-auction-id'
           });
+          let data = JSON.parse(request.data);
+          expect(data.imp[0].video).to.exist;
+          expect(data.imp[0].tagid).to.equal('Div1');
+          expect(data.imp[0]['video']['mimes']).to.exist.and.to.be.an('array');
+          expect(data.imp[0]['video']['mimes'][0]).to.equal(videoBidRequests[0].params.video['mimes'][0]);
+          expect(data.imp[0]['video']['mimes'][1]).to.equal(videoBidRequests[0].params.video['mimes'][1]);
+          expect(data.imp[0]['video']['minduration']).to.equal(videoBidRequests[0].params.video['minduration']);
+          expect(data.imp[0]['video']['maxduration']).to.equal(videoBidRequests[0].params.video['maxduration']);
+          expect(data.imp[0]['video']['startdelay']).to.equal(videoBidRequests[0].params.video['startdelay']);
+
+          expect(data.imp[0]['video']['playbackmethod']).to.exist.and.to.be.an('array');
+          expect(data.imp[0]['video']['playbackmethod'][0]).to.equal(videoBidRequests[0].params.video['playbackmethod'][0]);
+          expect(data.imp[0]['video']['playbackmethod'][1]).to.equal(videoBidRequests[0].params.video['playbackmethod'][1]);
+
+          expect(data.imp[0]['video']['api']).to.exist.and.to.be.an('array');
+          expect(data.imp[0]['video']['api'][0]).to.equal(videoBidRequests[0].params.video['api'][0]);
+          expect(data.imp[0]['video']['api'][1]).to.equal(videoBidRequests[0].params.video['api'][1]);
+
+          expect(data.imp[0]['video']['protocols']).to.exist.and.to.be.an('array');
+          expect(data.imp[0]['video']['protocols'][0]).to.equal(videoBidRequests[0].params.video['protocols'][0]);
+          expect(data.imp[0]['video']['protocols'][1]).to.equal(videoBidRequests[0].params.video['protocols'][1]);
+
+          expect(data.imp[0]['video']['battr']).to.exist.and.to.be.an('array');
+          expect(data.imp[0]['video']['battr'][0]).to.equal(videoBidRequests[0].params.video['battr'][0]);
+          expect(data.imp[0]['video']['battr'][1]).to.equal(videoBidRequests[0].params.video['battr'][1]);
+
+          expect(data.imp[0]['video']['linearity']).to.equal(videoBidRequests[0].params.video['linearity']);
+          expect(data.imp[0]['video']['placement']).to.equal(videoBidRequests[0].params.video['placement']);
+          expect(data.imp[0]['video']['minbitrate']).to.equal(videoBidRequests[0].params.video['minbitrate']);
+          expect(data.imp[0]['video']['maxbitrate']).to.equal(videoBidRequests[0].params.video['maxbitrate']);
+
+          expect(data.imp[0]['video']['w']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[0]);
+          expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
         });
-      });
-
-      it('Request params check for video ad', function () {
-        let request = spec.buildRequests(videoBidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.imp[0].video).to.exist;
-        expect(data.imp[0].tagid).to.equal('Div1');
-        expect(data.imp[0].video.ext['video_skippable']).to.equal(videoBidRequests[0].params.video.skippable ? 1 : 0);
-        expect(data.imp[0]['video']['mimes']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['mimes'][0]).to.equal(videoBidRequests[0].params.video['mimes'][0]);
-        expect(data.imp[0]['video']['mimes'][1]).to.equal(videoBidRequests[0].params.video['mimes'][1]);
-        expect(data.imp[0]['video']['minduration']).to.equal(videoBidRequests[0].params.video['minduration']);
-        expect(data.imp[0]['video']['maxduration']).to.equal(videoBidRequests[0].params.video['maxduration']);
-        expect(data.imp[0]['video']['startdelay']).to.equal(videoBidRequests[0].params.video['startdelay']);
-
-        expect(data.imp[0]['video']['playbackmethod']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['playbackmethod'][0]).to.equal(videoBidRequests[0].params.video['playbackmethod'][0]);
-        expect(data.imp[0]['video']['playbackmethod'][1]).to.equal(videoBidRequests[0].params.video['playbackmethod'][1]);
-
-        expect(data.imp[0]['video']['api']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['api'][0]).to.equal(videoBidRequests[0].params.video['api'][0]);
-        expect(data.imp[0]['video']['api'][1]).to.equal(videoBidRequests[0].params.video['api'][1]);
-
-        expect(data.imp[0]['video']['protocols']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['protocols'][0]).to.equal(videoBidRequests[0].params.video['protocols'][0]);
-        expect(data.imp[0]['video']['protocols'][1]).to.equal(videoBidRequests[0].params.video['protocols'][1]);
-
-        expect(data.imp[0]['video']['battr']).to.exist.and.to.be.an('array');
-        expect(data.imp[0]['video']['battr'][0]).to.equal(videoBidRequests[0].params.video['battr'][0]);
-        expect(data.imp[0]['video']['battr'][1]).to.equal(videoBidRequests[0].params.video['battr'][1]);
-
-        expect(data.imp[0]['video']['linearity']).to.equal(videoBidRequests[0].params.video['linearity']);
-        expect(data.imp[0]['video']['placement']).to.equal(videoBidRequests[0].params.video['placement']);
-        expect(data.imp[0]['video']['minbitrate']).to.equal(videoBidRequests[0].params.video['minbitrate']);
-        expect(data.imp[0]['video']['maxbitrate']).to.equal(videoBidRequests[0].params.video['maxbitrate']);
-
-        expect(data.imp[0]['video']['w']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[0]);
-        expect(data.imp[0]['video']['h']).to.equal(videoBidRequests[0].mediaTypes.video.playerSize[1]);
-      });
 
-      it('Request params check for 1 banner and 1 video ad', function () {
-        let request = spec.buildRequests(multipleMediaRequests);
-        let data = JSON.parse(request.data);
+        it('Request params check for 1 banner and 1 video ad', function () {
+          let request = spec.buildRequests(multipleMediaRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
 
-        expect(data.imp).to.be.an('array')
-        expect(data.imp).with.length.above(1);
-
-        expect(data.at).to.equal(1); // auction type
-        expect(data.cur[0]).to.equal('USD'); // currency
-        expect(data.site.domain).to.be.a('string'); // domain should be set
-        expect(data.site.page).to.equal(multipleMediaRequests[0].params.kadpageurl); // forced pageURL
-        expect(data.site.publisher.id).to.equal(multipleMediaRequests[0].params.publisherId); // publisher Id
-        expect(data.user.yob).to.equal(parseInt(multipleMediaRequests[0].params.yob)); // YOB
-        expect(data.user.gender).to.equal(multipleMediaRequests[0].params.gender); // Gender
-        expect(data.device.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
-        expect(data.device.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
-        expect(data.user.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
-        expect(data.user.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
-        expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
-        expect(data.ext.wrapper.transactionId).to.equal(multipleMediaRequests[0].transactionId); // Prebid TransactionId
-        expect(data.ext.wrapper.wiid).to.equal(multipleMediaRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
-        expect(data.ext.wrapper.profile).to.equal(parseInt(multipleMediaRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
-        expect(data.ext.wrapper.version).to.equal(parseInt(multipleMediaRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
-
-        // banner imp object check
-        expect(data.imp[0].id).to.equal(multipleMediaRequests[0].bidId); // Prebid bid id is passed as id
-        expect(data.imp[0].bidfloor).to.equal(parseFloat(multipleMediaRequests[0].params.kadfloor)); // kadfloor
-        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.pmZoneId).to.equal(multipleMediaRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
-
-        // video imp object check
-        expect(data.imp[1].video).to.exist;
-        expect(data.imp[1].tagid).to.equal('Div1');
-        expect(data.imp[1].video.ext['video_skippable']).to.equal(multipleMediaRequests[1].params.video.skippable ? 1 : 0);
-        expect(data.imp[1]['video']['mimes']).to.exist.and.to.be.an('array');
-        expect(data.imp[1]['video']['mimes'][0]).to.equal(multipleMediaRequests[1].params.video['mimes'][0]);
-        expect(data.imp[1]['video']['mimes'][1]).to.equal(multipleMediaRequests[1].params.video['mimes'][1]);
-        expect(data.imp[1]['video']['minduration']).to.equal(multipleMediaRequests[1].params.video['minduration']);
-        expect(data.imp[1]['video']['maxduration']).to.equal(multipleMediaRequests[1].params.video['maxduration']);
-        expect(data.imp[1]['video']['startdelay']).to.equal(multipleMediaRequests[1].params.video['startdelay']);
-
-        expect(data.imp[1]['video']['playbackmethod']).to.exist.and.to.be.an('array');
-        expect(data.imp[1]['video']['playbackmethod'][0]).to.equal(multipleMediaRequests[1].params.video['playbackmethod'][0]);
-        expect(data.imp[1]['video']['playbackmethod'][1]).to.equal(multipleMediaRequests[1].params.video['playbackmethod'][1]);
-
-        expect(data.imp[1]['video']['api']).to.exist.and.to.be.an('array');
-        expect(data.imp[1]['video']['api'][0]).to.equal(multipleMediaRequests[1].params.video['api'][0]);
-        expect(data.imp[1]['video']['api'][1]).to.equal(multipleMediaRequests[1].params.video['api'][1]);
-
-        expect(data.imp[1]['video']['protocols']).to.exist.and.to.be.an('array');
-        expect(data.imp[1]['video']['protocols'][0]).to.equal(multipleMediaRequests[1].params.video['protocols'][0]);
-        expect(data.imp[1]['video']['protocols'][1]).to.equal(multipleMediaRequests[1].params.video['protocols'][1]);
-
-        expect(data.imp[1]['video']['battr']).to.exist.and.to.be.an('array');
-        expect(data.imp[1]['video']['battr'][0]).to.equal(multipleMediaRequests[1].params.video['battr'][0]);
-        expect(data.imp[1]['video']['battr'][1]).to.equal(multipleMediaRequests[1].params.video['battr'][1]);
-
-        expect(data.imp[1]['video']['linearity']).to.equal(multipleMediaRequests[1].params.video['linearity']);
-        expect(data.imp[1]['video']['placement']).to.equal(multipleMediaRequests[1].params.video['placement']);
-        expect(data.imp[1]['video']['minbitrate']).to.equal(multipleMediaRequests[1].params.video['minbitrate']);
-        expect(data.imp[1]['video']['maxbitrate']).to.equal(multipleMediaRequests[1].params.video['maxbitrate']);
-
-        expect(data.imp[1]['video']['w']).to.equal(multipleMediaRequests[1].mediaTypes.video.playerSize[0]);
-        expect(data.imp[1]['video']['h']).to.equal(multipleMediaRequests[1].mediaTypes.video.playerSize[1]);
-      });
+          expect(data.imp).to.be.an('array')
+          expect(data.imp).with.length.above(1);
+
+          expect(data.at).to.equal(1); // auction type
+          expect(data.cur[0]).to.equal('USD'); // currency
+          expect(data.site.domain).to.be.a('string'); // domain should be set
+          expect(data.site.page).to.equal(multipleMediaRequests[0].params.kadpageurl); // forced pageURL
+          expect(data.site.publisher.id).to.equal(multipleMediaRequests[0].params.publisherId); // publisher Id
+          expect(data.user.yob).to.equal(parseInt(multipleMediaRequests[0].params.yob)); // YOB
+          expect(data.user.gender).to.equal(multipleMediaRequests[0].params.gender); // Gender
+          expect(data.device.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
+          expect(data.device.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
+          expect(data.user.geo.lat).to.equal(parseFloat(multipleMediaRequests[0].params.lat)); // Latitude
+          expect(data.user.geo.lon).to.equal(parseFloat(multipleMediaRequests[0].params.lon)); // Lognitude
+          expect(data.ext.wrapper.wv).to.equal($$REPO_AND_VERSION$$); // Wrapper Version
+          expect(data.ext.wrapper.transactionId).to.equal(multipleMediaRequests[0].transactionId); // Prebid TransactionId
+          expect(data.ext.wrapper.wiid).to.equal(multipleMediaRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
+          expect(data.ext.wrapper.profile).to.equal(parseInt(multipleMediaRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+          expect(data.ext.wrapper.version).to.equal(parseInt(multipleMediaRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+
+          // banner imp object check
+          expect(data.imp[0].id).to.equal(multipleMediaRequests[0].bidId); // Prebid bid id is passed as id
+          expect(data.imp[0].bidfloor).to.equal(parseFloat(multipleMediaRequests[0].params.kadfloor)); // kadfloor
+          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.pmZoneId).to.equal(multipleMediaRequests[0].params.pmzoneid.split(',').slice(0, 50).map(id => id.trim()).join()); // pmzoneid
+
+          // video imp object check
+          expect(data.imp[1].video).to.exist;
+          expect(data.imp[1].tagid).to.equal('Div1');
+          expect(data.imp[1]['video']['mimes']).to.exist.and.to.be.an('array');
+          expect(data.imp[1]['video']['mimes'][0]).to.equal(multipleMediaRequests[1].params.video['mimes'][0]);
+          expect(data.imp[1]['video']['mimes'][1]).to.equal(multipleMediaRequests[1].params.video['mimes'][1]);
+          expect(data.imp[1]['video']['minduration']).to.equal(multipleMediaRequests[1].params.video['minduration']);
+          expect(data.imp[1]['video']['maxduration']).to.equal(multipleMediaRequests[1].params.video['maxduration']);
+          expect(data.imp[1]['video']['startdelay']).to.equal(multipleMediaRequests[1].params.video['startdelay']);
+
+          expect(data.imp[1]['video']['playbackmethod']).to.exist.and.to.be.an('array');
+          expect(data.imp[1]['video']['playbackmethod'][0]).to.equal(multipleMediaRequests[1].params.video['playbackmethod'][0]);
+          expect(data.imp[1]['video']['playbackmethod'][1]).to.equal(multipleMediaRequests[1].params.video['playbackmethod'][1]);
+
+          expect(data.imp[1]['video']['api']).to.exist.and.to.be.an('array');
+          expect(data.imp[1]['video']['api'][0]).to.equal(multipleMediaRequests[1].params.video['api'][0]);
+          expect(data.imp[1]['video']['api'][1]).to.equal(multipleMediaRequests[1].params.video['api'][1]);
+
+          expect(data.imp[1]['video']['protocols']).to.exist.and.to.be.an('array');
+          expect(data.imp[1]['video']['protocols'][0]).to.equal(multipleMediaRequests[1].params.video['protocols'][0]);
+          expect(data.imp[1]['video']['protocols'][1]).to.equal(multipleMediaRequests[1].params.video['protocols'][1]);
+
+          expect(data.imp[1]['video']['battr']).to.exist.and.to.be.an('array');
+          expect(data.imp[1]['video']['battr'][0]).to.equal(multipleMediaRequests[1].params.video['battr'][0]);
+          expect(data.imp[1]['video']['battr'][1]).to.equal(multipleMediaRequests[1].params.video['battr'][1]);
+
+          expect(data.imp[1]['video']['linearity']).to.equal(multipleMediaRequests[1].params.video['linearity']);
+          expect(data.imp[1]['video']['placement']).to.equal(multipleMediaRequests[1].params.video['placement']);
+          expect(data.imp[1]['video']['minbitrate']).to.equal(multipleMediaRequests[1].params.video['minbitrate']);
+          expect(data.imp[1]['video']['maxbitrate']).to.equal(multipleMediaRequests[1].params.video['maxbitrate']);
+
+          expect(data.imp[1]['video']['w']).to.equal(multipleMediaRequests[1].mediaTypes.video.playerSize[0]);
+          expect(data.imp[1]['video']['h']).to.equal(multipleMediaRequests[1].mediaTypes.video.playerSize[1]);
+        });
 
-      it('invalid adslot', () => {
-        firstBid.params.adSlot = '/15671365/DMDemo';
-        firstBid.params.sizes = [];
-        let request = spec.buildRequests([]);
-        expect(request).to.equal(undefined);
-      });
+        it('invalid adslot', () => {
+          firstBid.params.adSlot = '/15671365/DMDemo';
+          firstBid.params.sizes = [];
+          let request = spec.buildRequests([]);
+          expect(request).to.equal(undefined);
+        });
 
-      it('Request params should have valid native bid request for all valid params', function () {
-        let request = spec.buildRequests(nativeBidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.imp[0].native).to.exist;
-        expect(data.imp[0].native['request']).to.exist;
-        expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpression.native.request);
-      });
+        it('Request params should have valid native bid request for all valid params', function () {
+          let request = spec.buildRequests(nativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.imp[0].native).to.exist;
+          expect(data.imp[0].native['request']).to.exist;
+          expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpression.native.request);
+        });
 
-      it('Request params should not have valid native bid request for non native request', function () {
-        let request = spec.buildRequests(bidRequests);
-        let data = JSON.parse(request.data);
-        expect(data.imp[0].native).to.not.exist;
-      });
+        it('Request params should not have valid native bid request for non native request', function () {
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.imp[0].native).to.not.exist;
+        });
 
-      it('Request params should have valid native bid request with valid required param values for all valid params', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithRequiredParam);
-        let data = JSON.parse(request.data);
-        expect(data.imp[0].native).to.exist;
-        expect(data.imp[0].native['request']).to.exist;
-        expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpressionWithRequiredParam.native.request);
-      });
+        it('Request params should have valid native bid request with valid required param values for all valid params', function () {
+          let request = spec.buildRequests(nativeBidRequestsWithRequiredParam, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.imp[0].native).to.exist;
+          expect(data.imp[0].native['request']).to.exist;
+          expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpressionWithRequiredParam.native.request);
+        });
 
-      it('should not have valid native request if assets are not defined with minimum required params and only native is the slot', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithoutAsset);
-        expect(request).to.deep.equal(undefined);
-      });
+        it('should not have valid native request if assets are not defined with minimum required params and only native is the slot', function () {
+          let request = spec.buildRequests(nativeBidRequestsWithoutAsset, {
+            auctionId: 'new-auction-id'
+          });
+          expect(request).to.deep.equal(undefined);
+        });
 
-      it('Request params should have valid native bid request for all native params', function () {
-        let request = spec.buildRequests(nativeBidRequestsWithAllParams);
-        let data = JSON.parse(request.data);
-        expect(data.imp[0].native).to.exist;
-        expect(data.imp[0].native['request']).to.exist;
-        expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
-        expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpressionWithAllParams.native.request);
-      });
+        it('Request params should have valid native bid request for all native params', function () {
+          let request = spec.buildRequests(nativeBidRequestsWithAllParams, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          expect(data.imp[0].native).to.exist;
+          expect(data.imp[0].native['request']).to.exist;
+          expect(data.imp[0].tagid).to.equal('/43743431/NativeAutomationPrebid');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.be.an('string');
+          expect(data.imp[0]['native']['request']).to.exist.and.to.equal(validnativeBidImpressionWithAllParams.native.request);
+        });
 
 	    it('Request params - should handle banner and video format in single adunit', function() {
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(300);
-        expect(data.banner.h).to.equal(250);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format.length).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes.length - 1);
-
-        // Case: when size is not present in adslo
-        bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
-        request = spec.buildRequests(bannerAndVideoBidRequests);
-        data = JSON.parse(request.data);
-        data = data.imp[0];
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes[0][0]);
-        expect(data.banner.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes[0][1]);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format.length).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes.length - 1);
-
-        expect(data.video).to.exist;
-        expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
-        expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
-      });
+          let request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(300);
+          expect(data.banner.h).to.equal(250);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format.length).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes.length - 1);
+
+          // Case: when size is not present in adslo
+          bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
+          request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes[0][0]);
+          expect(data.banner.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes[0][1]);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format.length).to.equal(bannerAndVideoBidRequests[0].mediaTypes.banner.sizes.length - 1);
+
+          expect(data.video).to.exist;
+          expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
+          expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
+        });
 
-      it('Request params - banner and video req in single adslot - should ignore banner imp if banner size is set to fluid and send video imp object', function () {
+        it('Request params - banner and video req in single adslot - should ignore banner imp if banner size is set to fluid and send video imp object', function () {
         /* Adslot configured for banner and video.
            banner size is set to [['fluid'], [300, 250]]
            adslot specifies a size as 300x250
            => banner imp object should have primary w and h set to 300 and 250. fluid is ignored
         */
-        bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
+          bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
 
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+          let request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(300);
-        expect(data.banner.h).to.equal(250);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format[0].w).to.equal(160);
-        expect(data.banner.format[0].h).to.equal(600);
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(300);
+          expect(data.banner.h).to.equal(250);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format[0].w).to.equal(160);
+          expect(data.banner.format[0].h).to.equal(600);
 
-        /* Adslot configured for banner and video.
+          /* Adslot configured for banner and video.
            banner size is set to [['fluid'], [300, 250]]
            adslot does not specify any size
            => banner imp object should have primary w and h set to 300 and 250. fluid is ignored
         */
-        bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
-        bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
+          bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid'], [160, 600]];
+          bannerAndVideoBidRequests[0].params.adSlot = '/15671365/DMDemo';
 
-        request = spec.buildRequests(bannerAndVideoBidRequests);
-        data = JSON.parse(request.data);
-        data = data.imp[0];
+          request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(160);
-        expect(data.banner.h).to.equal(600);
-        expect(data.banner.format).to.not.exist;
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(160);
+          expect(data.banner.h).to.equal(600);
+          expect(data.banner.format).to.not.exist;
 
-        /* Adslot configured for banner and video.
+          /* Adslot configured for banner and video.
            banner size is set to [[728 90], ['fluid'], [300, 250]]
            adslot does not specify any size
            => banner imp object should have primary w and h set to 728 and 90.
@@ -2015,534 +2597,554 @@ describe('PubMatic adapter', function () {
               fluid is ignore
         */
 
-        bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [[728, 90], ['fluid'], [300, 250]];
-        request = spec.buildRequests(bannerAndVideoBidRequests);
-        data = JSON.parse(request.data);
-        data = data.imp[0];
+          bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [[728, 90], ['fluid'], [300, 250]];
+          request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(728);
-        expect(data.banner.h).to.equal(90);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format[0].w).to.equal(300);
-        expect(data.banner.format[0].h).to.equal(250);
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(728);
+          expect(data.banner.h).to.equal(90);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format[0].w).to.equal(300);
+          expect(data.banner.format[0].h).to.equal(250);
 
-        /* Adslot configured for banner and video.
+          /* Adslot configured for banner and video.
            banner size is set to [['fluid']]
            adslot does not specify any size
            => banner object should not be sent in the request. only video should be sent.
         */
 
-        bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid']];
-        request = spec.buildRequests(bannerAndVideoBidRequests);
-        data = JSON.parse(request.data);
-        data = data.imp[0];
+          bannerAndVideoBidRequests[0].mediaTypes.banner.sizes = [['fluid']];
+          request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.not.exist;
-        expect(data.video).to.exist;
-      });
+          expect(data.banner).to.not.exist;
+          expect(data.video).to.exist;
+        });
 
-      it('Request params - should not contain banner imp if mediaTypes.banner is not present and sizes is specified in bid.sizes', function() {
-        delete bannerAndVideoBidRequests[0].mediaTypes.banner;
-        bannerAndVideoBidRequests[0].params.sizes = [300, 250];
+        it('Request params - should not contain banner imp if mediaTypes.banner is not present and sizes is specified in bid.sizes', function() {
+          delete bannerAndVideoBidRequests[0].mediaTypes.banner;
+          bannerAndVideoBidRequests[0].params.sizes = [300, 250];
 
-        let request = spec.buildRequests(bannerAndVideoBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
-        expect(data.banner).to.not.exist;
-      });
+          let request = spec.buildRequests(bannerAndVideoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.banner).to.not.exist;
+        });
 
-      it('Request params - should handle banner and native format in single adunit', function() {
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+        it('Request params - should handle banner and native format in single adunit', function() {
+          let request = spec.buildRequests(bannerAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(300);
-        expect(data.banner.h).to.equal(250);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format.length).to.equal(bannerAndNativeBidRequests[0].mediaTypes.banner.sizes.length - 1);
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(300);
+          expect(data.banner.h).to.equal(250);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format.length).to.equal(bannerAndNativeBidRequests[0].mediaTypes.banner.sizes.length - 1);
 
-        expect(data.native).to.exist;
-        expect(data.native.request).to.exist;
-      });
+          expect(data.native).to.exist;
+          expect(data.native.request).to.exist;
+        });
 
-      it('Request params - should handle video and native format in single adunit', function() {
-        let request = spec.buildRequests(videoAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+        it('Request params - should handle video and native format in single adunit', function() {
+          let request = spec.buildRequests(videoAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.video).to.exist;
-        expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
-        expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
+          expect(data.video).to.exist;
+          expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
+          expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
 
-        expect(data.native).to.exist;
-        expect(data.native.request).to.exist;
-      });
+          expect(data.native).to.exist;
+          expect(data.native.request).to.exist;
+        });
 
-      it('Request params - should handle banner, video and native format in single adunit', function() {
-        let request = spec.buildRequests(bannerVideoAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+        it('Request params - should handle banner, video and native format in single adunit', function() {
+          let request = spec.buildRequests(bannerVideoAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.banner.w).to.equal(300);
-        expect(data.banner.h).to.equal(250);
-        expect(data.banner.format).to.exist;
-        expect(data.banner.format.length).to.equal(bannerAndNativeBidRequests[0].mediaTypes.banner.sizes.length - 1);
+          expect(data.banner).to.exist;
+          expect(data.banner.w).to.equal(300);
+          expect(data.banner.h).to.equal(250);
+          expect(data.banner.format).to.exist;
+          expect(data.banner.format.length).to.equal(bannerAndNativeBidRequests[0].mediaTypes.banner.sizes.length - 1);
 
-        expect(data.video).to.exist;
-        expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
-        expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
+          expect(data.video).to.exist;
+          expect(data.video.w).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[0]);
+          expect(data.video.h).to.equal(bannerAndVideoBidRequests[0].mediaTypes.video.playerSize[1]);
 
-        expect(data.native).to.exist;
-        expect(data.native.request).to.exist;
-      });
+          expect(data.native).to.exist;
+          expect(data.native.request).to.exist;
+        });
 
-      it('Request params - should not add banner object if mediaTypes.banner is missing, but adunits.sizes is present', function() {
-        delete bannerAndNativeBidRequests[0].mediaTypes.banner;
-        bannerAndNativeBidRequests[0].sizes = [729, 90];
+        it('Request params - should not add banner object if mediaTypes.banner is missing, but adunits.sizes is present', function() {
+          delete bannerAndNativeBidRequests[0].mediaTypes.banner;
+          bannerAndNativeBidRequests[0].sizes = [729, 90];
 
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+          let request = spec.buildRequests(bannerAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.not.exist;
+          expect(data.banner).to.not.exist;
 
-        expect(data.native).to.exist;
-        expect(data.native.request).to.exist;
-      });
+          expect(data.native).to.exist;
+          expect(data.native.request).to.exist;
+        });
 
-      it('Request params - banner and native multiformat request - should not have native object incase of invalid config present', function() {
-        bannerAndNativeBidRequests[0].mediaTypes.native = {
-          title: { required: true },
-          image: { required: true },
-          sponsoredBy: { required: true },
-          clickUrl: { required: true }
-        };
-        bannerAndNativeBidRequests[0].nativeParams = {
-          title: { required: true },
-          image: { required: true },
-          sponsoredBy: { required: true },
-          clickUrl: { required: true }
-        }
-        let request = spec.buildRequests(bannerAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+        it('Request params - banner and native multiformat request - should not have native object incase of invalid config present', function() {
+          bannerAndNativeBidRequests[0].mediaTypes.native = {
+            title: { required: true },
+            image: { required: true },
+            sponsoredBy: { required: true },
+            clickUrl: { required: true }
+          };
+          bannerAndNativeBidRequests[0].nativeParams = {
+            title: { required: true },
+            image: { required: true },
+            sponsoredBy: { required: true },
+            clickUrl: { required: true }
+          }
+          let request = spec.buildRequests(bannerAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.banner).to.exist;
-        expect(data.native).to.not.exist;
-      });
+          expect(data.banner).to.exist;
+          expect(data.native).to.not.exist;
+        });
 
-      it('Request params - video and native multiformat request - should not have native object incase of invalid config present', function() {
-        videoAndNativeBidRequests[0].mediaTypes.native = {
-          title: { required: true },
-          image: { required: true },
-          sponsoredBy: { required: true },
-          clickUrl: { required: true }
-        };
-        videoAndNativeBidRequests[0].nativeParams = {
-          title: { required: true },
-          image: { required: true },
-          sponsoredBy: { required: true },
-          clickUrl: { required: true }
-        }
-        let request = spec.buildRequests(videoAndNativeBidRequests);
-        let data = JSON.parse(request.data);
-        data = data.imp[0];
+        it('Request params - video and native multiformat request - should not have native object incase of invalid config present', function() {
+          videoAndNativeBidRequests[0].mediaTypes.native = {
+            title: { required: true },
+            image: { required: true },
+            sponsoredBy: { required: true },
+            clickUrl: { required: true }
+          };
+          videoAndNativeBidRequests[0].nativeParams = {
+            title: { required: true },
+            image: { required: true },
+            sponsoredBy: { required: true },
+            clickUrl: { required: true }
+          }
+          let request = spec.buildRequests(videoAndNativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
 
-        expect(data.video).to.exist;
-        expect(data.native).to.not.exist;
-      });
+          expect(data.video).to.exist;
+          expect(data.native).to.not.exist;
+        });
+
+        it('should build video impression if video params are present in adunit.mediaTypes instead of bid.params', function() {
+          let videoReq = [{
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5890',
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'mimes': ['video/flv'],
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': 'adc36682-887c-41e9-9848-8b72c08332c0',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '21b59b1353ba82',
+            'bidderRequestId': '1a08245305e6dd',
+            'auctionId': 'bad3a743-7491-4d19-9a96-b0a69dd24a67',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }]
+          let request = spec.buildRequests(videoReq, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+          expect(data.video).to.exist;
+        });
+
+        it('should build video impression with overwriting video params present in adunit.mediaTypes with bid.params', function() {
+          let videoReq = [{
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5890',
+              'video': {
+                'mimes': ['video/mp4'],
+                'protocols': [1, 2, 5],
+                'linearity': 1
+              }
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'mimes': ['video/flv'],
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': 'adc36682-887c-41e9-9848-8b72c08332c0',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '21b59b1353ba82',
+            'bidderRequestId': '1a08245305e6dd',
+            'auctionId': 'bad3a743-7491-4d19-9a96-b0a69dd24a67',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }]
+          let request = spec.buildRequests(videoReq, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data = data.imp[0];
+
+          expect(data.video).to.exist;
+          expect(data.video.linearity).to.equal(1);
+        });
   	});
 
-    it('Request params dctr check', function () {
-      let multipleBidRequests = [
-        {
-          bidder: 'pubmatic',
-          params: {
-            publisherId: '301',
-            adSlot: '/15671365/DMDemo@300x250:0',
-            kadfloor: '1.2',
-            pmzoneid: 'aabc, ddef',
-            kadpageurl: 'www.publisher.com',
-            yob: '1986',
-            gender: 'M',
-            lat: '12.3',
-            lon: '23.7',
-            wiid: '1234567890',
-            profId: '100',
-            verId: '200',
-            currency: 'AUD',
-            dctr: 'key1=val1|key2=val2,!val3'
-          },
-          placementCode: '/19968336/header-bid-tag-1',
-          sizes: [[300, 250], [300, 600]],
-          bidId: '23acc48ad47af5',
-          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-          bidderRequestId: '1c56ad30b9b8ca8',
-          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-        },
-        {
-          bidder: 'pubmatic',
-          params: {
-            publisherId: '301',
-            adSlot: '/15671365/DMDemo@300x250:0',
-            kadfloor: '1.2',
-            pmzoneid: 'aabc, ddef',
-            kadpageurl: 'www.publisher.com',
-            yob: '1986',
-            gender: 'M',
-            lat: '12.3',
-            lon: '23.7',
-            wiid: '1234567890',
-            profId: '100',
-            verId: '200',
-            currency: 'GBP',
-            dctr: 'key1=val3|key2=val1,!val3|key3=val123'
+      it('Request params dctr check', function () {
+        let multipleBidRequests = [
+          {
+            bidder: 'pubmatic',
+            params: {
+              publisherId: '301',
+              adSlot: '/15671365/DMDemo@300x250:0',
+              dctr: 'key1=val1|key2=val2,!val3'
+            },
+            placementCode: '/19968336/header-bid-tag-1',
+            sizes: [[300, 250], [300, 600]],
+            bidId: '23acc48ad47af5',
+            requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+            bidderRequestId: '1c56ad30b9b8ca8',
+            transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
           },
-          placementCode: '/19968336/header-bid-tag-1',
-          sizes: [[300, 250], [300, 600]],
-          bidId: '22bddb28db77e',
-          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-          bidderRequestId: '1c56ad30b9b8ca8',
-          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-        }
-      ];
+          {
+            bidder: 'pubmatic',
+            params: {
+              publisherId: '301',
+              adSlot: '/15671365/DMDemo@300x250:0',
+              kadfloor: '1.2',
+              pmzoneid: 'aabc, ddef',
+              kadpageurl: 'www.publisher.com',
+              yob: '1986',
+              gender: 'M',
+              lat: '12.3',
+              lon: '23.7',
+              wiid: '1234567890',
+              profId: '100',
+              verId: '200',
+              currency: 'GBP',
+              dctr: 'key1=val3|key2=val1,!val3|key3=val123'
+            },
+            placementCode: '/19968336/header-bid-tag-1',
+            sizes: [[300, 250], [300, 600]],
+            bidId: '22bddb28db77e',
+            requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+            bidderRequestId: '1c56ad30b9b8ca8',
+            transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+          }
+        ];
 
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
+        let request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
 
-      /* case 1 -
+        /* case 1 -
           dctr is found in adunit[0]
         */
 
-      expect(data.site.ext).to.exist.and.to.be.an('object'); // dctr parameter
-      expect(data.site.ext.key_val).to.exist.and.to.equal(multipleBidRequests[0].params.dctr);
+        expect(data.imp[0].ext).to.exist.and.to.be.an('object'); // dctr parameter
+        expect(data.imp[0].ext.key_val).to.exist.and.to.equal(multipleBidRequests[0].params.dctr);
 
-      /* case 2 -
+        /* case 2 -
           dctr not present in adunit[0]
         */
-      delete multipleBidRequests[0].params.dctr;
-      request = spec.buildRequests(multipleBidRequests);
-      data = JSON.parse(request.data);
+        delete multipleBidRequests[0].params.dctr;
+        request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        data = JSON.parse(request.data);
 
-      expect(data.site.ext).to.not.exist;
+        expect(data.imp[0].ext).to.exist.and.to.deep.equal({});
+        expect(data.imp[1].ext).to.exist.and.to.be.an('object'); // dctr parameter
+        expect(data.imp[1].ext.key_val).to.exist.and.to.equal(multipleBidRequests[1].params.dctr);
 
-      /* case 3 -
+        /* case 3 -
           dctr is present in adunit[0], but is not a string value
         */
-      multipleBidRequests[0].params.dctr = 123;
-      request = spec.buildRequests(multipleBidRequests);
-      data = JSON.parse(request.data);
-
-      expect(data.site.ext).to.not.exist;
-    });
-  });
-
-  it('Request params deals check', function () {
-    let multipleBidRequests = [
-      {
-        bidder: 'pubmatic',
-        params: {
-          publisherId: '301',
-          adSlot: '/15671365/DMDemo@300x250:0',
-          kadfloor: '1.2',
-          pmzoneid: 'aabc, ddef',
-          kadpageurl: 'www.publisher.com',
-          yob: '1986',
-          gender: 'M',
-          lat: '12.3',
-          lon: '23.7',
-          wiid: '1234567890',
-          profId: '100',
-          verId: '200',
-          currency: 'AUD',
-          deals: ['deal-id-1', 'deal-id-2', 'dea'] // "dea" will not be passed as more than 3 characters needed
-        },
-        placementCode: '/19968336/header-bid-tag-1',
-        sizes: [[300, 250], [300, 600]],
-        bidId: '23acc48ad47af5',
-        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      },
-      {
-        bidder: 'pubmatic',
-        params: {
-          publisherId: '301',
-          adSlot: '/15671365/DMDemo@300x250:0',
-          kadfloor: '1.2',
-          pmzoneid: 'aabc, ddef',
-          kadpageurl: 'www.publisher.com',
-          yob: '1986',
-          gender: 'M',
-          lat: '12.3',
-          lon: '23.7',
-          wiid: '1234567890',
-          profId: '100',
-          verId: '200',
-          currency: 'GBP',
-          deals: ['deal-id-100', 'deal-id-200']
-        },
-        placementCode: '/19968336/header-bid-tag-1',
-        sizes: [[300, 250], [300, 600]],
-        bidId: '23acc48ad47af5',
-        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      }
-    ];
+        multipleBidRequests[0].params.dctr = 123;
+        request = spec.buildRequests(multipleBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+        data = JSON.parse(request.data);
 
-    let request = spec.buildRequests(multipleBidRequests);
-    let data = JSON.parse(request.data);
-    // case 1 - deals are passed as expected, ['', ''] , in both adUnits
-    expect(data.imp[0].pmp).to.deep.equal({
-      'private_auction': 0,
-      'deals': [
-        {
-          'id': 'deal-id-1'
-        },
-        {
-          'id': 'deal-id-2'
-        }
-      ]
-    });
-    expect(data.imp[1].pmp).to.deep.equal({
-      'private_auction': 0,
-      'deals': [
-        {
-          'id': 'deal-id-100'
-        },
-        {
-          'id': 'deal-id-200'
-        }
-      ]
+        expect(data.imp[0].ext).to.exist.and.to.deep.equal({});
+      });
     });
 
-    // case 2 - deals not present in adunit[0]
-    delete multipleBidRequests[0].params.deals;
-    request = spec.buildRequests(multipleBidRequests);
-    data = JSON.parse(request.data);
-    expect(data.imp[0].pmp).to.not.exist;
-
-    // case 3 - deals is present in adunit[0], but is not an array
-    multipleBidRequests[0].params.deals = 123;
-    request = spec.buildRequests(multipleBidRequests);
-    data = JSON.parse(request.data);
-    expect(data.imp[0].pmp).to.not.exist;
-
-    // case 4 - deals is present in adunit[0] as an array but one of the value is not a string
-    multipleBidRequests[0].params.deals = [123, 'deal-id-1'];
-    request = spec.buildRequests(multipleBidRequests);
-    data = JSON.parse(request.data);
-    expect(data.imp[0].pmp).to.deep.equal({
-      'private_auction': 0,
-      'deals': [
+    it('Request params deals check', function () {
+      let multipleBidRequests = [
         {
-          'id': 'deal-id-1'
-        }
-      ]
-    });
-  });
-
-  describe('Request param bcat checking', function() {
-    let multipleBidRequests = [
-      {
-        bidder: 'pubmatic',
-        params: {
-          publisherId: '301',
-          adSlot: '/15671365/DMDemo@300x250:0',
-          kadfloor: '1.2',
-          pmzoneid: 'aabc, ddef',
-          kadpageurl: 'www.publisher.com',
-          yob: '1986',
-          gender: 'M',
-          lat: '12.3',
-          lon: '23.7',
-          wiid: '1234567890',
-          profId: '100',
-          verId: '200',
-          currency: 'AUD',
-          dctr: 'key1=val1|key2=val2,!val3'
-        },
-        placementCode: '/19968336/header-bid-tag-1',
-        sizes: [[300, 250], [300, 600]],
-        bidId: '23acc48ad47af5',
-        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      },
-      {
-        bidder: 'pubmatic',
-        params: {
-          publisherId: '301',
-          adSlot: '/15671365/DMDemo@300x250:0',
-          kadfloor: '1.2',
-          pmzoneid: 'aabc, ddef',
-          kadpageurl: 'www.publisher.com',
-          yob: '1986',
-          gender: 'M',
-          lat: '12.3',
-          lon: '23.7',
-          wiid: '1234567890',
-          profId: '100',
-          verId: '200',
-          currency: 'GBP',
-          dctr: 'key1=val3|key2=val1,!val3|key3=val123'
-        },
-        placementCode: '/19968336/header-bid-tag-1',
-        sizes: [[300, 250], [300, 600]],
-        bidId: '23acc48ad47af5',
-        requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
-        bidderRequestId: '1c56ad30b9b8ca8',
-        transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
-      }
-    ];
-
-    it('bcat: pass only strings', function() {
-      multipleBidRequests[0].params.bcat = [1, 2, 3, 'IAB1', 'IAB2'];
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
-      expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
-    });
-
-    it('bcat: pass strings with length greater than 3', function() {
-      multipleBidRequests[0].params.bcat = ['AB', 'CD', 'IAB1', 'IAB2'];
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
-      expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
-    });
-
-    it('bcat: trim the strings', function() {
-      multipleBidRequests[0].params.bcat = ['   IAB1    ', '   IAB2   '];
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
-      expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
-    });
-
-    it('bcat: pass only unique strings', function() {
-      // multi slot
-      multipleBidRequests[0].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2'];
-      multipleBidRequests[1].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB3'];
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
-      expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2', 'IAB3']);
-    });
-
-    it('bcat: do not pass bcat if all entries are invalid', function() {
-      // multi slot
-      multipleBidRequests[0].params.bcat = ['', 'IAB', 'IAB'];
-      multipleBidRequests[1].params.bcat = ['    ', 22, 99999, 'IA'];
-      let request = spec.buildRequests(multipleBidRequests);
-      let data = JSON.parse(request.data);
-      expect(data.bcat).to.deep.equal(undefined);
-    });
-  });
+          bidder: 'pubmatic',
+          params: {
+            publisherId: '301',
+            adSlot: '/15671365/DMDemo@300x250:0',
+            kadfloor: '1.2',
+            pmzoneid: 'aabc, ddef',
+            kadpageurl: 'www.publisher.com',
+            yob: '1986',
+            gender: 'M',
+            lat: '12.3',
+            lon: '23.7',
+            wiid: '1234567890',
+            profId: '100',
+            verId: '200',
+            currency: 'AUD',
+            deals: ['deal-id-1', 'deal-id-2', 'dea'] // "dea" will not be passed as more than 3 characters needed
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+        },
+        {
+          bidder: 'pubmatic',
+          params: {
+            publisherId: '301',
+            adSlot: '/15671365/DMDemo@300x250:0',
+            kadfloor: '1.2',
+            pmzoneid: 'aabc, ddef',
+            kadpageurl: 'www.publisher.com',
+            yob: '1986',
+            gender: 'M',
+            lat: '12.3',
+            lon: '23.7',
+            wiid: '1234567890',
+            profId: '100',
+            verId: '200',
+            currency: 'GBP',
+            deals: ['deal-id-100', 'deal-id-200']
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+        }
+      ];
 
-  describe('Response checking', function () {
-    it('should check for valid response values', function () {
-      let request = spec.buildRequests(bidRequests);
+      let request = spec.buildRequests(multipleBidRequests, {
+        'auctionId': 'new-auction-id'
+      });
       let data = JSON.parse(request.data);
-      let response = spec.interpretResponse(bidResponses, request);
-      expect(response).to.be.an('array').with.length.above(0);
-      expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-      expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
-      expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
-      expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
-      if (bidResponses.body.seatbid[0].bid[0].crid) {
-        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
-      } else {
-        expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
-      }
-      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(false);
-      expect(response[0].ttl).to.equal(300);
-      expect(response[0].meta.networkId).to.equal(123);
-      expect(response[0].meta.buyerId).to.equal(976);
-      expect(response[0].meta.clickUrl).to.equal('blackrock.com');
-      expect(response[0].referrer).to.include(data.site.ref);
-      expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
-      expect(response[0].pm_seat).to.equal(bidResponses.body.seatbid[0].seat);
-      expect(response[0].pm_dspid).to.equal(bidResponses.body.seatbid[0].bid[0].ext.dspid);
-
-      expect(response[1].requestId).to.equal(bidResponses.body.seatbid[1].bid[0].impid);
-      expect(response[1].cpm).to.equal((bidResponses.body.seatbid[1].bid[0].price).toFixed(2));
-      expect(response[1].width).to.equal(bidResponses.body.seatbid[1].bid[0].w);
-      expect(response[1].height).to.equal(bidResponses.body.seatbid[1].bid[0].h);
-      if (bidResponses.body.seatbid[1].bid[0].crid) {
-        expect(response[1].creativeId).to.equal(bidResponses.body.seatbid[1].bid[0].crid);
-      } else {
-        expect(response[1].creativeId).to.equal(bidResponses.body.seatbid[1].bid[0].id);
-      }
-      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(false);
-      expect(response[1].ttl).to.equal(300);
-      expect(response[1].meta.networkId).to.equal(422);
-      expect(response[1].meta.buyerId).to.equal(832);
-      expect(response[1].meta.clickUrl).to.equal('hivehome.com');
-      expect(response[1].referrer).to.include(data.site.ref);
-      expect(response[1].ad).to.equal(bidResponses.body.seatbid[1].bid[0].adm);
-      expect(response[1].pm_seat).to.equal(bidResponses.body.seatbid[1].seat || null);
-      expect(response[1].pm_dspid).to.equal(bidResponses.body.seatbid[1].bid[0].ext.dspid);
-    });
+      // case 1 - deals are passed as expected, ['', ''] , in both adUnits
+      expect(data.imp[0].pmp).to.deep.equal({
+        'private_auction': 0,
+        'deals': [
+          {
+            'id': 'deal-id-1'
+          },
+          {
+            'id': 'deal-id-2'
+          }
+        ]
+      });
+      expect(data.imp[1].pmp).to.deep.equal({
+        'private_auction': 0,
+        'deals': [
+          {
+            'id': 'deal-id-100'
+          },
+          {
+            'id': 'deal-id-200'
+          }
+        ]
+      });
 
-    it('should check for dealChannel value selection', function () {
-      let request = spec.buildRequests(bidRequests);
-      let response = spec.interpretResponse(bidResponses, request);
+      // case 2 - deals not present in adunit[0]
+      delete multipleBidRequests[0].params.deals;
+      request = spec.buildRequests(multipleBidRequests, {
+        'auctionId': 'new-auction-id'
+      });
+      data = JSON.parse(request.data);
+      expect(data.imp[0].pmp).to.not.exist;
 
-      request = JSON.parse(request.data);
+      // case 3 - deals is present in adunit[0], but is not an array
+      multipleBidRequests[0].params.deals = 123;
+      request = spec.buildRequests(multipleBidRequests, {
+        'auctionId': 'new-auction-id'
+      });
+      data = JSON.parse(request.data);
+      expect(data.imp[0].pmp).to.not.exist;
 
-      expect(response).to.be.an('array').with.length.above(0);
-      expect(response[0].requestId).to.equal(request.imp[0].id);
-      expect(response[0].dealChannel).to.equal('PMPG');
-      expect(response[1].dealChannel).to.equal('PREF');
+      // case 4 - deals is present in adunit[0] as an array but one of the value is not a string
+      multipleBidRequests[0].params.deals = [123, 'deal-id-1'];
+      request = spec.buildRequests(multipleBidRequests, {
+        'auctionId': 'new-auction-id'
+      });
+      data = JSON.parse(request.data);
+      expect(data.imp[0].pmp).to.deep.equal({
+        'private_auction': 0,
+        'deals': [
+          {
+            'id': 'deal-id-1'
+          }
+        ]
+      });
     });
 
-    it('should check for unexpected dealChannel value selection', function () {
-      let request = spec.buildRequests(bidRequests);
-      let updateBiResponse = bidResponses;
-      updateBiResponse.body.seatbid[0].bid[0].ext.deal_channel = 11;
-      let response = spec.interpretResponse(updateBiResponse, request);
-      expect(response).to.be.an('array').with.length.above(0);
-      expect(response[0].dealChannel).to.equal(null);
-    });
+    describe('Request param bcat checking', function() {
+      let multipleBidRequests = [
+        {
+          bidder: 'pubmatic',
+          params: {
+            publisherId: '301',
+            adSlot: '/15671365/DMDemo@300x250:0',
+            kadfloor: '1.2',
+            pmzoneid: 'aabc, ddef',
+            kadpageurl: 'www.publisher.com',
+            yob: '1986',
+            gender: 'M',
+            lat: '12.3',
+            lon: '23.7',
+            wiid: '1234567890',
+            profId: '100',
+            verId: '200',
+            currency: 'AUD',
+            dctr: 'key1=val1|key2=val2,!val3'
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+        },
+        {
+          bidder: 'pubmatic',
+          params: {
+            publisherId: '301',
+            adSlot: '/15671365/DMDemo@300x250:0',
+            kadfloor: '1.2',
+            pmzoneid: 'aabc, ddef',
+            kadpageurl: 'www.publisher.com',
+            yob: '1986',
+            gender: 'M',
+            lat: '12.3',
+            lon: '23.7',
+            wiid: '1234567890',
+            profId: '100',
+            verId: '200',
+            currency: 'GBP',
+            dctr: 'key1=val3|key2=val1,!val3|key3=val123'
+          },
+          placementCode: '/19968336/header-bid-tag-1',
+          sizes: [[300, 250], [300, 600]],
+          bidId: '23acc48ad47af5',
+          requestId: '0fb4905b-9456-4152-86be-c6f6d259ba99',
+          bidderRequestId: '1c56ad30b9b8ca8',
+          transactionId: '92489f71-1bf2-49a0-adf9-000cea934729'
+        }
+      ];
 
-    it('should assign renderer if bid is video and request is for outstream', function() {
-      let request = spec.buildRequests(outstreamBidRequest, validOutstreamBidRequest);
-      let response = spec.interpretResponse(outstreamVideoBidResponse, request);
-      expect(response[0].renderer).to.exist;
-    });
+      it('bcat: pass only strings', function() {
+        multipleBidRequests[0].params.bcat = [1, 2, 3, 'IAB1', 'IAB2'];
+        let request = spec.buildRequests(multipleBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
+      });
 
-    it('should not assign renderer if bidderRequest is not present', function() {
-      let request = spec.buildRequests(outstreamBidRequest);
-      let response = spec.interpretResponse(outstreamVideoBidResponse, request);
-      expect(response[0].renderer).to.not.exist;
-    });
+      it('bcat: pass strings with length greater than 3', function() {
+        multipleBidRequests[0].params.bcat = ['AB', 'CD', 'IAB1', 'IAB2'];
+        let request = spec.buildRequests(multipleBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
+      });
 
-    it('should not assign renderer if bid is video and request is for instream', function() {
-      let request = spec.buildRequests(videoBidRequests);
-      let response = spec.interpretResponse(videoBidResponse, request);
-      expect(response[0].renderer).to.not.exist;
-    });
+      it('bcat: trim the strings', function() {
+        multipleBidRequests[0].params.bcat = ['   IAB1    ', '   IAB2   '];
+        let request = spec.buildRequests(multipleBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2']);
+      });
 
-    it('should not assign renderer if bid is native', function() {
-      let request = spec.buildRequests(nativeBidRequests);
-      let response = spec.interpretResponse(nativeBidResponse, request);
-      expect(response[0].renderer).to.not.exist;
-    });
+      it('bcat: pass only unique strings', function() {
+      // multi slot
+        multipleBidRequests[0].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB2'];
+        multipleBidRequests[1].params.bcat = ['IAB1', 'IAB2', 'IAB1', 'IAB2', 'IAB1', 'IAB3'];
+        let request = spec.buildRequests(multipleBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.exist.and.to.deep.equal(['IAB1', 'IAB2', 'IAB3']);
+      });
 
-    it('should not assign renderer if bid is of banner', function() {
-      let request = spec.buildRequests(bidRequests);
-      let response = spec.interpretResponse(bidResponses, request);
-      expect(response[0].renderer).to.not.exist;
+      it('bcat: do not pass bcat if all entries are invalid', function() {
+      // multi slot
+        multipleBidRequests[0].params.bcat = ['', 'IAB', 'IAB'];
+        multipleBidRequests[1].params.bcat = ['    ', 22, 99999, 'IA'];
+        let request = spec.buildRequests(multipleBidRequests);
+        let data = JSON.parse(request.data);
+        expect(data.bcat).to.deep.equal(undefined);
+      });
     });
 
     describe('Response checking', function () {
       it('should check for valid response values', function () {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          'auctionId': 'new-auction-id'
+        });
         let data = JSON.parse(request.data);
         let response = spec.interpretResponse(bidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
@@ -2557,10 +3159,9 @@ 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(false);
+        expect(response[0].netRevenue).to.equal(true);
         expect(response[0].ttl).to.equal(300);
         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(976);
         expect(response[0].meta.clickUrl).to.equal('blackrock.com');
         expect(response[0].referrer).to.include(data.site.ref);
@@ -2579,10 +3180,9 @@ 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(false);
+        expect(response[1].netRevenue).to.equal(true);
         expect(response[1].ttl).to.equal(300);
         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);
         expect(response[1].meta.clickUrl).to.equal('hivehome.com');
         expect(response[1].referrer).to.include(data.site.ref);
@@ -2591,128 +3191,446 @@ describe('PubMatic adapter', function () {
         expect(response[1].pm_dspid).to.equal(bidResponses.body.seatbid[1].bid[0].ext.dspid);
       });
 
-      it('should add a dummy bid when, empty bid is returned by hbopenbid', () => {
-        let request = spec.buildRequests(bidRequests);
-        let response = spec.interpretResponse(emptyBidResponse, request);
+      it('should check for dealChannel value selection', function () {
+        let request = spec.buildRequests(bidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let response = spec.interpretResponse(bidResponses, request);
 
         request = JSON.parse(request.data);
-        expect(response).to.exist.and.be.an('array').with.length.above(0);
+
+        expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].requestId).to.equal(request.imp[0].id);
-        expect(response[0].width).to.equal(0);
-        expect(response[0].height).to.equal(0);
-        expect(response[0].ttl).to.equal(300);
-        expect(response[0].ad).to.equal('');
-        expect(response[0].creativeId).to.equal(0);
-        expect(response[0].netRevenue).to.equal(false);
-        expect(response[0].cpm).to.equal(0);
-        expect(response[0].currency).to.equal('USD');
-        expect(response[0].referrer).to.equal(request.site && request.site.ref ? request.site.ref : '');
+        expect(response[0].dealChannel).to.equal('PMPG');
+        expect(response[1].dealChannel).to.equal('PREF');
       });
 
-      it('should add one dummy & one original bid if partial response come from hbopenbid', () => {
-        let request = spec.buildRequests([firstBid, secoundBid]);
-        let response = spec.interpretResponse({
-          'body': {
-            'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
-            'seatbid': [firstResponse]
-          }
-        }, request);
-
-        request = JSON.parse(request.data);
-        expect(response).to.exist.and.be.an('array').with.length.above(0);
-        expect(response.length).to.equal(2);
-        expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-        expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
-        expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
-        expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
-        if (bidResponses.body.seatbid[0].bid[0].crid) {
-          expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
-        } else {
-          expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
-        }
-        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(false);
-        expect(response[0].ttl).to.equal(300);
-        expect(response[0].referrer).to.include(request.site && request.site.ref ? request.site.ref : '');
-        expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      it('should check for unexpected dealChannel value selection', function () {
+        let request = spec.buildRequests(bidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let updateBiResponse = bidResponses;
+        updateBiResponse.body.seatbid[0].bid[0].ext.deal_channel = 11;
+        let response = spec.interpretResponse(updateBiResponse, request);
+        expect(response).to.be.an('array').with.length.above(0);
+        expect(response[0].dealChannel).to.equal(null);
+      });
 
-        expect(response[1].requestId).to.equal(request.imp[1].id);
-        expect(response[1].width).to.equal(0);
-        expect(response[1].height).to.equal(0);
-        expect(response[1].ttl).to.equal(300);
-        expect(response[1].ad).to.equal('');
-        expect(response[1].creativeId).to.equal(0);
-        expect(response[1].netRevenue).to.equal(false);
-        expect(response[1].cpm).to.equal(0);
-        expect(response[1].currency).to.equal('USD');
-        expect(response[1].referrer).to.equal(request.site && request.site.ref ? request.site.ref : '');
+      it('should assign renderer if bid is video and request is for outstream', function() {
+        let request = spec.buildRequests(outstreamBidRequest, validOutstreamBidRequest);
+        let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+        expect(response[0].renderer).to.exist;
       });
 
-      it('should responsed bid if partial response come from hbopenbid', () => {
-        let request = spec.buildRequests([firstBid]);
-        let response = spec.interpretResponse(bidResponses, request);
+      it('should not assign renderer if bidderRequest is not present', function() {
+        let request = spec.buildRequests(outstreamBidRequest, {
+          'auctionId': 'new-auction-id'
+        });
+        let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+        expect(response[0].renderer).to.not.exist;
+      });
 
-        request = JSON.parse(request.data);
-        expect(response.length).to.equal(1);
-        expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
-        expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
-        expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
-        expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
-        if (bidResponses.body.seatbid[0].bid[0].crid) {
-          expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
-        } else {
-          expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
-        }
-        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(false);
-        expect(response[0].ttl).to.equal(300);
-        expect(response[0].referrer).to.include(request.site && request.site.ref ? request.site.ref : '');
-        expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      it('should not assign renderer if bid is video and request is for instream', function() {
+        let request = spec.buildRequests(videoBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let response = spec.interpretResponse(videoBidResponse, request);
+        expect(response[0].renderer).to.not.exist;
       });
 
-      it('should have a valid native bid response', function() {
-        let request = spec.buildRequests(nativeBidRequests);
-        let data = JSON.parse(request.data);
-        data.imp[0].id = '2a5571261281d4';
-        request.data = JSON.stringify(data);
+      it('should not assign renderer if bid is native', function() {
+        let request = spec.buildRequests(nativeBidRequests, {
+          'auctionId': 'new-auction-id'
+        });
         let response = spec.interpretResponse(nativeBidResponse, request);
-        expect(response).to.be.an('array').with.length.above(0);
-        expect(response[0].native).to.exist.and.to.be.an('object');
-        expect(response[0].mediaType).to.exist.and.to.equal('native');
-        expect(response[0].native.title).to.exist.and.to.be.an('string');
-        expect(response[0].native.image).to.exist.and.to.be.an('object');
-        expect(response[0].native.image.url).to.exist.and.to.be.an('string');
-        expect(response[0].native.image.height).to.exist;
-        expect(response[0].native.image.width).to.exist;
-        expect(response[0].native.sponsoredBy).to.exist.and.to.be.an('string');
-        expect(response[0].native.clickUrl).to.exist.and.to.be.an('string');
+        expect(response[0].renderer).to.not.exist;
       });
 
-      it('should check for valid banner mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(bidRequests);
-        let response = spec.interpretResponse(bannerBidResponse, request);
-
-        expect(response[0].mediaType).to.equal('banner');
+      it('should not assign renderer if bid is of banner', function() {
+        let request = spec.buildRequests(bidRequests, {
+          'auctionId': 'new-auction-id'
+        });
+        let response = spec.interpretResponse(bidResponses, request);
+        expect(response[0].renderer).to.not.exist;
       });
 
-      it('should check for valid video mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(videoBidRequests);
-        let response = spec.interpretResponse(videoBidResponse, request);
+      describe('Response checking', function () {
+        it('should check for valid response values', function () {
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          let response = spec.interpretResponse(bidResponses, request);
+          expect(response).to.be.an('array').with.length.above(0);
+          expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+          expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
+          expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+          expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+          if (bidResponses.body.seatbid[0].bid[0].crid) {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+          } else {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+          }
+          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].meta.networkId).to.equal(123);
+          expect(response[0].adserverTargeting.hb_buyid_pubmatic).to.equal('BUYER-ID-987');
+          expect(response[0].meta.buyerId).to.equal(976);
+          expect(response[0].meta.clickUrl).to.equal('blackrock.com');
+          expect(response[0].meta.advertiserDomains[0]).to.equal('blackrock.com');
+          expect(response[0].referrer).to.include(data.site.ref);
+          expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+          expect(response[0].pm_seat).to.equal(bidResponses.body.seatbid[0].seat);
+          expect(response[0].pm_dspid).to.equal(bidResponses.body.seatbid[0].bid[0].ext.dspid);
+          expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+
+          expect(response[1].requestId).to.equal(bidResponses.body.seatbid[1].bid[0].impid);
+          expect(response[1].cpm).to.equal((bidResponses.body.seatbid[1].bid[0].price).toFixed(2));
+          expect(response[1].width).to.equal(bidResponses.body.seatbid[1].bid[0].w);
+          expect(response[1].height).to.equal(bidResponses.body.seatbid[1].bid[0].h);
+          if (bidResponses.body.seatbid[1].bid[0].crid) {
+            expect(response[1].creativeId).to.equal(bidResponses.body.seatbid[1].bid[0].crid);
+          } else {
+            expect(response[1].creativeId).to.equal(bidResponses.body.seatbid[1].bid[0].id);
+          }
+          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].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);
+          expect(response[1].meta.clickUrl).to.equal('hivehome.com');
+          expect(response[1].meta.advertiserDomains[0]).to.equal('hivehome.com');
+          expect(response[1].referrer).to.include(data.site.ref);
+          expect(response[1].ad).to.equal(bidResponses.body.seatbid[1].bid[0].adm);
+          expect(response[1].pm_seat).to.equal(bidResponses.body.seatbid[1].seat || null);
+          expect(response[1].pm_dspid).to.equal(bidResponses.body.seatbid[1].bid[0].ext.dspid);
+          expect(response[0].partnerImpId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+        });
 
-        expect(response[0].mediaType).to.equal('video');
-      });
+        it('should add a dummy bid when, empty bid is returned by hbopenbid', () => {
+          let request = spec.buildRequests(bidRequests, { 'auctionId': 'new-auction-id' });
+          let response = spec.interpretResponse(emptyBidResponse, request);
+
+          request = JSON.parse(request.data);
+          expect(response).to.exist.and.be.an('array').with.length.above(0);
+          expect(response[0].requestId).to.equal(request.imp[0].id);
+          expect(response[0].width).to.equal(0);
+          expect(response[0].height).to.equal(0);
+          expect(response[0].ttl).to.equal(300);
+          expect(response[0].ad).to.equal('');
+          expect(response[0].creativeId).to.equal(0);
+          expect(response[0].netRevenue).to.equal(true);
+          expect(response[0].cpm).to.equal(0);
+          expect(response[0].currency).to.equal('USD');
+          expect(response[0].referrer).to.equal(request.site && request.site.ref ? request.site.ref : '');
+        });
 
-      it('should check for valid native mediaType in case of multiformat request', function() {
-        let request = spec.buildRequests(nativeBidRequests);
-        let response = spec.interpretResponse(nativeBidResponse, request);
+        it('should add one dummy & one original bid if partial response come from hbopenbid', () => {
+          let request = spec.buildRequests([firstBid, secoundBid], {
+            'auctionId': 'new-auction-id'
+          });
+          let response = spec.interpretResponse({
+            'body': {
+              'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
+              'seatbid': [firstResponse]
+            }
+          }, request);
+
+          request = JSON.parse(request.data);
+          expect(response).to.exist.and.be.an('array').with.length.above(0);
+          expect(response.length).to.equal(2);
+          expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+          expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
+          expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+          expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+          if (bidResponses.body.seatbid[0].bid[0].crid) {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+          } else {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+          }
+          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].referrer).to.include(request.site && request.site.ref ? request.site.ref : '');
+          expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+          expect(response[1].requestId).to.equal(request.imp[1].id);
+          expect(response[1].width).to.equal(0);
+          expect(response[1].height).to.equal(0);
+          expect(response[1].ttl).to.equal(300);
+          expect(response[1].ad).to.equal('');
+          expect(response[1].creativeId).to.equal(0);
+          expect(response[1].netRevenue).to.equal(true);
+          expect(response[1].cpm).to.equal(0);
+          expect(response[1].currency).to.equal('USD');
+          expect(response[1].referrer).to.equal(request.site && request.site.ref ? request.site.ref : '');
+        });
+
+        it('should responsed bid if partial response come from hbopenbid', () => {
+          let request = spec.buildRequests([firstBid], {
+            'auctionId': 'new-auction-id'
+          });
+          let response = spec.interpretResponse(bidResponses, request);
+
+          request = JSON.parse(request.data);
+          expect(response.length).to.equal(1);
+          expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
+          expect(response[0].cpm).to.equal((bidResponses.body.seatbid[0].bid[0].price).toFixed(2));
+          expect(response[0].width).to.equal(bidResponses.body.seatbid[0].bid[0].w);
+          expect(response[0].height).to.equal(bidResponses.body.seatbid[0].bid[0].h);
+          if (bidResponses.body.seatbid[0].bid[0].crid) {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].crid);
+          } else {
+            expect(response[0].creativeId).to.equal(bidResponses.body.seatbid[0].bid[0].id);
+          }
+          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].referrer).to.include(request.site && request.site.ref ? request.site.ref : '');
+          expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+        });
+
+        it('should have a valid native bid response', function() {
+          let request = spec.buildRequests(nativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let data = JSON.parse(request.data);
+          data.imp[0].id = '2a5571261281d4';
+          request.data = JSON.stringify(data);
+          let response = spec.interpretResponse(nativeBidResponse, request);
+          expect(response).to.be.an('array').with.length.above(0);
+          expect(response[0].native).to.exist.and.to.be.an('object');
+          expect(response[0].mediaType).to.exist.and.to.equal('native');
+          expect(response[0].native.title).to.exist.and.to.be.an('string');
+          expect(response[0].native.image).to.exist.and.to.be.an('object');
+          expect(response[0].native.image.url).to.exist.and.to.be.an('string');
+          expect(response[0].native.image.height).to.exist;
+          expect(response[0].native.image.width).to.exist;
+          expect(response[0].native.sponsoredBy).to.exist.and.to.be.an('string');
+          expect(response[0].native.clickUrl).to.exist.and.to.be.an('string');
+        });
+
+        it('should check for valid banner mediaType in case of multiformat request', function() {
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(bannerBidResponse, request);
+
+          expect(response[0].mediaType).to.equal('banner');
+        });
+
+        it('should check for valid video mediaType in case of multiformat request', function() {
+          let request = spec.buildRequests(videoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(videoBidResponse, request);
+          expect(response[0].mediaType).to.equal('video');
+        });
+
+        it('should check for valid native mediaType in case of multiformat request', function() {
+          let request = spec.buildRequests(nativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(nativeBidResponse, request);
+
+          expect(response[0].mediaType).to.equal('native');
+        });
+
+        it('should assign renderer if bid is video and request is for outstream', function() {
+          let request = spec.buildRequests(outstreamBidRequest, validOutstreamBidRequest);
+          let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+          expect(response[0].renderer).to.exist;
+        });
+
+        it('should not assign renderer if bidderRequest is not present', function() {
+          let request = spec.buildRequests(outstreamBidRequest, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(outstreamVideoBidResponse, request);
+          expect(response[0].renderer).to.not.exist;
+        });
+
+        it('should not assign renderer if bid is video and request is for instream', function() {
+          let request = spec.buildRequests(videoBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(videoBidResponse, request);
+          expect(response[0].renderer).to.not.exist;
+        });
+
+        it('should not assign renderer if bid is native', function() {
+          let request = spec.buildRequests(nativeBidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(nativeBidResponse, request);
+          expect(response[0].renderer).to.not.exist;
+        });
+
+        it('should not assign renderer if bid is of banner', function() {
+          let request = spec.buildRequests(bidRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let response = spec.interpretResponse(bidResponses, request);
+          expect(response[0].renderer).to.not.exist;
+        });
 
-        expect(response[0].mediaType).to.equal('native');
+        it('should assign mediaType by reading bid.ext.mediaType', function() {
+          let newvideoRequests = [{
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5670',
+              'video': {
+                'mimes': ['video/mp4'],
+                'skippable': true,
+                'protocols': [1, 2, 5],
+                'linearity': 1
+              }
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'mimes': ['video/flv'],
+                'skippable': false,
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '2c95df014cfe97',
+            'bidderRequestId': '1fe59391566442',
+            'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }];
+          let newvideoBidResponses = {
+            'body': {
+              'id': '1621441141473',
+              'cur': 'USD',
+              'customdata': 'openrtb1',
+              'ext': {
+                'buyid': 'myBuyId'
+              },
+              'seatbid': [{
+                'bid': [{
+                  'id': '2c95df014cfe97',
+                  'impid': '2c95df014cfe97',
+                  'price': 4.2,
+                  'cid': 'test1',
+                  'crid': 'test2',
+                  'adm': "Acudeo CompatibleVAST 2.0 Instream Test 1VAST 2.0 Instream Test 1",
+                  'w': 0,
+                  'h': 0,
+                  'dealId': 'ASEA-MS-KLY-TTD-DESKTOP-ID-VID-6S-030420',
+                  'ext': {
+                    'bidtype': 1
+                  }
+                }],
+                'ext': {
+                  'buyid': 'myBuyId'
+                }
+              }]
+            },
+            'headers': {}
+          }
+          let newrequest = spec.buildRequests(newvideoRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let newresponse = spec.interpretResponse(newvideoBidResponses, newrequest);
+          expect(newresponse[0].mediaType).to.equal('video')
+        })
+
+        it('should assign mediaType even if bid.ext.mediaType does not exists', function() {
+          let newvideoRequests = [{
+            'bidder': 'pubmatic',
+            'params': {
+              'adSlot': 'SLOT_NHB1@728x90',
+              'publisherId': '5670',
+              'video': {
+                'mimes': ['video/mp4'],
+                'skippable': true,
+                'protocols': [1, 2, 5],
+                'linearity': 1
+              }
+            },
+            'mediaTypes': {
+              'video': {
+                'playerSize': [
+                  [640, 480]
+                ],
+                'protocols': [1, 2, 5],
+                'context': 'instream',
+                'mimes': ['video/flv'],
+                'skippable': false,
+                'skip': 1,
+                'linearity': 2
+              }
+            },
+            'adUnitCode': 'video1',
+            'transactionId': '803e3750-0bbe-4ffe-a548-b6eca15087bf',
+            'sizes': [
+              [640, 480]
+            ],
+            'bidId': '2c95df014cfe97',
+            'bidderRequestId': '1fe59391566442',
+            'auctionId': '3a4118ef-fb96-4416-b0b0-3cfc1cebc142',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0
+          }];
+          let newvideoBidResponses = {
+            'body': {
+              'id': '1621441141473',
+              'cur': 'USD',
+              'customdata': 'openrtb1',
+              'ext': {
+                'buyid': 'myBuyId'
+              },
+              'seatbid': [{
+                'bid': [{
+                  'id': '2c95df014cfe97',
+                  'impid': '2c95df014cfe97',
+                  'price': 4.2,
+                  'cid': 'test1',
+                  'crid': 'test2',
+                  'adm': "Acudeo CompatibleVAST 2.0 Instream Test 1VAST 2.0 Instream Test 1",
+                  'w': 0,
+                  'h': 0,
+                  'dealId': 'ASEA-MS-KLY-TTD-DESKTOP-ID-VID-6S-030420'
+                }],
+                'ext': {
+                  'buyid': 'myBuyId'
+                }
+              }]
+            },
+            'headers': {}
+          }
+          let newrequest = spec.buildRequests(newvideoRequests, {
+            auctionId: 'new-auction-id'
+          });
+          let newresponse = spec.interpretResponse(newvideoBidResponses, newrequest);
+          expect(newresponse[0].mediaType).to.equal('video')
+        })
       });
 
       describe('getUserSyncs', function() {
-        const syncurl_iframe = 'https://ads.pubmatic.com/AdServer/js/showad.js#PIX&kdntuid=1&p=5670';
+        const syncurl_iframe = 'https://ads.pubmatic.com/AdServer/js/user_sync.html?kdntuid=1&p=5670';
         const syncurl_image = 'https://image8.pubmatic.com/AdServer/ImgSync?p=5670';
         let sandbox;
         beforeEach(function () {
@@ -2808,5 +3726,43 @@ describe('PubMatic adapter', function () {
         });
       });
     });
+
+    describe('Checking for Video.Placement property', function() {
+      let sandbox, utilsMock;
+      const adUnit = 'Div1';
+      const msg_placement_missing = 'Video.Placement param missing for Div1';
+      let videoData = {
+        battr: [6, 7],
+        skipafter: 15,
+        maxduration: 50,
+        context: 'instream',
+        playerSize: [640, 480],
+        skip: 0,
+        connectiontype: [1, 2, 6],
+        skipmin: 10,
+        minduration: 10,
+        mimes: ['video/mp4', 'video/x-flv'],
+      }
+      beforeEach(() => {
+        utilsMock = sinon.mock(utils);
+        sandbox = sinon.sandbox.create();
+        sandbox.spy(utils, 'logWarn');
+      });
+
+      afterEach(() => {
+        utilsMock.restore();
+        sandbox.restore();
+      })
+
+      it('should log Video.Placement 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;
+        checkVideoPlacement(videoData, adUnit);
+        sinon.assert.neverCalledWith(utils.logWarn, msg_placement_missing);
+      })
+    });
   });
 });
diff --git a/test/spec/modules/pubmaticServerBidAdapter_spec.js b/test/spec/modules/pubmaticServerBidAdapter_spec.js
index ed897ab8242..79fd0aa92f1 100644
--- a/test/spec/modules/pubmaticServerBidAdapter_spec.js
+++ b/test/spec/modules/pubmaticServerBidAdapter_spec.js
@@ -4,7 +4,7 @@ import * as utils from 'src/utils';
 const constants = require('src/constants.json');
 
 describe('PubMaticServer adapter', () => {
-  let bidRequests;
+  let bidRequests, videoBidRequests;
   let bidResponses;
   let errorCodeBidResponses;
 
@@ -79,6 +79,37 @@ describe('PubMaticServer adapter', () => {
       }
     ];
 
+    videoBidRequests = [{
+      code: 'video1',
+      mediaTypes: {
+        video: {
+          playerSize: [640, 480],
+          context: 'instream'
+        }
+      },
+      bidder: 'pubmaticServer',
+      bidId: '22bddb28db77d',
+      params: {
+        publisherId: '5890',
+        adSlot: 'Div1', // ad_id or tagid
+        video: {
+          mimes: ['video/mp4', 'video/x-flv'],
+          skippable: true,
+          minduration: 5,
+          maxduration: 30,
+          startdelay: 5,
+          playbackmethod: [1, 3],
+          api: [1, 2],
+          protocols: [2, 3],
+          battr: [13, 14],
+          linearity: 1,
+          placement: 2,
+          minbitrate: 10,
+          maxbitrate: 10
+        }
+      }
+    }];
+
     bidResponses = {
       'body': {
         'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
@@ -276,13 +307,17 @@ describe('PubMaticServer adapter', () => {
 
   	describe('Request formation', () => {
   		it('Endpoint checking', () => {
-  		  let request = spec.buildRequests(bidRequests);
+  		  let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         expect(request.url).to.equal('https://ow.pubmatic.com/openrtb/2.5/');
         expect(request.method).to.equal('POST');
   		});
 
   		it('Request params check', () => {
-  		  let request = spec.buildRequests(bidRequests);
+  		  let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
   		  let data = JSON.parse(request.data);
   		  expect(data.at).to.equal(1); // auction type
   		  expect(data.cur[0]).to.equal('USD'); // currency
@@ -321,6 +356,24 @@ describe('PubMaticServer adapter', () => {
 
         expect(data.imp[0].banner.format[0].w).to.equal(300); // width from 1st element of sizes array
         expect(data.imp[0].banner.format[0].h).to.equal(250); // height from 1st element of sizes array
+      });
+
+      it('request should have video params', () => {
+  		  let request = spec.buildRequests(videoBidRequests, {
+          auctionId: 'new-auction-id'
+        });
+  		  let data = JSON.parse(request.data);
+  		  // expect(data.at).to.equal(1); // auction type
+  		  expect(data.cur[0]).to.equal('USD'); // currency
+  		  expect(data.ext.wrapper.wp).to.equal('pbjs'); // Prebid TransactionId
+  		  expect(data.ext.wrapper.wiid).to.equal('new-auction-id'); // OpenWrap: Wrapper Impression ID
+        // expect(data.ext.wrapper.profileid).to.equal(parseInt(videoBidRequests[0].params.profId)); // OpenWrap: Wrapper Profile ID
+  		  // expect(data.ext.wrapper.versionid).to.equal(parseInt(videoBidRequests[0].params.verId)); // OpenWrap: Wrapper Profile Version ID
+  		  expect(data.imp[0].id).to.equal(videoBidRequests[0].bidId); // Prebid bid id is passed as id
+  		  expect(data.imp[0].tagid).to.equal(videoBidRequests[0].params.adUnitId); // tagid
+        expect(data.imp[0].video.mimes).to.deep.equal(videoBidRequests[0].params.video.mimes);
+        expect(data.imp[0].video.minduration).to.equal(videoBidRequests[0].params.video.minduration);
+        expect(data.imp[0].video.maxduration).to.equal(videoBidRequests[0].params.video.maxduration);
   		});
 
       it('Request params check with GDPR consent', () => {
@@ -427,7 +480,9 @@ describe('PubMaticServer adapter', () => {
 
     describe('Response checking', () => {
       it('should check for valid response values', () => {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(bidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].requestId).to.equal(bidResponses.body.seatbid[0].bid[0].impid);
@@ -454,14 +509,18 @@ describe('PubMaticServer adapter', () => {
 
     describe('Response checking', () => {
       it('should set serverSideResponseTime to 0 when error code retured by endpoint is 5', () => {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         let response = spec.interpretResponse(errorCodeBidResponses, request);
         expect(response).to.be.an('array').with.length.above(0);
         expect(response[0].serverSideResponseTime).to.equal(0);
       });
 
       it('should set serverSideResponseTime to -1 when error code retured by endpoint any of the following 1/2/6', () => {
-        let request = spec.buildRequests(bidRequests);
+        let request = spec.buildRequests(bidRequests, {
+          auctionId: 'new-auction-id'
+        });
         errorCodeBidResponses.body.seatbid[0].bid[0].ext.summary[0].errorCode = 1;
 
         let response = spec.interpretResponse(errorCodeBidResponses, request);
diff --git a/test/spec/modules/pubperfAnalyticsAdapter_spec.js b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..b316b44617a
--- /dev/null
+++ b/test/spec/modules/pubperfAnalyticsAdapter_spec.js
@@ -0,0 +1,55 @@
+import pubperfAnalytics from 'modules/pubperfAnalyticsAdapter.js';
+import { expect } from 'chai';
+import { server } from 'test/mocks/xhr.js';
+let events = require('src/events');
+let utils = require('src/utils.js');
+let constants = require('src/constants.json');
+
+describe('Pubperf Analytics Adapter', function() {
+  describe('Prebid Manager Analytic tests', function() {
+    beforeEach(function() {
+      sinon.stub(events, 'getEvents').returns([]);
+      sinon.stub(utils, 'logError');
+    });
+
+    afterEach(function() {
+      events.getEvents.restore();
+      utils.logError.restore();
+    });
+
+    it('should throw error, when pubperf_pbjs is not defined', function() {
+      pubperfAnalytics.enableAnalytics({
+        provider: 'pubperf'
+      });
+
+      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      events.emit(constants.EVENTS.BID_REQUESTED, {});
+      events.emit(constants.EVENTS.BID_RESPONSE, {});
+      events.emit(constants.EVENTS.BID_WON, {});
+      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+
+      expect(server.requests.length).to.equal(0);
+      expect(utils.logError.called).to.equal(true);
+    });
+
+    it('track event without errors', function() {
+      sinon.spy(pubperfAnalytics, 'track');
+
+      window['pubperf_pbjs'] = function() {};
+
+      pubperfAnalytics.enableAnalytics({
+        provider: 'pubperf'
+      });
+
+      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      events.emit(constants.EVENTS.BID_REQUESTED, {});
+      events.emit(constants.EVENTS.BID_RESPONSE, {});
+      events.emit(constants.EVENTS.BID_WON, {});
+      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+
+      sinon.assert.callCount(pubperfAnalytics.track, 6);
+    });
+  });
+});
diff --git a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
index 5e4b2be894e..3be4ea3d69c 100644
--- a/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
+++ b/test/spec/modules/pubwiseAnalyticsAdapter_spec.js
@@ -1,47 +1,164 @@
+import { expect } from 'chai';
 import pubwiseAnalytics from 'modules/pubwiseAnalyticsAdapter.js';
+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('PubWise Prebid Analytics', function () {
-  after(function () {
+  let requests;
+  let sandbox;
+  let xhr;
+  let clock;
+  let mock = {};
+
+  mock.DEFAULT_PW_CONFIG = {
+    provider: 'pubwiseanalytics',
+    options: {
+      site: ['b1ccf317-a6fc-428d-ba69-0c9c208aa61c'],
+      custom: {'c_script_type': 'test-script-type', 'c_host': 'test-host', 'c_slot1': 'test-slot1', 'c_slot2': 'test-slot2', 'c_slot3': 'test-slot3', 'c_slot4': 'test-slot4'}
+    }
+  };
+  mock.AUCTION_INIT = {auctionId: '53c35d77-bd62-41e7-b920-244140e30c77'};
+  mock.AUCTION_INIT_EXTRAS = {
+    auctionId: '53c35d77-bd62-41e7-b920-244140e30c77',
+    adUnitCodes: 'not empty',
+    adUnits: '',
+    bidderRequests: ['0'],
+    bidsReceived: '0',
+    config: {test: 'config'},
+    noBids: 'no bids today',
+    winningBids: 'winning bids',
+    extraProp: 'extraProp retained'
+  };
+
+  beforeEach(function() {
+    sandbox = sinon.sandbox.create();
+    clock = sandbox.useFakeTimers();
+    sandbox.stub(events, 'getEvents').returns([]);
+
+    xhr = sandbox.useFakeXMLHttpRequest();
+    requests = [];
+    xhr.onCreate = request => requests.push(request);
+  });
+
+  afterEach(function () {
+    sandbox.restore();
+    clock.restore();
     pubwiseAnalytics.disableAnalytics();
   });
 
   describe('enableAnalytics', function () {
     beforeEach(function () {
-      sinon.stub(events, 'getEvents').returns([]);
-    });
-
-    afterEach(function () {
-      events.getEvents.restore();
+      requests = [];
     });
 
     it('should catch all events', function () {
-      sinon.spy(pubwiseAnalytics, 'track');
+      pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
 
-      adapterManager.registerAnalyticsAdapter({
-        code: 'pubwiseanalytics',
-        adapter: pubwiseAnalytics
-      });
+      sandbox.spy(pubwiseAnalytics, 'track');
 
-      adapterManager.enableAnalytics({
-        provider: 'pubwiseanalytics',
-        options: {
-          site: ['test-test-test-test']
-        }
-      });
-
-      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      // 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(constants.EVENTS.AD_RENDER_FAILED, {});
+      events.emit(constants.EVENTS.TCF2_ENFORCEMENT, {});
+      events.emit(constants.EVENTS.BID_TIMEOUT, {});
 
+      // forces flush
       events.emit(constants.EVENTS.AUCTION_END, {});
-      events.emit(constants.EVENTS.BID_TIMEOUT, {});
+
+      // eslint-disable-next-line
+      //console.log(requests);   
 
       /* testing for 6 calls, including the 2 we're not currently tracking */
-      sinon.assert.callCount(pubwiseAnalytics.track, 6);
+      sandbox.assert.callCount(pubwiseAnalytics.track, 7);
+    });
+
+    it('should initialize the auction properly', 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, {});
+      // force flush
+      clock.tick(500);
+
+      /* check for critical values */
+      let request = requests[0];
+      let data = JSON.parse(request.requestBody);
+      // eslint-disable-next-line
+      // console.log(data.metaData);            
+      expect(data.metaData, 'metaData property').to.exist;
+      expect(data.metaData.pbjs_version, 'pbjs version').to.equal('$prebid.version$')
+      expect(data.metaData.session_id, 'session id').not.to.be.empty
+      expect(data.metaData.activation_id, 'activation id').not.to.be.empty
+
+      // check custom metadata slots
+      expect(data.metaData.c_script_type, 'c_script_type property').to.exist;
+      expect(data.metaData.c_script_type, 'c_script_type').not.to.be.empty
+      expect(data.metaData.c_script_type).to.equal('test-script-type');
+
+      expect(data.metaData.c_host, 'c_host property').to.exist;
+      expect(data.metaData.c_host, 'c_host').not.to.be.empty
+      expect(data.metaData.c_host).to.equal('test-host');
+
+      expect(data.metaData.c_slot1, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot1, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot1).to.equal('test-slot1');
+
+      expect(data.metaData.c_slot2, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot2, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot2).to.equal('test-slot2');
+
+      expect(data.metaData.c_slot3, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot3, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot3).to.equal('test-slot3');
+
+      expect(data.metaData.c_slot4, 'c_slot1 property').to.exist;
+      expect(data.metaData.c_slot4, 'c_slot1').not.to.be.empty
+      expect(data.metaData.c_slot4).to.equal('test-slot4');
+
+      // check for version info too
+      expect(data.metaData.pw_version, 'pw_version property').to.exist;
+      expect(data.metaData.pbjs_version, 'pbjs_version property').to.exist;
+    });
+
+    it('should remove extra data on init', function () {
+      pubwiseAnalytics.enableAnalytics(mock.DEFAULT_PW_CONFIG);
+
+      // sent
+      events.emit(constants.EVENTS.AUCTION_INIT, mock.AUCTION_INIT_EXTRAS);
+      // force flush
+      clock.tick(500);
+
+      /* check for critical values */
+      let request = requests[0];
+      let data = JSON.parse(request.requestBody);
+
+      // check the basics
+      expect(data.eventList, 'eventList property').to.exist;
+      expect(data.eventList[0], 'eventList property').to.exist;
+      expect(data.eventList[0].args, 'eventList property').to.exist;
+
+      // eslint-disable-next-line
+      // console.log(data.eventList[0].args);
+
+      let eventArgs = data.eventList[0].args;
+      // the props we want removed should go away
+      expect(eventArgs.adUnitCodes, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.bidderRequests, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.bidsReceived, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.config, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.noBids, 'adUnitCodes property').not.to.exist;
+      expect(eventArgs.winningBids, 'adUnitCodes property').not.to.exist;
+
+      // the extra prop should still exist
+      expect(eventArgs.extraProp, 'adUnitCodes property').to.exist;
     });
   });
 });
diff --git a/test/spec/modules/pubwiseBidAdapter_spec.js b/test/spec/modules/pubwiseBidAdapter_spec.js
new file mode 100644
index 00000000000..450b028f6c7
--- /dev/null
+++ b/test/spec/modules/pubwiseBidAdapter_spec.js
@@ -0,0 +1,575 @@
+// import or require modules necessary for the test, e.g.:
+
+import {expect} from 'chai';
+import {spec} from 'modules/pubwiseBidAdapter.js';
+import {_checkMediaType} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import {_parseAdSlot} from 'modules/pubwiseBidAdapter.js'; // this is exported only for testing so maintaining the JS convention of _ to indicate the intent
+import * as utils from 'src/utils.js';
+
+const sampleRequestBanner = {
+  'id': '6c148795eb836a',
+  'tagid': 'div-gpt-ad-1460505748561-0',
+  'bidfloor': 1,
+  'secure': 1,
+  'bidfloorcur': 'USD',
+  'banner': {
+    'w': 300,
+    'h': 250,
+    'format': [
+      {
+        'w': 300,
+        'h': 600
+      }
+    ],
+    'pos': 0,
+    'topframe': 1
+  }
+};
+
+const sampleRequest = {
+  'at': 1,
+  'cur': [
+    'USD'
+  ],
+  'imp': [
+    sampleRequestBanner,
+    {
+      'id': '7329ddc1d84eb3',
+      'tagid': 'div-gpt-ad-1460505748561-1',
+      'secure': 1,
+      'bidfloorcur': 'USD',
+      'native': {
+        'request': '{"assets":[{"id":1,"required":1,"title":{"len":80}},{"id":5,"required":1,"data":{"type":2}},{"id":2,"required":1,"img":{"type":{"ID":2,"KEY":"image","TYPE":0},"w":150,"h":50}},{"id":4,"required":1,"data":{"type":1}}]}'
+      }
+    }
+  ],
+  'site': {
+    'page': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'ref': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'publisher': {
+      'id': 'xxxxxx'
+    }
+  },
+  'device': {
+    'ua': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+    'js': 1,
+    'dnt': 0,
+    'h': 600,
+    'w': 800,
+    'language': 'en-US',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    }
+  },
+  'user': {
+    'gender': 'M',
+    'geo': {
+      'lat': 33.91989876432274,
+      'lon': -84.38897708175764
+    },
+    'yob': 2000
+  },
+  'test': 0,
+  'ext': {
+    'version': '0.0.1'
+  },
+  'source': {
+    'tid': '2c8cd034-f068-4419-8c30-f07292c0d17b'
+  }
+};
+
+const sampleValidBannerBidRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'gender': 'M',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'yob': '2000',
+    'bcat': ['IAB25-3', 'IAB26-1', 'IAB26-2', 'IAB26-3', 'IAB26-4'],
+  },
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  'fpd': {
+    'context': {
+      'adServer': {
+        'name': 'gam',
+        'adSlot': '/19968336/header-bid-tag-0'
+      },
+      'pbAdSlot': '/19968336/header-bid-tag-0'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          250
+        ],
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0
+};
+
+const sampleValidBidRequests = [
+  sampleValidBannerBidRequest,
+  {
+    'bidder': 'pubwise',
+    'params': {
+      'siteId': 'xxxxxx'
+    },
+    'crumbs': {
+      'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+    },
+    'nativeParams': {
+      'title': {
+        'required': true,
+        'len': 80
+      },
+      'body': {
+        'required': true
+      },
+      'image': {
+        'required': true,
+        'sizes': [
+          150,
+          50
+        ]
+      },
+      'sponsoredBy': {
+        'required': true
+      },
+      'icon': {
+        'required': false
+      }
+    },
+    'fpd': {
+      'context': {
+        'adServer': {
+          'name': 'gam',
+          'adSlot': '/19968336/header-bid-tag-0'
+        },
+        'pbAdSlot': '/19968336/header-bid-tag-0'
+      }
+    },
+    'mediaTypes': {
+      'native': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      }
+    },
+    'adUnitCode': 'div-gpt-ad-1460505748561-1',
+    'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+    'sizes': [],
+    'bidId': '30ab7516a51a7c',
+    'bidderRequestId': '18a45bff5ff705',
+    'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+    'src': 'client',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 1,
+    'bidderWinsCount': 0
+  }
+]
+
+const sampleBidderBannerRequest = {
+  'bidder': 'pubwise',
+  'params': {
+    'siteId': 'xxxxxx',
+    'height': 250,
+    'width': 300,
+    'gender': 'M',
+    'yob': '2000',
+    'lat': '33.91989876432274',
+    'lon': '-84.38897708175764',
+    'bidFloor': '1.00',
+    'currency': 'USD',
+    'adSlot': '',
+    'adUnit': '',
+    'bcat': [
+      'IAB25-3',
+      'IAB26-1',
+      'IAB26-2',
+      'IAB26-3',
+      'IAB26-4',
+    ],
+  },
+  'crumbs': {
+    'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+  },
+  'fpd': {
+    'context': {
+      'adServer': {
+        'name': 'gam',
+        'adSlot': '/19968336/header-bid-tag-0'
+      },
+      'pbAdSlot': '/19968336/header-bid-tag-0'
+    }
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [
+        [
+          300,
+          600
+        ]
+      ]
+    }
+  },
+  'adUnitCode': 'div-gpt-ad-1460505748561-0',
+  'transactionId': '2001a8b2-3bcf-417d-b64f-92641dae21e0',
+  'sizes': [
+    [
+      300,
+      250
+    ],
+    [
+      300,
+      600
+    ]
+  ],
+  'bidId': '6c148795eb836a',
+  'bidderRequestId': '18a45bff5ff705',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'src': 'client',
+  'bidRequestsCount': 1,
+  'bidderRequestsCount': 1,
+  'bidderWinsCount': 0,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+};
+
+const sampleBidderRequest = {
+  'bidderCode': 'pubwise',
+  'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+  'bidderRequestId': '18a45bff5ff705',
+  'bids': [
+    sampleBidderBannerRequest,
+    {
+      'bidder': 'pubwise',
+      'params': {
+        'siteId': 'xxxxxx'
+      },
+      'crumbs': {
+        'pubcid': '9a62f261-3c0b-4cc8-8db3-a72ae86ec6ba'
+      },
+      'nativeParams': {
+        'title': {
+          'required': true,
+          'len': 80
+        },
+        'body': {
+          'required': true
+        },
+        'image': {
+          'required': true,
+          'sizes': [
+            150,
+            50
+          ]
+        },
+        'sponsoredBy': {
+          'required': true
+        },
+        'icon': {
+          'required': false
+        }
+      },
+      'fpd': {
+        'context': {
+          'adServer': {
+            'name': 'gam',
+            'adSlot': '/19968336/header-bid-tag-0'
+          },
+          'pbAdSlot': '/19968336/header-bid-tag-0'
+        }
+      },
+      'mediaTypes': {
+        'native': {
+          'title': {
+            'required': true,
+            'len': 80
+          },
+          'body': {
+            'required': true
+          },
+          'image': {
+            'required': true,
+            'sizes': [
+              150,
+              50
+            ]
+          },
+          'sponsoredBy': {
+            'required': true
+          },
+          'icon': {
+            'required': false
+          }
+        }
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-1',
+      'transactionId': '2c8cd034-f068-4419-8c30-f07292c0d17b',
+      'sizes': [],
+      'bidId': '30ab7516a51a7c',
+      'bidderRequestId': '18a45bff5ff705',
+      'auctionId': '9f20663c-4629-4b5c-bff6-ff3aa8319358',
+      'src': 'client',
+      'bidRequestsCount': 1,
+      'bidderRequestsCount': 1,
+      'bidderWinsCount': 0
+    }
+  ],
+  'auctionStart': 1606269202001,
+  'timeout': 1000,
+  'gdprConsent': {
+    'consentString': 'BOEFEAyOEFEAyAHABDENAI4AAAB9vABAASA',
+    'gdprApplies': 1,
+  },
+  'uspConsent': 1,
+  'refererInfo': {
+    'referer': 'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true',
+    'reachedTop': true,
+    'isAmp': false,
+    'numIframes': 0,
+    'stack': [
+      'http://localhost:9999/integrationExamples/gpt/hello_world.html?pbjs_debug=true'
+    ],
+    'canonicalUrl': null
+  },
+  'start': 1606269202004
+};
+
+const sampleRTBResponse = {
+  'body': {
+    'id': '1606251348404',
+    'seatbid': [
+      {
+        'bid': [
+          {
+            'id': '1606579704052',
+            'impid': '6c148795eb836a',
+            'price': 1.23,
+            'adm': '\u003cdiv style="box-sizing: border-box;width:298px;height:248px;border: 1px solid rgba(0,0,0,.25);border-radius:10px;"\u003e\n\t\u003ch3 style="margin-top:80px;text-align: center;"\u003ePubWise Test Bid\u003c/h3\u003e\n\u003c/div\u003e',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          },
+          {
+            'id': '1606579704052',
+            'impid': '7329ddc1d84eb3',
+            'price': 1.23,
+            'adm': '{"ver":"1.2","assets":[{"id":1,"title":{"text":"PubWise Test"}},{"id":2,"img":{"type":3,"url":"http://www.pubwise.io","w":300,"h":250}},{"id":3,"img":{"type":1,"url":"http://www.pubwise.io","w":150,"h":125}},{"id":5,"data":{"type":2,"value":"PubWise Test Desc"}},{"id":4,"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":"http://www.pubwise.io"}}',
+            'crid': 'test',
+            'w': 300,
+            'h': 250
+          }
+        ]
+      }
+    ],
+    'bidid': 'testtesttest'
+  }
+};
+
+const samplePBBidObjects = [
+  {
+    'requestId': '6c148795eb836a',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '
\n\t
PubWise Test Bid
\n
',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'meta': {},
+    'mediaType': 'banner',
+  },
+  {
+    'requestId': '7329ddc1d84eb3',
+    'cpm': '1.23',
+    'width': 300,
+    'height': 250,
+    'creativeId': 'test',
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'ad': '{\"ver\":\"1.2\",\"assets\":[{\"id\":1,\"title\":{\"text\":\"PubWise Test\"}},{\"id\":2,\"img\":{\"type\":3,\"url\":\"http://www.pubwise.io\",\"w\":300,\"h\":250}},{\"id\":3,\"img\":{\"type\":1,\"url\":\"http://www.pubwise.io\",\"w\":150,\"h\":125}},{\"id\":5,\"data\":{\"type\":2,\"value\":\"PubWise Test Desc\"}},{\"id\":4,\"data\":{\"type\":1,\"value\":\"PubWise.io\"}}],\"link\":{\"url\":\"http://www.pubwise.io\"}}',
+    'pw_seat': null,
+    'pw_dspid': null,
+    'partnerImpId': '1606579704052',
+    'mediaType': 'native',
+    'native': {
+      'body': 'PubWise Test Desc',
+      'icon': {
+        'height': 125,
+        'url': 'http://www.pubwise.io',
+        'width': 150,
+      },
+      'image': {
+        'height': 250,
+        'url': 'http://www.pubwise.io',
+        'width': 300,
+      },
+      'sponsoredBy': 'PubWise.io',
+      'title': 'PubWise Test'
+    },
+    'meta': {},
+    'impressionTrackers': [],
+    'jstracker': [],
+    'clickTrackers': [],
+    'clickUrl': 'http://www.pubwise.io'
+  }
+];
+
+describe('PubWiseAdapter', function () {
+  describe('Properly Validates Bids', function () {
+    it('valid bid', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx'
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('valid bid: extra fields are ok', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 'xxxxxx',
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(true);
+    });
+
+    it('invalid bid: no siteId', function () {
+      let inValidBid = {
+          bidder: 'pubwise',
+          params: {
+            gender: 'M',
+          }
+        },
+        isValid = spec.isBidRequestValid(inValidBid);
+      expect(isValid).to.equal(false);
+    });
+
+    it('invalid bid: siteId should be a string', function () {
+      let validBid = {
+          bidder: 'pubwise',
+          params: {
+            siteId: 123456
+          }
+        },
+        isValid = spec.isBidRequestValid(validBid);
+      expect(isValid).to.equal(false);
+    });
+  });
+
+  describe('Handling Request Construction', function () {
+    it('bid requests are not mutable', function() {
+      let sourceBidRequest = utils.deepClone(sampleValidBidRequests)
+      spec.buildRequests(sampleValidBidRequests, {auctinId: 'placeholder'});
+      expect(sampleValidBidRequests).to.deep.equal(sourceBidRequest, 'Should be unedited as they are used elsewhere');
+    });
+    it('should handle complex bidRequest', function() {
+      let request = spec.buildRequests(sampleValidBidRequests, sampleBidderRequest);
+      expect(request.bidderRequest).to.equal(sampleBidderRequest);
+    });
+    it('must conform to API for buildRequests', function() {
+      let request = spec.buildRequests(sampleValidBidRequests);
+      expect(request.bidderRequest).to.be.undefined;
+    });
+  });
+
+  describe('Identifies Media Types', function () {
+    it('identifies native adm type', function() {
+      let adm = '{"ver":"1.2","assets":[{"title":{"text":"PubWise Test"}},{"img":{"type":3,"url":"http://www.pubwise.io"}},{"img":{"type":1,"url":"http://www.pubwise.io"}},{"data":{"type":2,"value":"PubWise Test Desc"}},{"data":{"type":1,"value":"PubWise.io"}}],"link":{"url":""}}';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('native', adm + ' Is a Native adm');
+    });
+
+    it('identifies banner adm type', function() {
+      let adm = '
↵	
PubWise Test Bid
↵
';
+      let newBid = {mediaType: 'unknown'};
+      _checkMediaType(adm, newBid);
+      expect(newBid.mediaType).to.equal('banner', adm + ' Is a Banner adm');
+    });
+  });
+
+  describe('Properly Parses AdSlot Data', function () {
+    it('parses banner', function() {
+      let testBid = utils.deepClone(sampleValidBannerBidRequest)
+      _parseAdSlot(testBid)
+      expect(testBid).to.deep.equal(sampleBidderBannerRequest);
+    });
+  });
+
+  describe('Properly Handles Response', function () {
+    it('handles response with muiltiple responses', function() {
+      // the request when it comes back is on the data object
+      let pbResponse = spec.interpretResponse(sampleRTBResponse, {'data': sampleRequest})
+      expect(pbResponse).to.deep.equal(samplePBBidObjects);
+    });
+  });
+});
diff --git a/test/spec/modules/pubxBidAdapter_spec.js b/test/spec/modules/pubxBidAdapter_spec.js
new file mode 100644
index 00000000000..6cea8787845
--- /dev/null
+++ b/test/spec/modules/pubxBidAdapter_spec.js
@@ -0,0 +1,189 @@
+import {expect} from 'chai';
+import {spec} from 'modules/pubxBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+describe('pubxAdapter', function () {
+  const adapter = newBidder(spec);
+  const ENDPOINT = 'https://api.primecaster.net/adlogue/api/slot/bid';
+
+  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: 'pubx',
+      params: {
+        sid: '12345abc'
+      }
+    };
+
+    it('should return true when required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    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);
+    });
+  });
+
+  describe('buildRequests', function () {
+    const bidRequests = [
+      {
+        id: '26c1ee0038ac11',
+        params: {
+          sid: '12345abc'
+        }
+      }
+    ];
+
+    const data = {
+      banner: {
+        sid: '12345abc'
+      }
+    };
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.url).to.equal(ENDPOINT);
+      expect(request.method).to.equal('GET');
+    });
+
+    it('should attach params to the banner request', function () {
+      const request = spec.buildRequests(bidRequests)[0];
+      expect(request.data).to.deep.equal(data.banner);
+    });
+  });
+
+  describe('getUserSyncs', function () {
+    const sandbox = sinon.sandbox.create();
+
+    const keywordsText = 'meta1,meta2,meta3,meta4,meta5';
+    const descriptionText = 'description1description2description3description4description5description';
+
+    let documentStubMeta;
+
+    beforeEach(function () {
+      documentStubMeta = sandbox.stub(document, 'getElementsByName');
+      const metaElKeywords = document.createElement('meta');
+      metaElKeywords.setAttribute('name', 'keywords');
+      metaElKeywords.setAttribute('content', keywordsText);
+      documentStubMeta.withArgs('keywords').returns([metaElKeywords]);
+
+      const metaElDescription = document.createElement('meta');
+      metaElDescription.setAttribute('name', 'description');
+      metaElDescription.setAttribute('content', descriptionText);
+      documentStubMeta.withArgs('description').returns([metaElDescription]);
+    });
+
+    afterEach(function () {
+      documentStubMeta.restore();
+    });
+
+    let kwString = '';
+    let kwEnc = '';
+    let descContent = '';
+    let descEnc = '';
+
+    it('returns empty sync array when iframe is not enabled', function () {
+      const syncOptions = {};
+      expect(spec.getUserSyncs(syncOptions)).to.deep.equal([]);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 20 length', function () {
+      const kwArray = keywordsText.substr(0, 20).split(',');
+      kwArray.pop();
+      kwString = kwArray.join();
+      kwEnc = encodeURIComponent(kwString);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${kwEnc}`);
+    });
+
+    it('returns kwEnc when there is kwTag with more than 60 length', function () {
+      descContent = descContent.substr(0, 60);
+      descEnc = encodeURIComponent(descContent);
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pkw=${descEnc}`);
+    });
+
+    it('returns titleEnc when there is titleContent with more than 30 length', function () {
+      let titleText = 'title1title2title3title4title5title';
+      const documentStubTitle = sandbox.stub(document, 'title').value(titleText);
+
+      if (titleText.length > 30) {
+        titleText = titleText.substr(0, 30);
+      }
+
+      const syncs = spec.getUserSyncs({ iframeEnabled: true });
+      expect(syncs[0].url).to.include(`pt=${encodeURIComponent(titleText)}`);
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const serverResponse = {
+      body: {
+        TTL: 300,
+        adm: '
some creative
',
+        cid: 'TKmB',
+        cpm: 500,
+        currency: 'JPY',
+        height: 250,
+        width: 300,
+      }
+    }
+
+    const bidRequests = [
+      {
+        id: '26c1ee0038ac11',
+        params: {
+          sid: '12345abc'
+        }
+      }
+    ];
+
+    const bidResponses = [
+      {
+        requestId: '26c1ee0038ac11',
+        cpm: 500,
+        currency: 'JPY',
+        width: 300,
+        height: 250,
+        creativeId: 'TKmB',
+        netRevenue: true,
+        ttl: 300,
+        ad: '
some creative
'
+      }
+    ];
+    it('should return empty array when required param is empty', function () {
+      const serverResponseWithCidEmpty = {
+        body: {
+          TTL: 300,
+          adm: '
some creative
',
+          cid: '',
+          cpm: '',
+          currency: 'JPY',
+          height: 250,
+          width: 300,
+        }
+      }
+      const result = spec.interpretResponse(serverResponseWithCidEmpty, bidRequests[0]);
+      expect(result).to.be.empty;
+    });
+    it('handles banner responses', function () {
+      const result = spec.interpretResponse(serverResponse, bidRequests[0])[0];
+      expect(result.requestId).to.equal(bidResponses[0].requestId);
+      expect(result.width).to.equal(bidResponses[0].width);
+      expect(result.height).to.equal(bidResponses[0].height);
+      expect(result.creativeId).to.equal(bidResponses[0].creativeId);
+      expect(result.currency).to.equal(bidResponses[0].currency);
+      expect(result.netRevenue).to.equal(bidResponses[0].netRevenue);
+      expect(result.ttl).to.equal(bidResponses[0].ttl);
+      expect(result.ad).to.equal(bidResponses[0].ad);
+    });
+  });
+});
diff --git a/test/spec/modules/pubxaiAnalyticsAdapter_spec.js b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..40f7afeeb6a
--- /dev/null
+++ b/test/spec/modules/pubxaiAnalyticsAdapter_spec.js
@@ -0,0 +1,683 @@
+import pubxaiAnalyticsAdapter from 'modules/pubxaiAnalyticsAdapter.js';
+import { getDeviceType, getBrowser, getOS } from 'modules/pubxaiAnalyticsAdapter.js';
+import {
+  expect
+} from 'chai';
+import adapterManager from 'src/adapterManager.js';
+import * as utils from 'src/utils.js';
+import {
+  server
+} from 'test/mocks/xhr.js';
+
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+describe('pubxai analytics adapter', function() {
+  beforeEach(function() {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+
+  afterEach(function() {
+    events.getEvents.restore();
+  });
+
+  describe('track', function() {
+    let initOptions = {
+      samplingRate: '1',
+      pubxId: '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+    };
+
+    let location = utils.getWindowLocation();
+
+    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
+            },
+            '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'
+        ],
+        '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
+          }],
+          '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': [],
+        'winningBids': [],
+        'timeout': 1000,
+        'config': {
+          'samplingRate': '1',
+          'pubxId': '6c415fc0-8b0e-4cf5-be73-01526a4db625'
+        }
+      },
+      '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
+        }],
+        '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
+        },
+        '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
+          },
+          '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'
+        },
+      },
+      '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'
+        }],
+        '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
+          }],
+          '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
+            },
+            '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
+          }]
+        }],
+        '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
+        },
+        '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
+          },
+          '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
+        }]
+      },
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search
+      },
+    };
+
+    let expectedAfterBid = {
+      'bids': [{
+        'bidderCode': 'appnexus',
+        'bidId': '248f9a4489835e',
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        '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
+          },
+          'matchedFields': {
+            'gptSlot': '/19968336/header-bid-tag-1',
+            'mediaType': 'banner'
+          }
+        },
+        'timeToRespond': 267,
+        'responseTimestamp': 1616654313071
+      }],
+      'pageDetail': {
+        'host': location.host,
+        'path': location.pathname,
+        'search': location.search,
+        'adUnitCount': 1
+      },
+      '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()
+      },
+      'initOptions': initOptions
+    };
+
+    let expectedAfterBidWon = {
+      'winningBid': {
+        'adUnitCode': '/19968336/header-bid-tag-1',
+        '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'
+          }
+        },
+        'floorProvider': 'PubXFloorProvider',
+        'isWinningBid': true,
+        'mediaType': 'banner',
+        'netRevenue': true,
+        'placementId': 13144370,
+        'renderedSize': '300x250',
+        'renderStatus': 4,
+        'responseTimestamp': 1616654313071,
+        'requestTimestamp': 1616654312804,
+        'status': 'rendered',
+        'statusMessage': 'Bid available',
+        'timeToRespond': 267
+      },
+      'deviceDetail': {
+        'platform': navigator.platform,
+        'deviceType': getDeviceType(),
+        'deviceOS': getOS(),
+        'browser': getBrowser()
+      },
+      'initOptions': initOptions
+    }
+
+    adapterManager.registerAnalyticsAdapter({
+      code: 'pubxai',
+      adapter: pubxaiAnalyticsAdapter
+    });
+
+    beforeEach(function() {
+      adapterManager.enableAnalytics({
+        provider: 'pubxai',
+        options: initOptions
+      });
+    });
+
+    afterEach(function() {
+      pubxaiAnalyticsAdapter.disableAnalytics();
+    });
+
+    it('builds and sends auction data', function() {
+      // Step 1: Send auction init event
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
+
+      // Step 2: Send bid requested event
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
+
+      // Step 3: Send bid response event
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
+
+      // Step 4: Send bid time out event
+      events.emit(constants.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);
+
+      let realAfterBid = JSON.parse(server.requests[0].requestBody);
+
+      expect(realAfterBid).to.deep.equal(expectedAfterBid);
+
+      // Step 6: Send auction bid won event
+      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
+
+      expect(server.requests.length).to.equal(2);
+
+      let winEventData = JSON.parse(server.requests[1].requestBody);
+
+      expect(winEventData).to.deep.equal(expectedAfterBidWon);
+    });
+  });
+});
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index 4b21856b68e..6630cb0907c 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -19,6 +19,11 @@ describe('PulsePoint Adapter Tests', function () {
     }
   }, {
     placementCode: '/DfpAccount2/slot2',
+    mediaTypes: {
+      banner: {
+        sizes: [[728, 90]]
+      }
+    },
     bidId: 'bid23456',
     params: {
       cp: 'p10000',
@@ -72,6 +77,11 @@ describe('PulsePoint Adapter Tests', function () {
   }];
   const additionalParamsConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -89,6 +99,11 @@ describe('PulsePoint Adapter Tests', function () {
 
   const ortbParamsSlotConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -146,6 +161,11 @@ describe('PulsePoint Adapter Tests', function () {
 
   const schainParamsSlotConfig = [{
     placementCode: '/DfpAccount1/slot1',
+    mediaTypes: {
+      banner: {
+        sizes: [[1, 1]]
+      }
+    },
     bidId: 'bid12345',
     params: {
       cp: 'p10000',
@@ -234,7 +254,7 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.ttl).to.equal(20);
   });
 
-  it('Verify ttl/currency applied to bid', function () {
+  it('Verify ttl/currency/adomain applied to bid', function () {
     const request = spec.buildRequests(slotConfigs, bidderRequest);
     const ortbRequest = request.data;
     const ortbResponse = {
@@ -244,7 +264,8 @@ describe('PulsePoint Adapter Tests', function () {
           price: 1.25,
           adm: 'This is an Ad#1',
           crid: 'Creative#123',
-          exp: 50
+          exp: 50,
+          adomain: ['advertiser.com']
         }, {
           impid: ortbRequest.imp[1].id,
           price: 1.25,
@@ -262,11 +283,15 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.ad).to.equal('This is an Ad#1');
     expect(bid.ttl).to.equal(50);
     expect(bid.currency).to.equal('GBP');
+    expect(bid.meta).to.not.be.null;
+    expect(bid.meta.advertiserDomains).to.eql(['advertiser.com']);
     const secondBid = bids[1];
     expect(secondBid.cpm).to.equal(1.25);
     expect(secondBid.ad).to.equal('This is an Ad#2');
     expect(secondBid.ttl).to.equal(20);
     expect(secondBid.currency).to.equal('GBP');
+    expect(secondBid.meta).to.not.be.null;
+    expect(secondBid.meta.advertiserDomains).to.eql([]);
   });
 
   it('Verify full passback', function () {
@@ -630,8 +655,8 @@ describe('PulsePoint Adapter Tests', function () {
       britepoolid: 'britepool_id123',
       criteoId: 'criteo_id234',
       idl_env: 'idl_id123',
-      id5id: 'id5id_234',
-      parrableid: 'parrable_id234',
+      id5id: { uid: 'id5id_234' },
+      parrableId: { eid: 'parrable_id234' },
       lipb: {
         lipbid: 'liveintent_id123'
       }
@@ -681,7 +706,10 @@ describe('PulsePoint Adapter Tests', function () {
     expect(ortbRequest.imp[1].banner).to.not.be.null;
     expect(ortbRequest.imp[1].banner.w).to.equal(728);
     expect(ortbRequest.imp[1].banner.h).to.equal(90);
-    expect(ortbRequest.imp[1].banner.format).to.be.null;
+    expect(ortbRequest.imp[1].banner.format).to.not.be.null;
+    expect(ortbRequest.imp[1].banner.format).to.have.lengthOf(1);
+    expect(ortbRequest.imp[1].banner.format[0].w).to.equal(728);
+    expect(ortbRequest.imp[1].banner.format[0].h).to.equal(90);
     // adsize on response
     const ortbResponse = {
       seatbid: [{
@@ -701,4 +729,113 @@ describe('PulsePoint Adapter Tests', function () {
     expect(bid.width).to.equal(728);
     expect(bid.height).to.equal(90);
   });
+  it('Verify multi-format response', function () {
+    const bidRequests = deepClone(slotConfigs);
+    bidRequests[0].mediaTypes['native'] = {
+      title: {
+        required: true
+      },
+      image: {
+        required: true
+      },
+      sponsoredBy: {
+        required: true
+      }
+    };
+    bidRequests[1].params.video = {
+      w: 400,
+      h: 300,
+      minduration: 5,
+      maxduration: 10,
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    expect(request).to.be.not.null;
+    expect(request.data).to.be.not.null;
+    const ortbRequest = request.data;
+    expect(ortbRequest.imp).to.have.lengthOf(2);
+    // adsize on response
+    const ortbResponse = {
+      seatbid: [{
+        bid: [{
+          impid: ortbRequest.imp[0].id,
+          price: 1.25,
+          adm: 'This is an Ad',
+          crid: 'Creative#123',
+          w: 728,
+          h: 90
+        }, {
+          impid: ortbRequest.imp[1].id,
+          price: 2.5,
+          adm: '',
+          crid: 'Creative#234',
+          w: 728,
+          h: 90
+        }]
+      }]
+    };
+    // request has both types - banner and native, response is parsed as banner.
+    // for impression#2, response is parsed as video
+    const bids = spec.interpretResponse({ body: ortbResponse }, request);
+    expect(bids).to.have.lengthOf(2);
+    const bid = bids[0];
+    expect(bid.width).to.equal(728);
+    expect(bid.height).to.equal(90);
+    const secondBid = bids[1];
+    expect(secondBid.vastXml).to.equal('');
+  });
+  it('Verify bid floor', function () {
+    const bidRequests = deepClone(slotConfigs);
+    bidRequests[0].params.bidfloor = 1.05;
+    let request = spec.buildRequests(bidRequests, bidderRequest);
+    let ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp[0].bidfloor).to.equal(1.05);
+    expect(ortbRequest.imp[1].bidfloor).to.be.undefined;
+    let floorArg = null;
+    // publisher uses the floor module
+    bidRequests[0].getFloor = (arg) => {
+      floorArg = arg;
+      return { floor: 1.25 };
+    };
+    bidRequests[1].getFloor = () => {
+      return { floor: 2.05 };
+    };
+    request = spec.buildRequests(bidRequests, bidderRequest);
+    ortbRequest = request.data;
+    expect(ortbRequest).to.not.equal(null);
+    expect(ortbRequest.imp[0].bidfloor).to.equal(1.25);
+    expect(ortbRequest.imp[1].bidfloor).to.equal(2.05);
+    expect(floorArg).to.not.be.null;
+    expect(floorArg.mediaType).to.equal('banner');
+    expect(floorArg.currency).to.equal('USD');
+    expect(floorArg.size).to.equal('*');
+  });
+  it('Verify Video params on mediaTypes.video', function () {
+    const bidRequests = deepClone(videoSlotConfig);
+    bidRequests[0].mediaTypes = {
+      video: {
+        w: 600,
+        h: 400,
+        minduration: 15,
+        maxduration: 20,
+        startdelay: 10,
+        skip: 0,
+      }
+    };
+    const request = spec.buildRequests(bidRequests, bidderRequest);
+    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.null;
+    expect(ortbRequest.imp[0].banner).to.be.null;
+    expect(ortbRequest.imp[0].video.w).to.equal(600);
+    expect(ortbRequest.imp[0].video.h).to.equal(400);
+    expect(ortbRequest.imp[0].video.minduration).to.equal(15);
+    expect(ortbRequest.imp[0].video.maxduration).to.equal(20);
+    expect(ortbRequest.imp[0].video.startdelay).to.equal(10);
+    expect(ortbRequest.imp[0].video.skip).to.equal(0);
+    expect(ortbRequest.imp[0].video.minbitrate).to.equal(200);
+    expect(ortbRequest.imp[0].video.protocols).to.eql([1, 2, 4]);
+  });
 });
diff --git a/test/spec/modules/quantcastBidAdapter_spec.js b/test/spec/modules/quantcastBidAdapter_spec.js
index cd168ec61e6..5e0d129581c 100644
--- a/test/spec/modules/quantcastBidAdapter_spec.js
+++ b/test/spec/modules/quantcastBidAdapter_spec.js
@@ -7,7 +7,8 @@ import {
   QUANTCAST_TEST_PUBLISHER,
   QUANTCAST_PROTOCOL,
   QUANTCAST_PORT,
-  spec as qcSpec
+  spec as qcSpec,
+  storage
 } from '../../../modules/quantcastBidAdapter.js';
 import { newBidder } from '../../../src/adapters/bidderFactory.js';
 import { parseUrl } from 'src/utils.js';
@@ -42,18 +43,19 @@ describe('Quantcast adapter', function () {
         canonicalUrl: 'http://example.com/hello.html'
       }
     };
+
+    storage.setCookie('__qca', '', 'Thu, 01 Jan 1970 00:00:00 GMT');
   });
 
-  function setupVideoBidRequest(videoParams) {
+  function setupVideoBidRequest(videoParams, mediaTypesParams) {
     bidRequest.params = {
       publisherId: 'test-publisher', // REQUIRED - Publisher ID provided by Quantcast
       // Video object as specified in OpenRTB 2.5
       video: videoParams
     };
-    bidRequest['mediaTypes'] = {
-      video: {
-        context: 'instream',
-        playerSize: [600, 300]
+    if (mediaTypesParams) {
+      bidRequest['mediaTypes'] = {
+        video: mediaTypesParams
       }
     }
   };
@@ -140,7 +142,8 @@ describe('Quantcast adapter', function () {
       gdprSignal: 0,
       uspSignal: 0,
       coppa: 0,
-      prebidJsVersion: '$prebid.version$'
+      prebidJsVersion: '$prebid.version$',
+      fpa: ''
     };
 
     it('sends banner bid requests contains all the required parameters', function () {
@@ -171,6 +174,9 @@ describe('Quantcast adapter', function () {
         delivery: [1], // optional
         placement: 1, // optional
         api: [2, 3] // optional
+      }, {
+        context: 'instream',
+        playerSize: [600, 300]
       });
 
       const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
@@ -208,7 +214,68 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
+      };
+
+      expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
+    });
+
+    it('sends video bid requests containing all the required parameters from mediaTypes', function() {
+      setupVideoBidRequest(null, {
+        mimes: ['video/mp4'], // required
+        minduration: 3, // optional
+        maxduration: 5, // optional
+        protocols: [3], // optional
+        startdelay: 1, // optional
+        linearity: 1, // optinal
+        battr: [1, 2], // optional
+        maxbitrate: 10, // optional
+        playbackmethod: [1], // optional
+        delivery: [1], // optional
+        placement: 1, // optional
+        api: [2, 3], // optional
+        context: 'instream',
+        playerSize: [600, 300]
+      });
+
+      const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
+      const expectedVideoBidRequest = {
+        publisherId: QUANTCAST_TEST_PUBLISHER,
+        requestId: '2f7b179d443f14',
+        imp: [
+          {
+            video: {
+              mimes: ['video/mp4'],
+              minduration: 3,
+              maxduration: 5,
+              protocols: [3],
+              startdelay: 1,
+              linearity: 1,
+              battr: [1, 2],
+              maxbitrate: 10,
+              playbackmethod: [1],
+              delivery: [1],
+              placement: 1,
+              api: [2, 3],
+              w: 600,
+              h: 300
+            },
+            placementCode: 'div-gpt-ad-1438287399331-0',
+            bidFloor: 1e-10
+          }
+        ],
+        site: {
+          page: 'http://example.com/hello.html',
+          referrer: 'http://example.com/hello.html',
+          domain: 'example.com'
+        },
+        bidId: '2f7b179d443f14',
+        gdprSignal: 0,
+        uspSignal: 0,
+        coppa: 0,
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -217,6 +284,9 @@ describe('Quantcast adapter', function () {
     it('overrides video parameters with parameters from adunit', function() {
       setupVideoBidRequest({
         mimes: ['video/mp4']
+      }, {
+        context: 'instream',
+        playerSize: [600, 300]
       });
       bidRequest.mediaTypes.video.mimes = ['video/webm'];
 
@@ -244,14 +314,18 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
     });
 
     it('sends video bid request when no video parameters are given', function () {
-      setupVideoBidRequest(null);
+      setupVideoBidRequest(null, {
+        context: 'instream',
+        playerSize: [600, 300]
+      });
 
       const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
       const expectedVideoBidRequest = {
@@ -276,7 +350,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedVideoBidRequest));
@@ -340,7 +415,8 @@ describe('Quantcast adapter', function () {
         gdprSignal: 0,
         uspSignal: 0,
         coppa: 0,
-        prebidJsVersion: '$prebid.version$'
+        prebidJsVersion: '$prebid.version$',
+        fpa: ''
       };
 
       expect(requests[0].data).to.equal(JSON.stringify(expectedBidRequest));
@@ -430,26 +506,6 @@ describe('Quantcast adapter', function () {
     expect(requests).to.equal(undefined);
   });
 
-  it('allows TCF v2 request from Germany for purpose 1', function () {
-    const bidderRequest = {
-      gdprConsent: {
-        gdprApplies: true,
-        consentString: 'consentString',
-        vendorData: {
-          publisherCC: 'DE',
-          purposeOneTreatment: true
-        },
-        apiVersion: 2
-      }
-    };
-
-    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
-    const parsed = JSON.parse(requests[0].data);
-
-    expect(parsed.gdprSignal).to.equal(1);
-    expect(parsed.gdprConsent).to.equal('consentString');
-  });
-
   it('allows TCF v2 request when Quantcast has consent for purpose 1', function() {
     const bidderRequest = {
       gdprConsent: {
@@ -604,6 +660,13 @@ describe('Quantcast adapter', function () {
     expect(parsed.uspConsent).to.equal('consentString');
   });
 
+  it('propagates Quantcast first-party cookie (fpa)', function() {
+    storage.setCookie('__qca', 'P0-TestFPA');
+    const requests = qcSpec.buildRequests([bidRequest], bidderRequest);
+    const parsed = JSON.parse(requests[0].data);
+    expect(parsed.fpa).to.equal('P0-TestFPA');
+  });
+
   describe('propagates coppa', function() {
     let sandbox;
     beforeEach(() => {
@@ -663,7 +726,10 @@ describe('Quantcast adapter', function () {
             '
Quantcast
',
           creativeId: 1001,
           width: 300,
-          height: 250
+          height: 250,
+          meta: {
+            advertiserDomains: ['dailymail.com']
+          }
         }
       ]
     };
@@ -723,7 +789,10 @@ describe('Quantcast adapter', function () {
         ttl: QUANTCAST_TTL,
         creativeId: 1001,
         netRevenue: QUANTCAST_NET_REVENUE,
-        currency: 'USD'
+        currency: 'USD',
+        meta: {
+          advertiserDomains: ['dailymail.com']
+        }
       };
       const interpretedResponse = qcSpec.interpretResponse(response);
 
@@ -743,7 +812,10 @@ describe('Quantcast adapter', function () {
         creativeId: 1001,
         netRevenue: QUANTCAST_NET_REVENUE,
         currency: 'USD',
-        dealId: 'test-dealid'
+        dealId: 'test-dealid',
+        meta: {
+          advertiserDomains: ['dailymail.com']
+        }
       };
       const interpretedResponse = qcSpec.interpretResponse(response);
 
diff --git a/test/spec/modules/quantcastIdSystem_spec.js b/test/spec/modules/quantcastIdSystem_spec.js
new file mode 100644
index 00000000000..e9d44dd6124
--- /dev/null
+++ b/test/spec/modules/quantcastIdSystem_spec.js
@@ -0,0 +1,383 @@
+import { quantcastIdSubmodule, storage, firePixel, hasCCPAConsent, hasGDPRConsent, checkTCFv2 } from 'modules/quantcastIdSystem.js';
+import * as utils from 'src/utils.js';
+import {coppaDataHandler} from 'src/adapterManager';
+
+describe('QuantcastId module', function () {
+  beforeEach(function() {
+    sinon.stub(coppaDataHandler, 'getCoppa');
+    sinon.stub(utils, 'triggerPixel');
+    sinon.stub(window, 'addEventListener');
+  });
+
+  afterEach(function () {
+    utils.triggerPixel.restore();
+    coppaDataHandler.getCoppa.restore();
+    window.addEventListener.restore();
+  });
+
+  it('getId() should return a quantcast id when the Quantcast first party cookie exists', function () {
+    sinon.stub(storage, 'getCookie').returns('P0-TestFPA');
+    const id = quantcastIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: {quantcastId: 'P0-TestFPA'}});
+    storage.getCookie.restore();
+  });
+
+  it('getId() should return an empty id when the Quantcast first party cookie is missing', function () {
+    const id = quantcastIdSubmodule.getId();
+    expect(id).to.be.deep.equal({id: undefined});
+  });
+});
+
+describe('QuantcastId fire pixel', function () {
+  beforeEach(function () {
+    storage.setCookie('__qca', '', 'Thu, 01 Jan 1970 00:00:00 GMT');
+    sinon.stub(storage, 'setCookie');
+    sinon.stub(utils, 'triggerPixel');
+  });
+
+  afterEach(function () {
+    utils.triggerPixel.restore();
+    storage.setCookie.restore();
+  });
+
+  it('fpa should be set when not present on this call', function () {
+    firePixel('clientId');
+    var urlString = utils.triggerPixel.getCall(0).args[0];
+    var parsedUrl = utils.parseUrl(urlString);
+    var urlSearchParams = parsedUrl.search;
+    assert.equal(urlSearchParams.fpan, '1');
+    assert.notEqual(urlSearchParams.fpa, null);
+  });
+
+  it('fpa should be extracted from the Quantcast first party cookie when present on this call', function () {
+    sinon.stub(storage, 'getCookie').returns('P0-TestFPA');
+    firePixel('clientId');
+    var urlString = utils.triggerPixel.getCall(0).args[0];
+    var parsedUrl = utils.parseUrl(urlString);
+    var urlSearchParams = parsedUrl.search;
+    assert.equal(urlSearchParams.fpan, '0');
+    assert.equal(urlSearchParams.fpa, 'P0-TestFPA');
+    storage.getCookie.restore();
+  });
+
+  it('function to trigger pixel is called once', function () {
+    firePixel('clientId');
+    expect(utils.triggerPixel.calledOnce).to.equal(true);
+  });
+
+  it('function to trigger pixel is not called when client id is absent', function () {
+    firePixel();
+    expect(utils.triggerPixel.calledOnce).to.equal(false);
+  });
+});
+
+describe('Quantcast CCPA consent check', function() {
+  it('returns true when CCPA constent string is not present', function() {
+    expect(hasCCPAConsent()).to.equal(true);
+  });
+
+  it("returns true when notice_given or do-not-sell in CCPA constent string is not 'Y' ", function() {
+    expect(hasCCPAConsent('1NNN')).to.equal(true);
+    expect(hasCCPAConsent('1YNN')).to.equal(true);
+    expect(hasCCPAConsent('1NYN')).to.equal(true);
+  });
+
+  it("returns false when CCPA consent string is present, and notice_given or do-not-sell in the string is 'Y' ", function() {
+    expect(hasCCPAConsent('1YYN')).to.equal(false);
+  });
+});
+
+describe('Quantcast GDPR consent check', function() {
+  it("returns true when GDPR doesn't apply", function() {
+    expect(hasGDPRConsent({gdprApplies: false})).to.equal(true);
+  });
+
+  it('returns false if denied consent, even if special purpose 1 treatment is true in DE', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      publisherCC: 'DE',
+      purposeOneTreatment: true,
+      vendor: {
+        consents: { '11': false }
+      },
+      purpose: {
+        consents: { '1': false }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 0 // flatly disallow Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if publisher flatly denies required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 0 // flatly disallow Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns true if positive consent for required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      }
+    }, ['1'])).to.equal(true);
+  });
+
+  it('returns false if positive consent but publisher requires legitimate interest for required purpose', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': true }
+      },
+      publisher: {
+        restrictions: {
+          '1': {
+            '11': 2 // require legitimate interest for Quantcast
+          }
+        }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no vendor consent and no legitimate interest', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false }
+      },
+      purpose: {
+        consents: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no purpose consent and no legitimate interest', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if no consent, but legitimate interest for consent-first purpose, and no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false },
+        legitimateInterests: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns false if consent, but no legitimate interest for legitimate-interest-first purpose, and no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': true },
+        legitimateInterests: { '10': false }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns true if consent, but no legitimate interest for legitimate-interest-first purpose, and corresponding consent restriction specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': true },
+        legitimateInterests: { '10': false }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    }, ['10'])).to.equal(true);
+  });
+
+  it('returns false if no consent but legitimate interest for required purpose other than 1, but publisher requires consent', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': true }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent and no legitimate interest for vendor for required purpose other than 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': false }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': true }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent and no legitimate interest for required purpose other than 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '10': false },
+        legitimateInterests: { '10': false }
+      }
+    }, ['10'])).to.equal(false);
+  });
+
+  it('returns false if no consent but legitimate interest for required purpose, but required purpose is purpose 1', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': false },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: { '1': false },
+        legitimateInterests: { '1': true }
+      }
+    }, ['1'])).to.equal(false);
+  });
+
+  it('returns true if different legal bases for multiple required purposes', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '10': false
+        },
+        legitimateInterests: {
+          '1': false,
+          '10': true
+        }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 2 // require legitimate interest for Quantcast
+          }
+        }
+      }
+    })).to.equal(true);
+  });
+
+  it('returns true if full consent and legitimate interest for all required purposes with no restrictions specified', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '3': true,
+          '7': true,
+          '8': true,
+          '9': true,
+          '10': true
+        },
+        legitimateInterests: {
+          '1': true,
+          '3': true,
+          '7': true,
+          '8': true,
+          '9': true,
+          '10': true
+        }
+      }
+    })).to.equal(true);
+  });
+
+  it('returns false if one of multiple required purposes has no legal basis', function() {
+    expect(checkTCFv2({
+      gdprApplies: true,
+      vendor: {
+        consents: { '11': true },
+        legitimateInterests: { '11': true }
+      },
+      purpose: {
+        consents: {
+          '1': true,
+          '10': false
+        },
+        legitimateInterests: {
+          '11': false,
+          '10': true
+        }
+      },
+      publisher: {
+        restrictions: {
+          '10': {
+            '11': 1 // require consent for Quantcast
+          }
+        }
+      }
+    })).to.equal(false);
+  });
+});
diff --git a/test/spec/modules/quantumBidAdapter_spec.js b/test/spec/modules/quantumBidAdapter_spec.js
deleted file mode 100644
index c03d74ea52e..00000000000
--- a/test/spec/modules/quantumBidAdapter_spec.js
+++ /dev/null
@@ -1,325 +0,0 @@
-import { expect } from 'chai'
-import { spec } from 'modules/quantumBidAdapter.js'
-import { newBidder } from 'src/adapters/bidderFactory.js'
-
-const ENDPOINT = 'https://s.sspqns.com/hb'
-const REQUEST = {
-  'bidder': 'quantum',
-  'sizes': [[300, 250]],
-  'renderMode': 'banner',
-  'params': {
-    placementId: 21546
-  }
-}
-
-const NATIVE_REQUEST = {
-  'bidder': 'quantum',
-  'mediaType': 'native',
-  'sizes': [[0, 0]],
-  'params': {
-    placementId: 21546
-  }
-}
-
-const serverResponse = {
-  'price': 0.3,
-  'debug': [
-    ''
-  ],
-  'is_fallback': false,
-  'nurl': 'https://s.sspqns.com/imp/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4/',
-  'native': {
-    'link': {
-      'url': 'https://s.sspqns.com/click/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4///',
-      'clicktrackers': ['https://elasticad.net']
-    },
-    'assets': [
-      {
-        'id': 1,
-        'title': {
-          'text': 'ad.SSP.1x1'
-        },
-        'required': 1
-      },
-      {
-        'id': 2,
-        'img': {
-          'w': 15,
-          'h': 15,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-15x15'
-        }
-      },
-      {
-        'id': 3,
-        'data': {
-          'value': 'Lorem Ipsum is simply dummy text of the printing and typesetting industry.Lorem Ipsum is simply dummy text of the printing and typesetting industry.'
-        },
-        'required': 1
-      },
-      {
-        'id': 4,
-        'img': {
-          'w': 500,
-          'h': 500,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-500x500'
-        }
-      },
-      {
-        'id': 6,
-        'video': {
-          'vasttag': 'https://elasticad.net/vast.xml'
-        }
-      },
-      {
-        'id': 2001,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      },
-      {
-        'id': 2002,
-        'data': {
-          'value': 'vast'
-        }
-      },
-      {
-        'id': 2007,
-        'data': {
-          'value': 'click'
-        }
-      },
-      {
-        'id': 10,
-        'data': {
-          'value': 'ad.SSP.1x1 sponsor'
-        }
-      },
-      {
-        'id': 2003,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      },
-      {
-        'id': 2004,
-        'data': {
-          'value': 'prism'
-        }
-      },
-      {
-        'id': 2005,
-        'data': {
-          'value': '/home'
-        }
-      },
-      {
-        'id': 2006,
-        'data': {
-          'value': 'https://elasticad.net/vast.xml'
-        }
-      },
-      {
-        'id': 2022,
-        'data': {
-          'value': 'Lorem ipsum....'
-        }
-      }
-    ],
-    'imptrackers': [],
-    'ver': '1.1'
-  },
-  'sync': [
-    'https://match.adsrvr.org/track/cmb/generic?ttd_pid=s6e8ued&ttd_tpi=1'
-  ]
-}
-
-const nativeServerResponse = {
-  'price': 0.3,
-  'debug': [
-    ''
-  ],
-  'is_fallback': false,
-  'nurl': 'https://s.sspqns.com/imp/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4/',
-  'native': {
-    'link': {
-      'url': 'https://s.sspqns.com/click/KpQ1WNMHV-9a3HqWL_0JnujJFGo1Hnx9RS3FT_Yy8jW-Z6t_PJYmP2otidJsxE3qcY2EozzcBjRzGM7HEQcxVnjOzq0Th1cxb6A5bSp5BizTwY5SRaxx_0PgF6--8LqaF4LMUgMmhfF5k3gOOzzK6gKdavia4_w3LJ1CRWkMEwABr8bPzeovy1y4MOZsOXv7vXjPGMKJSTgphuZR57fL4u4ZFF4XY70K_TaH5bfXHMRAzE0Q38tfpTvbdFV_u2g-FoF0gjzKjiS88VnetT-Jo3qtrMphWzr52jsg5tH3L7hbymUOm1YkuJP9xrXLoZNVgC5sTMYolKLMSu6dqhS2FXcdfaGAcHweaaAAwJq-pB7DuiVcdnZQphUymhIia_KG2AYweWp6TYEpJbJjf2BcLpm_-KGw4gLh6L3DtEvUZwXZe-JpUJ4///'
-    },
-    'assets': [
-      {
-        'id': 1,
-        'title': {
-          'text': 'ad.SSP.1x1'
-        },
-        'required': 1
-      },
-      {
-        'id': 2,
-        'img': {
-          'w': 15,
-          'h': 15,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-15x15'
-        }
-      },
-      {
-        'id': 3,
-        'data': {
-          'value': 'Lorem Ipsum is simply dummy text of the printing and typesetting industry.Lorem Ipsum is simply dummy text of the printing and typesetting industry.'
-        },
-        'required': 1
-      },
-      {
-        'id': 4,
-        'img': {
-          'w': 500,
-          'h': 500,
-          'url': 'https://files.ssp.theadtech.com.s3.amazonaws.com/media/image/sxjermpz/scalecrop-500x500'
-        }
-      },
-      {
-        'id': 2007,
-        'data': {
-          'value': 'click'
-        }
-      },
-      {
-        'id': 10,
-        'data': {
-          'value': 'ad.SSP.1x1 sponsor'
-        }
-      },
-
-      {
-        'id': 2003,
-        'data': {
-          'value': 'https://elasticad.net'
-        }
-      }
-    ],
-    'imptrackers': [],
-    'ver': '1.1'
-  },
-  'sync': [
-    'https://match.adsrvr.org/track/cmb/generic?ttd_pid=s6e8ued&ttd_tpi=1'
-  ]
-}
-
-describe('quantumBidAdapter', 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 () {
-      expect(spec.isBidRequestValid(REQUEST)).to.equal(true)
-    })
-
-    it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, REQUEST)
-      delete bid.params
-      expect(spec.isBidRequestValid(bid)).to.equal(false)
-    })
-  })
-
-  describe('buildRequests', function () {
-    let bidRequests = [REQUEST]
-
-    const request = spec.buildRequests(bidRequests, {})
-
-    it('sends bid request to ENDPOINT via GET', function () {
-      expect(request[0].method).to.equal('GET')
-    })
-  })
-
-  describe('GDPR conformity', function () {
-    const bidRequests = [{
-      'bidder': 'quantum',
-      'mediaType': 'native',
-      'params': {
-        placementId: 21546
-      },
-      adUnitCode: 'aaa',
-      transactionId: '2b8389fe-615c-482d-9f1a-376fb8f7d6b0',
-      sizes: [[0, 0]],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: {
-        consentString: 'awefasdfwefasdfasd',
-        gdprApplies: true
-      }
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.quantx_gdpr).to.equal(1);
-      expect(requests[0].data.quantx_user_consent_string).to.equal('awefasdfwefasdfasd');
-    });
-  });
-
-  describe('GDPR absence conformity', function () {
-    const bidRequests = [{
-      'bidder': 'quantum',
-      'mediaType': 'native',
-      'params': {
-        placementId: 21546
-      },
-      adUnitCode: 'aaa',
-      transactionId: '2b8389fe-615c-482d-9f1a-376fb8f7d6b0',
-      sizes: [[0, 0]],
-      bidId: '1abgs362e0x48a8',
-      bidderRequestId: '70deaff71c281d',
-      auctionId: '5c66da22-426a-4bac-b153-77360bef5337'
-    }];
-
-    const bidderRequest = {
-      gdprConsent: undefined
-    };
-
-    it('should transmit correct data', function () {
-      const requests = spec.buildRequests(bidRequests, bidderRequest);
-      expect(requests.length).to.equal(1);
-      expect(requests[0].data.quantx_gdpr).to.be.undefined;
-      expect(requests[0].data.quantx_user_consent_string).to.be.undefined;
-    });
-  });
-
-  describe('interpretResponse', function () {
-    let bidderRequest = {
-      bidderCode: 'bidderCode',
-      bids: []
-    }
-
-    it('handles native request : should get correct bid response', function () {
-      const result = spec.interpretResponse({body: nativeServerResponse}, NATIVE_REQUEST)
-      expect(result[0]).to.have.property('cpm').equal(0.3)
-      expect(result[0]).to.have.property('width').to.be.below(2)
-      expect(result[0]).to.have.property('height').to.be.below(2)
-      expect(result[0]).to.have.property('mediaType').equal('native')
-      expect(result[0]).to.have.property('native')
-    })
-
-    it('should get correct bid response', function () {
-      const result = spec.interpretResponse({body: serverResponse}, REQUEST)
-      expect(result[0]).to.have.property('cpm').equal(0.3)
-      expect(result[0]).to.have.property('width').equal(300)
-      expect(result[0]).to.have.property('height').equal(250)
-      expect(result[0]).to.have.property('mediaType').equal('banner')
-      expect(result[0]).to.have.property('ad')
-    })
-
-    it('handles nobid responses', function () {
-      const nobidServerResponse = {bids: []}
-      const nobidResult = spec.interpretResponse({body: nobidServerResponse}, bidderRequest)
-      // console.log(nobidResult)
-      expect(nobidResult.length).to.equal(0)
-    })
-  })
-})
diff --git a/test/spec/modules/quantumdexBidAdapter_spec.js b/test/spec/modules/quantumdexBidAdapter_spec.js
index 82429cbedae..3a71833bc3e 100644
--- a/test/spec/modules/quantumdexBidAdapter_spec.js
+++ b/test/spec/modules/quantumdexBidAdapter_spec.js
@@ -1,14 +1,15 @@
 import { expect } from 'chai'
-import { spec } from 'modules/quantumdexBidAdapter.js'
+import { spec, validateGeoObject, getDomain } from '../../../modules/apacdexBidAdapter.js'
 import { newBidder } from 'src/adapters/bidderFactory.js'
 import { userSync } from '../../../src/userSync.js';
+import { config } from 'src/config.js';
 
-describe('QuantumdexBidAdapter', function () {
+describe('ApacdexBidAdapter', function () {
   const adapter = newBidder(spec)
 
   describe('.code', function () {
-    it('should return a bidder code of quantumdex', function () {
-      expect(spec.code).to.equal('quantumdex')
+    it('should return a bidder code of apacdex', function () {
+      expect(spec.code).to.equal('apacdex')
     })
   })
 
@@ -21,7 +22,7 @@ describe('QuantumdexBidAdapter', function () {
   describe('.isBidRequestValid', function () {
     it('should return false if there are no params', () => {
       const bid = {
-        'bidder': 'quantumdex',
+        'bidder': 'apacdex',
         'adUnitCode': 'adunit-code',
         'mediaTypes': {
           banner: {
@@ -37,7 +38,7 @@ describe('QuantumdexBidAdapter', function () {
 
     it('should return false if there is no siteId param', () => {
       const bid = {
-        'bidder': 'quantumdex',
+        'bidder': 'apacdex',
         'adUnitCode': 'adunit-code',
         params: {
           site_id: '1a2b3c4d5e6f1a2b3c4d',
@@ -56,7 +57,7 @@ describe('QuantumdexBidAdapter', function () {
 
     it('should return false if there is no mediaTypes', () => {
       const bid = {
-        'bidder': 'quantumdex',
+        'bidder': 'apacdex',
         'adUnitCode': 'adunit-code',
         params: {
           siteId: '1a2b3c4d5e6f1a2b3c4d'
@@ -72,7 +73,7 @@ describe('QuantumdexBidAdapter', function () {
 
     it('should return true if the bid is valid', () => {
       const bid = {
-        'bidder': 'quantumdex',
+        'bidder': 'apacdex',
         'adUnitCode': 'adunit-code',
         params: {
           siteId: '1a2b3c4d5e6f1a2b3c4d'
@@ -92,7 +93,7 @@ describe('QuantumdexBidAdapter', function () {
     describe('banner', () => {
       it('should return false if there are no banner sizes', () => {
         const bid = {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'adUnitCode': 'adunit-code',
           params: {
             siteId: '1a2b3c4d5e6f1a2b3c4d'
@@ -111,7 +112,7 @@ describe('QuantumdexBidAdapter', function () {
 
       it('should return true if there is banner sizes', () => {
         const bid = {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'adUnitCode': 'adunit-code',
           params: {
             siteId: '1a2b3c4d5e6f1a2b3c4d'
@@ -132,7 +133,7 @@ describe('QuantumdexBidAdapter', function () {
     describe('video', () => {
       it('should return false if there is no playerSize defined in the video mediaType', () => {
         const bid = {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'adUnitCode': 'adunit-code',
           params: {
             siteId: '1a2b3c4d5e6f1a2b3c4d',
@@ -152,7 +153,7 @@ describe('QuantumdexBidAdapter', function () {
 
       it('should return true if there is playerSize defined on the video mediaType', () => {
         const bid = {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'adUnitCode': 'adunit-code',
           params: {
             siteId: '1a2b3c4d5e6f1a2b3c4d',
@@ -196,17 +197,40 @@ describe('QuantumdexBidAdapter', function () {
           },
         ]
       },
-      'bidder': 'quantumdex',
+      'bidder': 'apacdex',
       'params': {
         'siteId': '1a2b3c4d5e6f1a2b3c4d',
+        'geo': {'lat': 123.13123456, 'lon': 54.23467311, 'accuracy': 60}
       },
       'adUnitCode': 'adunit-code-1',
       'sizes': [[300, 250], [300, 600]],
       'targetKey': 0,
       'bidId': '30b31c1838de1f',
+      'userIdAsEids': [{
+        'source': 'criteo.com',
+        'uids': [{
+          'id': 'p0cCLF9JazY1ZUFjazJRb3NKbEprVTcwZ0IwRUlGalBjOG9laUZNbFJ0ZGpOSnVFbE9VMjBNMzNBTzladGt4cUVGQzBybDY2Y1FqT1dkUkFsMmJIWDRHNjlvNXJjbiUyQlZDd1dOTmt6VlV2TDhRd0F0RTlBcmpyZU5WRHBPU25GQXpyMnlT',
+          'atype': 1
+        }]
+      }, {
+        'source': 'pubcid.org',
+        'uids': [{
+          'id': '2ae366c2-2576-45e5-bd21-72ed10598f17',
+          'atype': 1
+        }]
+      }, {
+        'source': 'sharedid.org',
+        'uids': [{
+          'id': '01EZXQDVAPER4KE1VBS29XKV4Z',
+          'atype': 1,
+          'ext': {
+            'third': '01EZXQDVAPER4KE1VBS29XKV4Z'
+          }
+        }]
+      }],
     },
     {
-      'bidder': 'quantumdex',
+      'bidder': 'apacdex',
       'params': {
         'ad_unit': '/7780971/sparks_prebid_LB',
         'sizes': [[300, 250], [300, 600]],
@@ -235,25 +259,25 @@ describe('QuantumdexBidAdapter', function () {
 
     it('should return a properly formatted request', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
       expect(bidRequests.method).to.equal('POST')
       expect(bidRequests.bidderRequests).to.eql(bidRequest);
     })
 
     it('should return a properly formatted request with GDPR applies set to true', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
       expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('true')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
       expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
     })
 
     it('should return a properly formatted request with GDPR applies set to false', function () {
       bidderRequests.gdprConsent.gdprApplies = false;
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
       expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('false')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
       expect(bidRequests.data.gdpr.consentString).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==')
     })
     it('should return a properly formatted request with GDPR applies set to false with no consent_string param', function () {
@@ -271,9 +295,9 @@ describe('QuantumdexBidAdapter', function () {
         }
       };
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
       expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('false')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(false)
       expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
     })
     it('should return a properly formatted request with GDPR applies set to true with no consentString param', function () {
@@ -291,25 +315,45 @@ describe('QuantumdexBidAdapter', function () {
         }
       };
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests)
-      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/quantumdex')
+      expect(bidRequests.url).to.equal('https://useast.quantumdex.io/auction/apacdex')
       expect(bidRequests.method).to.equal('POST')
-      expect(bidRequests.data.gdpr.gdprApplies).to.equal('true')
+      expect(bidRequests.data.gdpr.gdprApplies).to.equal(true)
       expect(bidRequests.data.gdpr).to.not.include.keys('consentString')
     })
     it('should return a properly formatted request with schain defined', function () {
       const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
-      expect(JSON.parse(bidRequests.data.schain)).to.deep.equal(bidRequest[0].schain)
+      expect(bidRequests.data.schain).to.deep.equal(bidRequest[0].schain)
+    });
+    it('should return a properly formatted request with eids defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.eids).to.deep.equal(bidRequest[0].userIdAsEids)
+    });
+    it('should return a properly formatted request with geo defined', function () {
+      const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+      expect(bidRequests.data.geo).to.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');
     });
+    describe('debug test', function() {
+      beforeEach(function() {
+        config.setConfig({debug: true});
+      });
+      afterEach(function() {
+        config.setConfig({debug: false});
+      });
+      it('should return a properly formatted request with pbjs_debug is true', function () {
+        const bidRequests = spec.buildRequests(bidRequest, bidderRequests);
+        expect(bidRequests.data.test).to.equal(1);
+      });
+    });
   });
 
   describe('.interpretResponse', function () {
     const bidRequests = {
       'method': 'POST',
-      'url': 'https://useast.quantumdex.io/auction/quantumdex',
+      'url': 'https://useast.quantumdex.io/auction/apacdex',
       'withCredentials': true,
       'data': {
         'device': {
@@ -328,7 +372,7 @@ describe('QuantumdexBidAdapter', function () {
       },
       'bidderRequests': [
         {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'params': {
             'siteId': '343'
           },
@@ -363,7 +407,7 @@ describe('QuantumdexBidAdapter', function () {
           }
         },
         {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'params': {
             'siteId': '343'
           },
@@ -398,7 +442,7 @@ describe('QuantumdexBidAdapter', function () {
           }
         },
         {
-          'bidder': 'quantumdex',
+          'bidder': 'apacdex',
           'params': {
             'siteId': '343'
           },
@@ -464,12 +508,12 @@ describe('QuantumdexBidAdapter', function () {
             'cpm': 1.07,
             'width': 160,
             'height': 600,
-            'ad': `
Quantumdex AD
`,
+            'ad': `
Apacdex AD
`,
             'ttl': 500,
             'creativeId': '1234abcd',
             'netRevenue': true,
             'currency': 'USD',
-            'dealId': 'quantumdex',
+            'dealId': 'apacdex',
             'mediaType': 'banner'
           },
           {
@@ -477,12 +521,12 @@ describe('QuantumdexBidAdapter', function () {
             'cpm': 1,
             'width': 300,
             'height': 250,
-            'ad': `
Quantumdex AD
`,
+            'ad': `
Apacdex AD
`,
             'ttl': 500,
             'creativeId': '1234abcd',
             'netRevenue': true,
             'currency': 'USD',
-            'dealId': 'quantumdex',
+            'dealId': 'apacdex',
             'mediaType': 'banner'
           },
           {
@@ -490,12 +534,12 @@ describe('QuantumdexBidAdapter', function () {
             'cpm': 1.25,
             'width': 300,
             'height': 250,
-            'vastXml': 'quantumdex',
+            'vastXml': 'apacdex',
             'ttl': 500,
             'creativeId': '30292e432662bd5f86d90774b944b038',
             'netRevenue': true,
             'currency': 'USD',
-            'dealId': 'quantumdex',
+            'dealId': 'apacdex',
             'mediaType': 'video'
           }
         ],
@@ -512,12 +556,12 @@ describe('QuantumdexBidAdapter', function () {
         'cpm': 1.07,
         'width': 160,
         'height': 600,
-        'ad': `
Quantumdex AD
`,
+        'ad': `
Apacdex AD
`,
         'ttl': 500,
         'creativeId': '1234abcd',
         'netRevenue': true,
         'currency': 'USD',
-        'dealId': 'quantumdex',
+        'dealId': 'apacdex',
         'mediaType': 'banner'
       },
       {
@@ -525,12 +569,12 @@ describe('QuantumdexBidAdapter', function () {
         'cpm': 1,
         'width': 300,
         'height': 250,
-        'ad': `
Quantumdex AD
`,
+        'ad': `
Apacdex AD
`,
         'ttl': 500,
         'creativeId': '1234abcd',
         'netRevenue': true,
         'currency': 'USD',
-        'dealId': 'quantumdex',
+        'dealId': 'apacdex',
         'mediaType': 'banner'
       },
       {
@@ -538,12 +582,12 @@ describe('QuantumdexBidAdapter', function () {
         'cpm': 1.25,
         'width': 300,
         'height': 250,
-        'vastXml': 'quantumdex',
+        'vastXml': 'apacdex',
         'ttl': 500,
         'creativeId': '30292e432662bd5f86d90774b944b038',
         'netRevenue': true,
         'currency': 'USD',
-        'dealId': 'quantumdex',
+        'dealId': 'apacdex',
         'mediaType': 'video'
       }
     ];
@@ -561,10 +605,10 @@ describe('QuantumdexBidAdapter', function () {
         expect(resp.currency).to.equal(prebidResponse[i].currency);
         expect(resp.dealId).to.equal(prebidResponse[i].dealId);
         if (resp.mediaType === 'video') {
-          expect(resp.vastXml.indexOf('quantumdex')).to.be.greaterThan(0);
+          expect(resp.vastXml.indexOf('apacdex')).to.be.greaterThan(0);
         }
         if (resp.mediaType === 'banner') {
-          expect(resp.ad.indexOf('Quantumdex AD')).to.be.greaterThan(0);
+          expect(resp.ad.indexOf('Apacdex AD')).to.be.greaterThan(0);
         }
       });
     });
@@ -601,4 +645,66 @@ describe('QuantumdexBidAdapter', function () {
       expect(spec.getUserSyncs({ pixelEnabled: true }, [])).to.have.length(0);
     });
   });
+
+  describe('validateGeoObject', function () {
+    it('should return true if the geo object is valid', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(true);
+    });
+
+    it('should return false if the geo object is not plain object', () => {
+      let geoObject = [{
+        lat: 123.5624234,
+        lon: 23.6712341,
+        accuracy: 20
+      }];
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lat attribute', () => {
+      let geoObject = {
+        lon: 23.6712341,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing lon attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        accuracy: 20
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+
+    it('should return false if the geo object is missing accuracy attribute', () => {
+      let geoObject = {
+        lat: 123.5624234,
+        lon: 23.6712341
+      };
+      expect(validateGeoObject(geoObject)).to.equal(false);
+    });
+  });
+
+  describe('getDomain', function () {
+    it('should return valid domain from publisherDomain config', () => {
+      let pageUrl = 'https://www.example.com/page/prebid/exam.html';
+      config.setConfig({publisherDomain: pageUrl});
+      expect(getDomain(pageUrl)).to.equal('example.com');
+    });
+    it('should return valid domain from pageUrl argument', () => {
+      let pageUrl = 'https://www.example.com/page/prebid/exam.html';
+      config.setConfig({publisherDomain: ''});
+      expect(getDomain(pageUrl)).to.equal('example.com');
+    });
+    it('should return undefined if pageUrl and publisherDomain not config', () => {
+      let pageUrl;
+      config.setConfig({publisherDomain: ''});
+      expect(getDomain(pageUrl)).to.equal(pageUrl);
+    });
+  });
 });
diff --git a/test/spec/modules/qwarryBidAdapter_spec.js b/test/spec/modules/qwarryBidAdapter_spec.js
new file mode 100644
index 00000000000..560206681ee
--- /dev/null
+++ b/test/spec/modules/qwarryBidAdapter_spec.js
@@ -0,0 +1,164 @@
+import { expect } from 'chai'
+import { ENDPOINT, spec } from 'modules/qwarryBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const REQUEST = {
+  'bidId': '456',
+  'bidder': 'qwarry',
+  'sizes': [[100, 200], [300, 400]],
+  'params': {
+    zoneToken: 'e64782a4-8e68-4c38-965b-80ccf115d46f',
+    pos: 7
+  },
+  'schain': {
+    ver: '1.0',
+    complete: 1,
+    nodes: [{
+      asi: 'qwarry.com',
+      sid: '00001',
+      hp: 1
+    }]
+  }
+}
+
+const BIDDER_BANNER_RESPONSE = {
+  'prebidResponse': [{
+    'ad': '
test
',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46d',
+    'cpm': 900.5,
+    'currency': 'USD',
+    'width': 640,
+    'height': 480,
+    'ttl': 300,
+    'creativeId': 1,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'banner',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_VIDEO_RESPONSE = {
+  'prebidResponse': [{
+    'ad': 'vast',
+    'requestId': 'e64782a4-8e68-4c38-965b-80ccf115d46z',
+    'cpm': 800.4,
+    'currency': 'USD',
+    'width': 1024,
+    'height': 768,
+    'ttl': 200,
+    'creativeId': 2,
+    'netRevenue': true,
+    'winUrl': 'http://test.com',
+    'format': 'video',
+    'adomain': ['test.com']
+  }]
+}
+
+const BIDDER_NO_BID_RESPONSE = ''
+
+describe('qwarryBidAdapter', 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 () {
+      expect(spec.isBidRequestValid(REQUEST)).to.equal(true)
+    })
+
+    it('should return false when required params are not passed', function () {
+      let bid = Object.assign({}, REQUEST)
+      delete bid.params.zoneToken
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+      delete bid.params
+      expect(spec.isBidRequestValid(bid)).to.equal(false)
+    })
+  })
+
+  describe('buildRequests', function () {
+    let bidRequests = [REQUEST]
+    const bidderRequest = spec.buildRequests(bidRequests, {
+      bidderRequestId: '123',
+      gdprConsent: {
+        gdprApplies: true,
+        consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A=='
+      },
+      refererInfo: {
+        referer: 'http://test.com/path.html'
+      }
+    })
+
+    it('sends bid request to ENDPOINT via POST', function () {
+      expect(bidderRequest.method).to.equal('POST')
+      expect(bidderRequest.data.requestId).to.equal('123')
+      expect(bidderRequest.data.referer).to.equal('http://test.com/path.html')
+      expect(bidderRequest.data.schain).to.deep.contains({ver: '1.0', complete: 1, nodes: [{asi: 'qwarry.com', sid: '00001', hp: 1}]})
+      expect(bidderRequest.data.bids).to.deep.contains({ bidId: '456', zoneToken: 'e64782a4-8e68-4c38-965b-80ccf115d46f', pos: 7, sizes: [{ width: 100, height: 200 }, { width: 300, height: 400 }] })
+      expect(bidderRequest.data.gdprConsent).to.deep.contains({ consentRequired: true, consentString: 'BOJ8RZsOJ8RZsABAB8AAAAAZ+A==' })
+      expect(bidderRequest.options.customHeaders).to.deep.equal({ 'Rtb-Direct': true })
+      expect(bidderRequest.options.contentType).to.equal('application/json')
+      expect(bidderRequest.url).to.equal(ENDPOINT)
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('handles banner request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_BANNER_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('
test
')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46d')
+      expect(result[0]).to.have.property('cpm').equal(900.5)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(640)
+      expect(result[0]).to.have.property('height').equal(480)
+      expect(result[0]).to.have.property('ttl').equal(300)
+      expect(result[0]).to.have.property('creativeId').equal(1)
+      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('format').equal('banner')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles video request : should get correct bid response', function () {
+      const result = spec.interpretResponse({ body: BIDDER_VIDEO_RESPONSE }, {})
+
+      expect(result[0]).to.have.property('ad').equal('vast')
+      expect(result[0]).to.have.property('requestId').equal('e64782a4-8e68-4c38-965b-80ccf115d46z')
+      expect(result[0]).to.have.property('cpm').equal(800.4)
+      expect(result[0]).to.have.property('currency').equal('USD')
+      expect(result[0]).to.have.property('width').equal(1024)
+      expect(result[0]).to.have.property('height').equal(768)
+      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('format').equal('video')
+      expect(result[0]).to.have.property('vastXml').equal('vast')
+      expect(result[0].meta).to.exist.property('advertiserDomains')
+      expect(result[0].meta).to.have.property('advertiserDomains').lengthOf(1)
+    })
+
+    it('handles no bid response : should get empty array', function () {
+      let result = spec.interpretResponse({ body: undefined }, {})
+      expect(result).to.deep.equal([])
+
+      result = spec.interpretResponse({ body: BIDDER_NO_BID_RESPONSE }, {})
+      expect(result).to.deep.equal([])
+    })
+  })
+
+  describe('onBidWon', function () {
+    it('handles banner win: should get true', function () {
+      const win = BIDDER_BANNER_RESPONSE.prebidResponse[0]
+      const bidWonResult = spec.onBidWon(win)
+
+      expect(bidWonResult).to.equal(true)
+    })
+  })
+})
diff --git a/test/spec/modules/radsBidAdapter_spec.js b/test/spec/modules/radsBidAdapter_spec.js
index c629daf3da5..c3c3b4b2746 100644
--- a/test/spec/modules/radsBidAdapter_spec.js
+++ b/test/spec/modules/radsBidAdapter_spec.js
@@ -87,12 +87,25 @@ describe('radsAdapter', function () {
       'auctionId': '1d1a030790a475'
     }];
 
+    // Without gdprConsent
     let bidderRequest = {
       refererInfo: {
         referer: 'some_referrer.net'
       }
     }
+    // With gdprConsent
+    var bidderRequestGdprConsent = {
+      refererInfo: {
+        referer: 'some_referrer.net'
+      },
+      gdprConsent: {
+        consentString: 'BOJ/P2HOJ/P2HABABMAAAAAZ+A==',
+        vendorData: {someData: 'value'},
+        gdprApplies: true
+      }
+    };
 
+    // without gdprConsent
     const request = spec.buildRequests(bidRequests, bidderRequest);
     it('sends bid request to our endpoint via GET', function () {
       expect(request[0].method).to.equal('GET');
@@ -105,6 +118,20 @@ describe('radsAdapter', function () {
       let data = request[1].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
       expect(data).to.equal('rt=vast2&_f=prebid_js&_ps=6682&srw=640&srh=480&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgeo%5D%5Bregion%5D=DE-BE&bcat=IAB2%2CIAB4&dvt=desktop');
     });
+
+    // with gdprConsent
+    const request2 = spec.buildRequests(bidRequests, bidderRequestGdprConsent);
+    it('sends bid request to our endpoint via GET', function () {
+      expect(request2[0].method).to.equal('GET');
+      let data = request2[0].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
+      expect(data).to.equal('rt=bid-response&_f=prebid_js&_ps=6682&srw=300&srh=250&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&pfilter%5Bfloorprice%5D=1000000&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&i=1.1.1.1');
+    });
+
+    it('sends bid video request to our rads endpoint via GET', function () {
+      expect(request2[1].method).to.equal('GET');
+      let data = request2[1].data.replace(/rnd=\d+\&/g, '').replace(/ref=.*\&bid/g, 'bid');
+      expect(data).to.equal('rt=vast2&_f=prebid_js&_ps=6682&srw=640&srh=480&idt=100&p=some_referrer.net&bid_id=30b31c1838de1e&pfilter%5Bfloorprice%5D=1000000&pfilter%5Bgeo%5D%5Bcountry%5D=DE&pfilter%5Bgeo%5D%5Bregion%5D=DE-BE&pfilter%5Bgdpr_consent%5D=BOJ%2FP2HOJ%2FP2HABABMAAAAAZ%2BA%3D%3D&pfilter%5Bgdpr%5D=true&bcat=IAB2%2CIAB4&dvt=desktop');
+    });
   });
 
   describe('interpretResponse', function () {
@@ -203,4 +230,60 @@ describe('radsAdapter', function () {
       expect(result.length).to.equal(0);
     });
   });
+
+  describe(`getUserSyncs test usage`, function () {
+    let serverResponses;
+
+    beforeEach(function () {
+      serverResponses = [{
+        body: {
+          requestId: '23beaa6af6cdde',
+          cpm: 0.5,
+          width: 0,
+          height: 0,
+          creativeId: 100500,
+          dealId: '',
+          currency: 'EUR',
+          netRevenue: true,
+          ttl: 300,
+          type: 'sspHTML',
+          ad: '',
+          userSync: {
+            iframeUrl: ['anyIframeUrl?a=1'],
+            imageUrl: ['anyImageUrl', 'anyImageUrl2']
+          }
+        }
+      }];
+    });
+
+    it(`return value should be an array`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true })).to.be.an('array');
+    });
+    it(`array should have only one object and it should have a property type = 'iframe'`, function () {
+      expect(spec.getUserSyncs({ iframeEnabled: true }, serverResponses).length).to.be.equal(1);
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses);
+      expect(userSync).to.have.property('type');
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for iframe`, function () {
+      let [userSync] = spec.getUserSyncs({ iframeEnabled: true }, serverResponses, {consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyIframeUrl?a=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('iframe');
+    });
+    it(`we have valid sync url for image`, function () {
+      let [userSync] = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync.type).to.be.equal('image');
+    });
+    it(`we have valid sync url for image and iframe`, function () {
+      let userSync = spec.getUserSyncs({ iframeEnabled: true, pixelEnabled: true }, serverResponses, {gdprApplies: true, consentString: 'anyString'});
+      expect(userSync.length).to.be.equal(3);
+      expect(userSync[0].url).to.be.equal('anyIframeUrl?a=1&gdpr=1&gdpr_consent=anyString')
+      expect(userSync[0].type).to.be.equal('iframe');
+      expect(userSync[1].url).to.be.equal('anyImageUrl?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[1].type).to.be.equal('image');
+      expect(userSync[2].url).to.be.equal('anyImageUrl2?gdpr=1&gdpr_consent=anyString')
+      expect(userSync[2].type).to.be.equal('image');
+    });
+  });
 });
diff --git a/test/spec/modules/readpeakBidAdapter_spec.js b/test/spec/modules/readpeakBidAdapter_spec.js
index eb9077fac39..eefd7792a7c 100644
--- a/test/spec/modules/readpeakBidAdapter_spec.js
+++ b/test/spec/modules/readpeakBidAdapter_spec.js
@@ -28,7 +28,8 @@ describe('ReadPeakAdapter', function() {
       params: {
         bidfloor: 5.0,
         publisherId: '11bc5dd5-7421-4dd8-c926-40fa653bec76',
-        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77'
+        siteId: '11bc5dd5-7421-4dd8-c926-40fa653bec77',
+        tagId: 'test-tag-1'
       },
       bidId: '2ffb201a808da7',
       bidderRequestId: '178e34bad3658f',
@@ -104,7 +105,8 @@ describe('ReadPeakAdapter', function() {
               ver: '1.1'
             },
             bidfloor: 5,
-            bidfloorcur: 'USD'
+            bidfloorcur: 'USD',
+            tagId: 'test-tag-1'
           }
         ],
         site: {
@@ -177,20 +179,83 @@ describe('ReadPeakAdapter', function() {
       expect(data.id).to.equal(bidRequest.bidderRequestId);
       expect(data.imp[0].bidfloor).to.equal(bidRequest.params.bidfloor);
       expect(data.imp[0].bidfloorcur).to.equal('USD');
-      expect(data.site).to.deep.equal({
-        publisher: {
-          id: bidRequest.params.publisherId,
-          domain: 'http://localhost:9876'
-        },
-        id: bidRequest.params.siteId,
-        page: bidderRequest.refererInfo.referer,
-        domain: parseUrl(bidderRequest.refererInfo.referer).hostname
-      });
+      expect(data.imp[0].tagId).to.equal('test-tag-1');
+      expect(data.site.publisher.id).to.equal(bidRequest.params.publisherId);
+      expect(data.site.id).to.equal(bidRequest.params.siteId);
+      expect(data.site.page).to.equal(bidderRequest.refererInfo.referer);
+      expect(data.site.domain).to.equal(parseUrl(bidderRequest.refererInfo.referer).hostname);
       expect(data.device).to.deep.contain({
         ua: navigator.userAgent,
         language: navigator.language
       });
       expect(data.cur).to.deep.equal(['EUR']);
+      expect(data.user).to.be.undefined;
+      expect(data.regs).to.be.undefined;
+    });
+
+    it('should get bid floor from module', function() {
+      const floorModuleData = {
+        currency: 'USD',
+        floor: 3.2,
+      }
+      bidRequest.getFloor = function () {
+        return floorModuleData
+      }
+      const request = spec.buildRequests([bidRequest], bidderRequest);
+
+      const data = JSON.parse(request.data);
+
+      expect(data.source.ext.prebid).to.equal('$prebid.version$');
+      expect(data.id).to.equal(bidRequest.bidderRequestId);
+      expect(data.imp[0].bidfloor).to.equal(floorModuleData.floor);
+      expect(data.imp[0].bidfloorcur).to.equal(floorModuleData.currency);
+    });
+
+    it('should send gdpr data when gdpr does not apply', function() {
+      const gdprData = {
+        gdprConsent: {
+          gdprApplies: false,
+          consentString: undefined,
+        }
+      }
+      const request = spec.buildRequests([bidRequest], {...bidderRequest, ...gdprData});
+
+      const data = JSON.parse(request.data);
+
+      expect(data.user).to.deep.equal({
+        ext: {
+          consent: ''
+        }
+      });
+      expect(data.regs).to.deep.equal({
+        ext: {
+          gdpr: false
+        }
+      });
+    });
+
+    it('should send gdpr data when gdpr applies', function() {
+      const tcString = 'sometcstring';
+      const gdprData = {
+        gdprConsent: {
+          gdprApplies: true,
+          consentString: tcString
+        }
+      }
+      const request = spec.buildRequests([bidRequest], {...bidderRequest, ...gdprData});
+
+      const data = JSON.parse(request.data);
+
+      expect(data.user).to.deep.equal({
+        ext: {
+          consent: tcString
+        }
+      });
+      expect(data.regs).to.deep.equal({
+        ext: {
+          gdpr: true
+        }
+      });
     });
   });
 
@@ -215,6 +280,9 @@ describe('ReadPeakAdapter', function() {
         currency: serverResponse.cur
       });
 
+      expect(bidResponse.meta).to.deep.equal({
+        advertiserDomains: ['readpeak.com'],
+      })
       expect(bidResponse.native.title).to.equal('Title');
       expect(bidResponse.native.body).to.equal('Description');
       expect(bidResponse.native.image).to.deep.equal({
diff --git a/test/spec/modules/realTimeDataModule_spec.js b/test/spec/modules/realTimeDataModule_spec.js
new file mode 100644
index 00000000000..b84aef15feb
--- /dev/null
+++ b/test/spec/modules/realTimeDataModule_spec.js
@@ -0,0 +1,160 @@
+import * as rtdModule from 'modules/rtdModule/index.js';
+import { config } from 'src/config.js';
+import * as sinon from 'sinon';
+
+const getBidRequestDataSpy = sinon.spy();
+
+const validSM = {
+  name: 'validSM',
+  init: () => { return true },
+  getTargetingData: (adUnitsCodes) => {
+    return {'ad2': {'key': 'validSM'}}
+  },
+  getBidRequestData: getBidRequestDataSpy
+};
+
+const validSMWait = {
+  name: 'validSMWait',
+  init: () => { return true },
+  getTargetingData: (adUnitsCodes) => {
+    return {'ad1': {'key': 'validSMWait'}}
+  },
+  getBidRequestData: getBidRequestDataSpy
+};
+
+const invalidSM = {
+  name: 'invalidSM'
+};
+
+const failureSM = {
+  name: 'failureSM',
+  init: () => { return false }
+};
+
+const nonConfSM = {
+  name: 'nonConfSM',
+  init: () => { return true }
+};
+
+const conf = {
+  'realTimeData': {
+    'auctionDelay': 100,
+    dataProviders: [
+      {
+        'name': 'validSMWait',
+        'waitForIt': true,
+      },
+      {
+        'name': 'validSM',
+        'waitForIt': false,
+      },
+      {
+        'name': 'invalidSM'
+      },
+      {
+        'name': 'failureSM'
+      }]
+  }
+};
+
+describe('Real time module', function () {
+  before(function () {
+    rtdModule.attachRealTimeDataProvider(validSM);
+    rtdModule.attachRealTimeDataProvider(invalidSM);
+    rtdModule.attachRealTimeDataProvider(failureSM);
+    rtdModule.attachRealTimeDataProvider(nonConfSM);
+    rtdModule.attachRealTimeDataProvider(validSMWait);
+  });
+
+  after(function () {
+    config.resetConfig();
+  });
+
+  beforeEach(function () {
+    config.setConfig(conf);
+  });
+
+  it('should use only valid modules', function () {
+    rtdModule.init(config);
+    expect(rtdModule.subModules).to.eql([validSMWait, validSM]);
+  });
+
+  it('should be able to modify bid request', function (done) {
+    rtdModule.setBidRequestsData(() => {
+      assert(getBidRequestDataSpy.calledTwice);
+      assert(getBidRequestDataSpy.calledWith({bidRequest: {}}));
+      done();
+    }, {bidRequest: {}})
+  });
+
+  it('deep merge object', function () {
+    const obj1 = {
+      id1: {
+        key: 'value',
+        key2: 'value2'
+      },
+      id2: {
+        k: 'v'
+      }
+    };
+    const obj2 = {
+      id1: {
+        key3: 'value3'
+      }
+    };
+    const obj3 = {
+      id3: {
+        key: 'value'
+      }
+    };
+    const expected = {
+      id1: {
+        key: 'value',
+        key2: 'value2',
+        key3: 'value3'
+      },
+      id2: {
+        k: 'v'
+      },
+      id3: {
+        key: 'value'
+      }
+    };
+
+    const merged = rtdModule.deepMerge([obj1, obj2, obj3]);
+    assert.deepEqual(expected, merged);
+  });
+
+  it('sould place targeting on adUnits', function (done) {
+    const auction = {
+      adUnitCodes: ['ad1', 'ad2'],
+      adUnits: [
+        {
+          code: 'ad1'
+        },
+        {
+          code: 'ad2',
+          adserverTargeting: {preKey: 'preValue'}
+        }
+      ]
+    };
+
+    const expectedAdUnits = [
+      {
+        code: 'ad1',
+        adserverTargeting: {key: 'validSMWait'}
+      },
+      {
+        code: 'ad2',
+        adserverTargeting: {
+          preKey: 'preValue',
+          key: 'validSM'
+        }
+      }
+    ];
+
+    const adUnits = rtdModule.getAdUnitTargeting(auction);
+    assert.deepEqual(expectedAdUnits, adUnits)
+    done();
+  })
+});
diff --git a/test/spec/modules/realTimeModule_spec.js b/test/spec/modules/realTimeModule_spec.js
deleted file mode 100644
index ca149fe7a44..00000000000
--- a/test/spec/modules/realTimeModule_spec.js
+++ /dev/null
@@ -1,282 +0,0 @@
-import {
-  init,
-  requestBidsHook,
-  setTargetsAfterRequestBids,
-  deepMerge,
-  validateProviderDataForGPT
-} from 'modules/rtdModule/index.js';
-import {
-  init as browsiInit,
-  addBrowsiTag,
-  isIdMatchingAdUnit,
-  setData,
-  getMacroId
-} from 'modules/browsiRtdProvider.js';
-import {
-  init as audigentInit,
-  setData as setAudigentData
-} from 'modules/audigentRtdProvider.js';
-import { config } from 'src/config.js';
-import { makeSlot } from '../integration/faker/googletag.js';
-
-let expect = require('chai').expect;
-
-describe('Real time module', function () {
-  const conf = {
-    'realTimeData': {
-      'auctionDelay': 250,
-      dataProviders: [{
-        'name': 'browsi',
-        'params': {
-          'url': 'testUrl.com',
-          'siteKey': 'testKey',
-          'pubKey': 'testPub',
-          'keyName': 'bv'
-        }
-      }, {
-        'name': 'audigent'
-      }]
-    }
-  };
-
-  const predictions = {
-    p: {
-      'browsiAd_2': {
-        'w': [
-          '/57778053/Browsi_Demo_Low',
-          '/57778053/Browsi_Demo_300x250'
-        ],
-        'p': 0.07
-      },
-      'browsiAd_1': {
-        'w': [],
-        'p': 0.06
-      },
-      'browsiAd_3': {
-        'w': [],
-        'p': 0.53
-      },
-      'browsiAd_4': {
-        'w': [
-          '/57778053/Browsi_Demo'
-        ],
-        'p': 0.85
-      }
-    }
-  };
-
-  const audigentSegments = {
-    audigent_segments: { 'a': 1, 'b': 2 }
-  }
-
-  function getAdUnitMock(code = 'adUnit-code') {
-    return {
-      code,
-      mediaTypes: { banner: {}, native: {} },
-      sizes: [[300, 200], [300, 600]],
-      bids: [{ bidder: 'sampleBidder', params: { placementId: 'banner-only-bidder' } }]
-    };
-  }
-
-  function createSlots() {
-    const slot1 = makeSlot({ code: '/57778053/Browsi_Demo_300x250', divId: 'browsiAd_1' });
-    const slot2 = makeSlot({ code: '/57778053/Browsi', divId: 'browsiAd_1' });
-    return [slot1, slot2];
-  }
-
-  describe('Real time module with browsi provider', function () {
-    afterEach(function () {
-      $$PREBID_GLOBAL$$.requestBids.removeAll();
-    });
-
-    after(function () {
-      config.resetConfig();
-    });
-
-    it('check module using bidsBackCallback', function () {
-      let adUnits1 = [getAdUnitMock('browsiAd_1')];
-      let targeting = [];
-      init(config);
-      browsiInit(config);
-      config.setConfig(conf);
-      setData(predictions);
-
-      // set slot
-      const slots = createSlots();
-      window.googletag.pubads().setSlots(slots);
-
-      function afterBidHook() {
-        slots.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        expect(targeting.indexOf('bv')).to.be.greaterThan(-1);
-      }
-      setTargetsAfterRequestBids(afterBidHook, adUnits1, true);
-    });
-
-    it('check module using requestBidsHook', function () {
-      let adUnits1 = [getAdUnitMock('browsiAd_1')];
-      let targeting = [];
-      let dataReceived = null;
-
-      // set slot
-      const slotsB = createSlots();
-      window.googletag.pubads().setSlots(slotsB);
-
-      function afterBidHook(data) {
-        dataReceived = data;
-        slotsB.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        expect(targeting.indexOf('bv')).to.be.greaterThan(-1);
-        dataReceived.adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.realTimeData).to.have.property('bv');
-          });
-        });
-      }
-      requestBidsHook(afterBidHook, { adUnits: adUnits1 });
-    });
-
-    it('check object deep merge', function () {
-      const obj1 = {
-        id1: {
-          key: 'value',
-          key2: 'value2'
-        },
-        id2: {
-          k: 'v'
-        }
-      };
-      const obj2 = {
-        id1: {
-          key3: 'value3'
-        }
-      };
-      const obj3 = {
-        id3: {
-          key: 'value'
-        }
-      };
-      const expected = {
-        id1: {
-          key: 'value',
-          key2: 'value2',
-          key3: 'value3'
-        },
-        id2: {
-          k: 'v'
-        },
-        id3: {
-          key: 'value'
-        }
-      };
-
-      const merged = deepMerge([obj1, obj2, obj3]);
-      assert.deepEqual(expected, merged);
-    });
-
-    it('check data validation for GPT targeting', function () {
-      // non strings values should be removed
-      const obj = {
-        valid: {'key': 'value'},
-        invalid: {'key': ['value']},
-        combine: {
-          'a': 'value',
-          'b': []
-        }
-      };
-
-      const expected = {
-        valid: {'key': 'value'},
-        invalid: {},
-        combine: {
-          'a': 'value',
-        }
-      };
-      const validationResult = validateProviderDataForGPT(obj);
-      assert.deepEqual(expected, validationResult);
-    });
-
-    it('check browsi sub module', function () {
-      const script = addBrowsiTag('scriptUrl.com');
-      expect(script.getAttribute('data-sitekey')).to.equal('testKey');
-      expect(script.getAttribute('data-pubkey')).to.equal('testPub');
-      expect(script.async).to.equal(true);
-
-      const slots = createSlots();
-      const test1 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_300x250']); // true
-      const test2 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_300x250', '/57778053/Browsi']); // true
-      const test3 = isIdMatchingAdUnit(slots[0], ['/57778053/Browsi_Demo_Low']); // false
-      const test4 = isIdMatchingAdUnit(slots[0], []); // true
-
-      expect(test1).to.equal(true);
-      expect(test2).to.equal(true);
-      expect(test3).to.equal(false);
-      expect(test4).to.equal(true);
-
-      // macro results
-      slots[0].setTargeting('test', ['test', 'value']);
-      // slot getTargeting doesn't act like GPT so we can't expect real value
-      const macroResult = getMacroId({p: '/'}, slots[0]);
-      expect(macroResult).to.equal('/57778053/Browsi_Demo_300x250/NA');
-
-      const macroResultB = getMacroId({}, slots[0]);
-      expect(macroResultB).to.equal('browsiAd_1');
-
-      const macroResultC = getMacroId({p: '', s: {s: 0, e: 1}}, slots[0]);
-      expect(macroResultC).to.equal('/');
-    })
-  });
-
-  describe('Real time module with Audigent provider', function () {
-    before(function () {
-      init(config);
-      audigentInit(config);
-      config.setConfig(conf);
-      setAudigentData(audigentSegments);
-    });
-
-    afterEach(function () {
-      $$PREBID_GLOBAL$$.requestBids.removeAll();
-      config.resetConfig();
-    });
-
-    it('check module using requestBidsHook', function () {
-      let adUnits1 = [getAdUnitMock('audigentAd_1')];
-      let targeting = [];
-      let dataReceived = null;
-
-      // set slot
-      const slotsB = createSlots();
-      window.googletag.pubads().setSlots(slotsB);
-
-      function afterBidHook(data) {
-        dataReceived = data;
-        slotsB.map(s => {
-          targeting = [];
-          s.getTargeting().map(value => {
-            targeting.push(Object.keys(value).toString());
-          });
-        });
-
-        dataReceived.adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.realTimeData).to.have.property('audigent_segments');
-            expect(bid.realTimeData.audigent_segments).to.deep.equal(audigentSegments.audigent_segments);
-          });
-        });
-      }
-
-      requestBidsHook(afterBidHook, { adUnits: adUnits1 });
-    });
-  });
-});
diff --git a/test/spec/modules/reconciliationRtdProvider_spec.js b/test/spec/modules/reconciliationRtdProvider_spec.js
new file mode 100644
index 00000000000..6efe55ddf46
--- /dev/null
+++ b/test/spec/modules/reconciliationRtdProvider_spec.js
@@ -0,0 +1,221 @@
+import {
+  reconciliationSubmodule,
+  track,
+  getTopIFrameWin,
+  getSlotByWin
+} from 'modules/reconciliationRtdProvider.js';
+import { makeSlot } from '../integration/faker/googletag.js';
+import * as utils from 'src/utils.js';
+
+describe('Reconciliation Real time data submodule', function () {
+  const conf = {
+    dataProviders: [{
+      'name': 'reconciliation',
+      'params': {
+        'publisherMemberId': 'test_prebid_publisher'
+      },
+    }]
+  };
+
+  let trackPostStub;
+
+  beforeEach(function () {
+    trackPostStub = sinon.stub(track, 'trackPost');
+  });
+
+  afterEach(function () {
+    trackPostStub.restore();
+  });
+
+  describe('reconciliationSubmodule', function () {
+    describe('initialization', function () {
+      let utilsLogErrorSpy;
+
+      before(function () {
+        utilsLogErrorSpy = sinon.spy(utils, 'logError');
+      });
+
+      after(function () {
+        utils.logError.restore();
+      });
+
+      it('successfully instantiates', function () {
+        expect(reconciliationSubmodule.init(conf.dataProviders[0])).to.equal(true);
+      });
+
+      it('should log error if initializied without parameters', function () {
+        expect(reconciliationSubmodule.init({'name': 'reconciliation', 'params': {}})).to.equal(true);
+        expect(utilsLogErrorSpy.calledOnce).to.be.true;
+      });
+    });
+
+    describe('getData', function () {
+      it('should return data in proper format', function () {
+        makeSlot({code: '/reconciliationAdunit1', divId: 'reconciliationAd1'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['/reconciliationAdunit1']);
+        expect(targetingData['/reconciliationAdunit1'].RSDK_AUID).to.eql('/reconciliationAdunit1');
+        expect(targetingData['/reconciliationAdunit1'].RSDK_ADID).to.be.a('string');
+      });
+
+      it('should return unit path if called with divId', function () {
+        makeSlot({code: '/reconciliationAdunit2', divId: 'reconciliationAd2'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['reconciliationAd2']);
+        expect(targetingData['reconciliationAd2'].RSDK_AUID).to.eql('/reconciliationAdunit2');
+        expect(targetingData['reconciliationAd2'].RSDK_ADID).to.be.a('string');
+      });
+
+      it('should skip empty adUnit id', function () {
+        makeSlot({code: '/reconciliationAdunit3', divId: 'reconciliationAd3'});
+
+        const targetingData = reconciliationSubmodule.getTargetingData(['reconciliationAd3', '']);
+        expect(targetingData).to.have.all.keys('reconciliationAd3');
+      });
+    });
+
+    describe('track events', function () {
+      it('should track init event with data', function () {
+        const adUnit = {
+          code: '/adunit'
+        };
+
+        reconciliationSubmodule.getTargetingData([adUnit.code]);
+
+        expect(trackPostStub.calledOnce).to.be.true;
+        expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/init');
+        expect(trackPostStub.getCalls()[0].args[1].adUnits[0].adUnitId).to.eql(adUnit.code);
+        expect(trackPostStub.getCalls()[0].args[1].adUnits[0].adDeliveryId).be.a('string');
+        expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+      });
+    });
+
+    describe('get topmost iframe', function () {
+      /**
+       * - top
+       * -- iframe.window  <-- top iframe window
+       * --- iframe.window
+       * ---- iframe.window <-- win
+       */
+      const mockFrameWin = (topWin, parentWin) => {
+        return {
+          top: topWin,
+          parent: parentWin
+        }
+      }
+
+      it('should return null if called with null', function() {
+        expect(getTopIFrameWin(null)).to.be.null;
+      });
+
+      it('should return null if there is an error in frames chain', function() {
+        const topWin = {};
+        const iframe1Win = mockFrameWin(topWin, null); // break chain
+        const iframe2Win = mockFrameWin(topWin, iframe1Win);
+
+        expect(getTopIFrameWin(iframe1Win, topWin)).to.be.null;
+      });
+
+      it('should get the topmost iframe', function () {
+        const topWin = {};
+        const iframe1Win = mockFrameWin(topWin, topWin);
+        const iframe2Win = mockFrameWin(topWin, iframe1Win);
+
+        expect(getTopIFrameWin(iframe2Win, topWin)).to.eql(iframe1Win);
+      });
+    });
+
+    describe('get slot by nested iframe window', function () {
+      it('should return the slot', function () {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAd';
+        adSlotElement.appendChild(adSlotIframe);
+        document.body.appendChild(adSlotElement);
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+
+        expect(getSlotByWin(adSlotIframe.contentWindow)).to.eql(adSlot);
+      });
+
+      it('should return null if the slot is not found', function () {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAd';
+        document.body.appendChild(adSlotElement);
+        document.body.appendChild(adSlotIframe); // iframe is not in ad slot
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+
+        expect(getSlotByWin(adSlotIframe.contentWindow)).to.be.null;
+      });
+    });
+
+    describe('handle postMessage from Reconciliation Tag in ad iframe', function () {
+      it('should track impression pixel with parameters', function (done) {
+        const adSlotElement = document.createElement('div');
+        const adSlotIframe = document.createElement('iframe');
+
+        adSlotElement.id = 'reconciliationAdMessage';
+        adSlotElement.appendChild(adSlotIframe);
+        document.body.appendChild(adSlotElement);
+
+        const adSlot = makeSlot({code: '/reconciliationAdunit', divId: adSlotElement.id});
+        // Fix targeting methods
+        adSlot.targeting = {};
+        adSlot.setTargeting = function(key, value) {
+          this.targeting[key] = [value];
+        };
+        adSlot.getTargeting = function(key) {
+          return this.targeting[key];
+        };
+
+        adSlot.setTargeting('RSDK_AUID', '/reconciliationAdunit');
+        adSlot.setTargeting('RSDK_ADID', '12345');
+        adSlotIframe.contentDocument.open();
+        adSlotIframe.contentDocument.write(``);
+        adSlotIframe.contentDocument.close();
+
+        setTimeout(() => {
+          expect(trackPostStub.calledOnce).to.be.true;
+          expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/pimp');
+          expect(trackPostStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
+          expect(trackPostStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
+          expect(trackPostStub.getCalls()[0].args[1].tagOwnerMemberId).to.eql('test_member_id'); ;
+          expect(trackPostStub.getCalls()[0].args[1].dataSources.length).to.eql(1);
+          expect(trackPostStub.getCalls()[0].args[1].dataRecipients.length).to.eql(2);
+          expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+          done();
+        }, 100);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/relaidoBidAdapter_spec.js b/test/spec/modules/relaidoBidAdapter_spec.js
index cd4918460db..c2082eb1e91 100644
--- a/test/spec/modules/relaidoBidAdapter_spec.js
+++ b/test/spec/modules/relaidoBidAdapter_spec.js
@@ -1,16 +1,21 @@
 import { expect } from 'chai';
 import { spec } from 'modules/relaidoBidAdapter.js';
 import * as utils from 'src/utils.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+import { getStorageManager } from '../../../src/storageManager.js';
 
 const UUID_KEY = 'relaido_uuid';
 const DEFAULT_USER_AGENT = window.navigator.userAgent;
 const MOBILE_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.5 Mobile/15E148 Safari/604.1';
+const relaido_uuid = 'hogehoge';
 
 const setUADefault = () => { window.navigator.__defineGetter__('userAgent', function () { return DEFAULT_USER_AGENT }) };
 const setUAMobile = () => { window.navigator.__defineGetter__('userAgent', function () { return MOBILE_USER_AGENT }) };
 
+const storage = getStorageManager();
+storage.setCookie(UUID_KEY, relaido_uuid);
+
 describe('RelaidoAdapter', function () {
-  const relaido_uuid = 'hogehoge';
   let bidRequest;
   let bidderRequest;
   let serverResponse;
@@ -55,7 +60,8 @@ describe('RelaidoAdapter', function () {
         uuid: relaido_uuid,
         vast: '',
         playerUrl: 'https://relaido/player.js',
-        syncUrl: 'https://relaido/sync.html'
+        syncUrl: 'https://relaido/sync.html',
+        adomain: ['relaido.co.jp', 'www.cmertv.co.jp']
       }
     };
     serverRequest = {
@@ -65,7 +71,6 @@ describe('RelaidoAdapter', function () {
       height: bidRequest.mediaTypes.video.playerSize[0][1],
       mediaType: 'video',
     };
-    localStorage.setItem(UUID_KEY, relaido_uuid);
   });
 
   describe('spec.isBidRequestValid', function () {
@@ -86,10 +91,58 @@ describe('RelaidoAdapter', function () {
       setUADefault();
     });
 
-    it('should return false when the uuid are missing', function () {
-      localStorage.removeItem(UUID_KEY);
-      const result = !!(utils.isSafariBrowser());
-      expect(spec.isBidRequestValid(bidRequest)).to.equal(result);
+    it('should return false when missing 300x250 over and 1x1 by banner', function () {
+      setUAMobile();
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [100, 100],
+            [300, 100]
+          ]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+      setUADefault();
+    });
+
+    it('should return true when 300x250 by banner', function () {
+      setUAMobile();
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [300, 250]
+          ]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      setUADefault();
+    });
+
+    it('should return true when 1x1 by banner', function () {
+      setUAMobile();
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [1, 1]
+          ]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      setUADefault();
+    });
+
+    it('should return true when 300x250 over by banner', function () {
+      setUAMobile();
+      bidRequest.mediaTypes = {
+        banner: {
+          sizes: [
+            [100, 100],
+            [300, 250]
+          ]
+        }
+      };
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+      setUADefault();
     });
 
     it('should return false when the placementId params are missing', function () {
@@ -157,10 +210,18 @@ describe('RelaidoAdapter', function () {
     });
 
     it('should build bid requests by banner', function () {
+      setUAMobile();
       bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream',
+          playerSize: [
+            [320, 180]
+          ]
+        },
         banner: {
           sizes: [
-            [640, 360]
+            [640, 360],
+            [1, 1]
           ]
         }
       };
@@ -170,6 +231,31 @@ describe('RelaidoAdapter', function () {
       expect(request.mediaType).to.equal('banner');
     });
 
+    it('should take 1x1 size', function () {
+      setUAMobile();
+      bidRequest.mediaTypes = {
+        video: {
+          context: 'outstream',
+          playerSize: [
+            [320, 180]
+          ]
+        },
+        banner: {
+          sizes: [
+            [640, 360],
+            [1, 1]
+          ]
+        }
+      };
+      const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
+      expect(bidRequests).to.have.lengthOf(1);
+      const request = bidRequests[0];
+
+      // eslint-disable-next-line no-console
+      console.log(bidRequests);
+      expect(request.width).to.equal(1);
+    });
+
     it('The referrer should be the last', function () {
       const bidRequests = spec.buildRequests([bidRequest], bidderRequest);
       expect(bidRequests).to.have.lengthOf(1);
@@ -192,6 +278,8 @@ describe('RelaidoAdapter', function () {
       expect(response.currency).to.equal(serverResponse.body.currency);
       expect(response.creativeId).to.equal(serverResponse.body.creativeId);
       expect(response.vastXml).to.equal(serverResponse.body.vast);
+      expect(response.meta.advertiserDomains).to.equal(serverResponse.body.adomain);
+      expect(response.meta.mediaType).to.equal(VIDEO);
       expect(response.ad).to.be.undefined;
     });
 
diff --git a/test/spec/modules/relevantAnalyticsAdapter_spec.js b/test/spec/modules/relevantAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..3e31db2d7dc
--- /dev/null
+++ b/test/spec/modules/relevantAnalyticsAdapter_spec.js
@@ -0,0 +1,43 @@
+import relevantAnalytics from '../../../modules/relevantAnalyticsAdapter.js';
+import adapterManager from 'src/adapterManager';
+import events from 'src/events';
+import constants from 'src/constants.json'
+import { expect } from 'chai';
+
+describe('Relevant Analytics Adapter', () => {
+  beforeEach(() => {
+    adapterManager.enableAnalytics({
+      provider: 'relevant'
+    });
+  });
+
+  afterEach(() => {
+    relevantAnalytics.disableAnalytics();
+  });
+
+  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 } },
+    ];
+
+    // When
+    testEvents.forEach(({ ev, args }) => (
+      events.emit(ev, args)
+    ));
+
+    // Then
+    const eventQueue = (window.relevantDigital || {}).pbEventLog;
+    expect(eventQueue).to.be.an('array');
+    expect(eventQueue.length).to.be.at.least(testEvents.length);
+
+    // The last events should be our test events
+    const myEvents = eventQueue.slice(-testEvents.length);
+    testEvents.forEach(({ ev, args }, idx) => {
+      const actualEvent = myEvents[idx];
+      expect(actualEvent.ev).to.eql(ev);
+      expect(actualEvent.args).to.eql(args);
+    });
+  });
+});
diff --git a/test/spec/modules/resetdigitalBidAdapter_spec.js b/test/spec/modules/resetdigitalBidAdapter_spec.js
new file mode 100644
index 00000000000..34354ceeea8
--- /dev/null
+++ b/test/spec/modules/resetdigitalBidAdapter_spec.js
@@ -0,0 +1,158 @@
+import { expect } from 'chai'
+import { spec, _getPlatform } from 'modules/resetdigitalBidAdapter.js'
+import { newBidder } from 'src/adapters/bidderFactory.js'
+
+const br = {
+  body: {
+    bids: [{
+      bid_id: '123',
+      cpm: 1.23,
+      w: 300,
+      h: 250,
+      html: 'deadbeef',
+      crid: 'crid'
+    }],
+    pixels: [
+      { type: 'image', url: 'https://reset.com/image' },
+      { type: 'iframe', url: 'https://reset.com/iframe' }
+    ]
+  }
+}
+
+const vr = {
+  body: {
+    bids: [{
+      bid_id: 'abc',
+      cpm: 2.34,
+      w: 640,
+      h: 480,
+      vast_url: 'https://demo.tremorvideo.com/proddev/vast/vast_inline_nonlinear.xml',
+      crid: 'video_crid'
+    }],
+    pixels: [
+      { type: 'image', url: 'https://reset.com/image' },
+      { type: 'iframe', url: 'https://reset.com/iframe' }
+    ]
+  }
+}
+
+describe('resetdigitalBidAdapter', function () {
+  const adapter = newBidder(spec)
+
+  let bannerRequest = {
+    bidId: '123',
+    transactionId: '456',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [300, 600]]
+      }
+    },
+    params: {
+      pubId: '12345'
+    }
+  }
+
+  let videoRequest = {
+    bidId: 'abc',
+    transactionId: 'def',
+    mediaTypes: {
+      video: {
+        playerDimension: [640, 480]
+      }
+    },
+    params: {
+      pubId: 'CK6gUYp58EGopLJnUvM2'
+    }
+  }
+
+  describe('codes', function () {
+    it('should return a bidder code of resetdigital', function () {
+      expect(spec.code).to.equal('resetdigital')
+    })
+  })
+
+  describe('isBidRequestValid', function () {
+    it('should return true if all params present', function () {
+      expect(spec.isBidRequestValid(bannerRequest)).to.be.true
+    })
+
+    it('should return false if zone id and pub id missing', function () {
+      expect(spec.isBidRequestValid(Object.assign(bannerRequest, { params: { pubId: null, zoneId: null } }))).to.be.false
+    })
+  })
+
+  describe('buildRequests', function () {
+    let req = spec.buildRequests([ bannerRequest ], { refererInfo: { } })
+    let rdata
+
+    it('should return request object', function () {
+      expect(req).to.not.be.null
+    })
+
+    it('should build request data', function () {
+      expect(req.data).to.not.be.null
+    })
+
+    it('should include one request', function () {
+      rdata = JSON.parse(req.data)
+      expect(rdata.imps.length).to.equal(1)
+    })
+
+    it('should include all publisher params', function () {
+      expect(rdata.imps[0].zone_id !== null).to.be.true
+    })
+
+    it('should include media types', function () {
+      expect(rdata.imps[0].media_types !== null).to.be.true
+    })
+  })
+
+  describe('interpretResponse', function () {
+    it('should form compliant banner bid object response', function () {
+      let ir = spec.interpretResponse(br, bannerRequest)
+
+      expect(ir.length).to.equal(1)
+
+      let en = ir[0]
+
+      expect(en.requestId != null &&
+            en.cpm != null && typeof en.cpm === 'number' &&
+            en.width != null && typeof en.width === 'number' &&
+            en.height != null && typeof en.height === 'number' &&
+            en.ad != null &&
+            en.creativeId != null
+      ).to.be.true
+    })
+    it('should form compliant video object response', function () {
+      let ir = spec.interpretResponse(vr, videoRequest)
+
+      expect(ir.length).to.equal(1)
+
+      let en = ir[0]
+
+      expect(en.requestId != null &&
+            en.cpm != null && typeof en.cpm === 'number' &&
+            en.width != null && typeof en.width === 'number' &&
+            en.height != null && typeof en.height === 'number' &&
+            (en.vastUrl != null || en.vastXml != null) &&
+            en.creativeId != null
+      ).to.be.true
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    it('should return iframe sync', function () {
+      let sync = spec.getUserSyncs({ iframeEnabled: true }, [br])
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'iframe')
+      expect(typeof sync[0].url === 'string')
+    })
+
+    it('should return pixel sync', function () {
+      let sync = spec.getUserSyncs({ pixelEnabled: true }, [br])
+      expect(sync.length).to.equal(1)
+      expect(sync[0].type === 'image')
+      expect(typeof sync[0].url === 'string')
+    })
+  })
+})
diff --git a/test/spec/modules/rhythmoneBidAdapter_spec.js b/test/spec/modules/rhythmoneBidAdapter_spec.js
index d9342332e61..93735c019e1 100644
--- a/test/spec/modules/rhythmoneBidAdapter_spec.js
+++ b/test/spec/modules/rhythmoneBidAdapter_spec.js
@@ -157,6 +157,7 @@ describe('rhythmone adapter tests', function () {
       expect(bid.width).to.equal(800);
       expect(bid.height).to.equal(600);
       expect(bid.vastUrl).to.equal('https://testdomain/rmp/placementid/0/path?reqId=1636037');
+      expect(bid.meta.advertiserDomains).to.deep.equal(['test.com']);
       expect(bid.mediaType).to.equal('video');
       expect(bid.creativeId).to.equal('cr-vid');
       expect(bid.currency).to.equal('USD');
diff --git a/test/spec/modules/richaudienceBidAdapter_spec.js b/test/spec/modules/richaudienceBidAdapter_spec.js
index b9ef70c9afa..c2b699add15 100644
--- a/test/spec/modules/richaudienceBidAdapter_spec.js
+++ b/test/spec/modules/richaudienceBidAdapter_spec.js
@@ -4,7 +4,6 @@ import {
   spec
 } from 'modules/richaudienceBidAdapter.js';
 import {config} from 'src/config.js';
-import * as utils from 'src/utils.js';
 
 describe('Richaudience adapter tests', function () {
   var DEFAULT_PARAMS_NEW_SIZES = [{
@@ -20,7 +19,8 @@ describe('Richaudience adapter tests', function () {
     params: {
       bidfloor: 0.5,
       pid: 'ADb1f40rmi',
-      supplyType: 'site'
+      supplyType: 'site',
+      keywords: 'key1=value1;key2=value2'
     },
     auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
     bidRequestsCount: 1,
@@ -75,6 +75,27 @@ describe('Richaudience adapter tests', function () {
     user: {}
   }];
 
+  var DEFAULT_PARAMS_BANNER_OUTSTREAM = [{
+    adUnitCode: 'test-div',
+    bidId: '2c7c8e9c900244',
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250], [600, 300]]
+      }
+    },
+    bidder: 'richaudience',
+    params: {
+      bidfloor: 0.5,
+      pid: 'ADb1f40rmi',
+      supplyType: 'site'
+    },
+    auctionId: '0cb3144c-d084-4686-b0d6-f5dbe917c563',
+    bidRequestsCount: 1,
+    bidderRequestId: '1858b7382993ca',
+    transactionId: '29df2112-348b-4961-8863-1b33684d95e6',
+    user: {}
+  }];
+
   var DEFAULT_PARAMS_VIDEO_OUT_PARAMS = [{
     adUnitCode: 'test-div',
     bidId: '2c7c8e9c900244',
@@ -156,8 +177,8 @@ describe('Richaudience adapter tests', function () {
       netRevenue: true,
       currency: 'USD',
       ttl: 300,
-      dealId: 'dealId'
-
+      dealId: 'dealId',
+      adomain: 'richaudience.com'
     }
   };
 
@@ -172,7 +193,8 @@ describe('Richaudience adapter tests', function () {
       currency: 'USD',
       ttl: 300,
       vastXML: '',
-      dealId: 'dealId'
+      dealId: 'dealId',
+      adomain: 'richaudience.com'
     }
   };
 
@@ -240,6 +262,47 @@ describe('Richaudience adapter tests', function () {
     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('numIframes').and.to.equal(0);
+    expect(typeof requestContent.scr_rsl === 'string')
+    expect(typeof requestContent.cpuc === 'number')
+    expect(requestContent).to.have.property('kws').and.to.equal('key1=value1;key2=value2');
+  })
+
+  it('Verify build request to prebid video inestream', function() {
+    const request = spec.buildRequests(DEFAULT_PARAMS_VIDEO_IN, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    expect(request[0]).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request[0].data);
+
+    expect(requestContent).to.have.property('demand').and.to.equal('video');
+    expect(requestContent.videoData).to.have.property('format').and.to.equal('instream');
+  })
+
+  it('Verify build request to prebid video outstream', function() {
+    const request = spec.buildRequests(DEFAULT_PARAMS_VIDEO_OUT, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    expect(request[0]).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request[0].data);
+
+    expect(requestContent).to.have.property('demand').and.to.equal('video');
+    expect(requestContent.videoData).to.have.property('format').and.to.equal('outstream');
   })
 
   it('Verify build request to prebid video inestream', function() {
@@ -348,34 +411,49 @@ describe('Richaudience adapter tests', function () {
   });
 
   describe('UID test', function () {
-    owpbjs.setConfig({
+    config.setConfig({
       consentManagement: {
         cmpApi: 'iab',
         timeout: 5000,
         allowAuctionWithoutConsent: true
+      },
+      userSync: {
+        userIds: [{
+          name: 'id5Id',
+          params: {
+            partner: 173, // change to the Partner Number you received from ID5
+            pd: 'MT1iNTBjY...' // optional, see table below for a link to how to generate this
+          },
+          storage: {
+            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
+          }
+        }],
+        auctionDelay: 50 // 50ms maximum auction delay, applies to all userId modules
       }
     });
     it('Verify build id5', function () {
+      var request;
       DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = 'id5-user-id';
-
-      var request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: 1 };
+      request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
       var requestContent = JSON.parse(request[0].data);
 
-      expect(requestContent.user).to.deep.equal([{
-        'userId': 'id5-user-id',
-        'source': 'id5-sync.com'
-      }]);
+      expect(requestContent.user.eids).to.equal(undefined);
 
-      var request;
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId = {};
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = 1;
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: [] };
       request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
-      var requestContent = JSON.parse(request[0].data);
+      requestContent = JSON.parse(request[0].data);
+      expect(requestContent.user.eids).to.equal(undefined);
 
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: null };
+      request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
+      requestContent = JSON.parse(request[0].data);
       expect(requestContent.user.eids).to.equal(undefined);
 
-      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = [];
+      DEFAULT_PARAMS_WO_OPTIONAL[0].userId.id5id = { uid: {} };
       request = spec.buildRequests(DEFAULT_PARAMS_WO_OPTIONAL, DEFAULT_PARAMS_GDPR);
       requestContent = JSON.parse(request[0].data);
       expect(requestContent.user.eids).to.equal(undefined);
@@ -590,6 +668,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');
   });
 
   it('no banner media response inestream', function () {
@@ -604,10 +683,69 @@ describe('Richaudience adapter tests', function () {
       }
     });
 
+    const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request[0]);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.vastXml).to.equal('');
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    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');
+  });
+
+  it('no banner media response outstream', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_VIDEO_OUT, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
+    const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request[0]);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.mediaType).to.equal('video');
+    expect(bid.vastXml).to.equal('');
+    expect(bid.renderer.url).to.equal('https://cdn3.richaudience.com/prebidVideo/player.js');
+    expect(bid.cpm).to.equal(1.50);
+    expect(bid.width).to.equal(1);
+    expect(bid.height).to.equal(1);
+    expect(bid.creativeId).to.equal('189198063');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.ttl).to.equal(300);
+    expect(bid.dealId).to.equal('dealId');
+  });
+
+  it('banner media and response VAST', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS_BANNER_OUTSTREAM, {
+      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: {
+        referer: 'https://domain.com',
+        numIframes: 0
+      }
+    });
+
     const bids = spec.interpretResponse(BID_RESPONSE_VIDEO, request[0]);
     const bid = bids[0];
     expect(bid.mediaType).to.equal('video');
     expect(bid.vastXml).to.equal('');
+    expect(bid.renderer.url).to.equal('https://cdn3.richaudience.com/prebidVideo/player.js');
   });
 
   it('no banner media response outstream', function () {
@@ -638,6 +776,16 @@ describe('Richaudience adapter tests', function () {
     expect(spec.aliases[0]).to.equal('ra');
   });
 
+  it('Verifies bidder gvlid', function () {
+    expect(spec.gvlid).to.equal(108);
+  });
+
+  it('Verifies bidder supportedMediaTypes', function () {
+    expect(spec.supportedMediaTypes).to.have.lengthOf(2);
+    expect(spec.supportedMediaTypes[0]).to.equal('banner');
+    expect(spec.supportedMediaTypes[1]).to.equal('video');
+  });
+
   it('Verifies if bid request is valid', function () {
     expect(spec.isBidRequestValid(DEFAULT_PARAMS_NEW_SIZES[0])).to.equal(true);
     expect(spec.isBidRequestValid(DEFAULT_PARAMS_WO_OPTIONAL[0])).to.equal(true);
@@ -699,78 +847,373 @@ describe('Richaudience adapter tests', function () {
         bidfloor: 0.50,
       }
     })).to.equal(true);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        bidfloor: 0.50,
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        supplyType: 'site',
+        bidfloor: 0.50,
+      }
+    })).to.equal(true);
+    expect(spec.isBidRequestValid({
+      params: {
+        supplyType: 'site',
+        bidfloor: 0.50,
+        ifa: 'AAAAAAAAA-BBBB-CCCC-1111-222222220000',
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        pid: ['1gCB5ZC4XL', '1a40xk8qSV'],
+        supplyType: 'site',
+        bidfloor: 0.50,
+        ifa: 'AAAAAAAAA-BBBB-CCCC-1111-222222220000',
+      }
+    })).to.equal(true);
   });
 
-  it('Verifies user syncs iframe', function () {
-    var syncs = spec.getUserSyncs({
-      iframeEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      gdprApplies: true
+  describe('userSync', function () {
+    it('Verifies user syncs iframe include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
     });
+    it('Verifies user syncs iframe exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}}}
+      })
 
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('iframe');
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      gdprApplies: true
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
     });
-    expect(syncs).to.have.lengthOf(0);
 
-    syncs = spec.getUserSyncs({
-      iframeEnabled: true
-    }, [], {consentString: '', gdprApplies: false});
-    expect(syncs).to.have.lengthOf(1);
+    it('Verifies user syncs image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {image: {bidders: '*', filter: 'include'}}}
+      })
 
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false
-    }, [], {consentString: '', gdprApplies: true});
-    expect(syncs).to.have.lengthOf(0);
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
 
-    owpbjs.setConfig({
-      consentManagement: {
-        cmpApi: 'iab',
-        timeout: 5000,
-        allowAuctionWithoutConsent: true,
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
         pixelEnabled: true
-      }
+      }, [BID_RESPONSE], {
+        consentString: '',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [], {
+        consentString: null,
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
     });
-  });
 
-  it('Verifies user syncs image', function () {
-    var syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [BID_RESPONSE], {
-      consentString: '',
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-
-    syncs = spec.getUserSyncs({
-      iframeEnabled: false,
-      pixelEnabled: true
-    }, [], {
-      consentString: null,
-      referer: 'http://domain.com',
-      gdprApplies: true
-    })
-    expect(syncs).to.have.lengthOf(1);
-    expect(syncs[0].type).to.equal('image');
-  });
+    it('Verifies user syncs image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: '',
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: true
+      }, [], {
+        consentString: null,
+        referer: 'http://domain.com',
+        gdprApplies: true
+      })
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe/image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}, image: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe/image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}, image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe exclude / image include', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'exclude'}, image: {bidders: '*', filter: 'include'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('image');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+
+    it('Verifies user syncs iframe include / image exclude', function () {
+      config.setConfig({
+        'userSync': {filterSettings: {iframe: {bidders: '*', filter: 'include'}, image: {bidders: '*', filter: 'exclude'}}}
+      })
+
+      var syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true},
+      );
+      expect(syncs).to.have.lengthOf(1);
+      expect(syncs[0].type).to.equal('iframe');
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true,
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [BID_RESPONSE], {
+        consentString: 'BOZcQl_ObPFjWAeABAESCD-AAAAjx7_______9______9uz_Ov_v_f__33e8__9v_l_7_-___u_-33d4-_1vf99yfm1-7ftr3tp_87ues2_Xur__59__3z3_NohBgA',
+        gdprApplies: true
+      });
+      expect(syncs).to.have.lengthOf(0);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: true,
+        pixelEnabled: true
+      }, [], {consentString: '', gdprApplies: false});
+      expect(syncs).to.have.lengthOf(1);
+
+      syncs = spec.getUserSyncs({
+        iframeEnabled: false,
+        pixelEnabled: false
+      }, [], {consentString: '', gdprApplies: true});
+      expect(syncs).to.have.lengthOf(0);
+    });
+  })
 });
diff --git a/test/spec/modules/riseBidAdapter_spec.js b/test/spec/modules/riseBidAdapter_spec.js
new file mode 100644
index 00000000000..b3257cbda9d
--- /dev/null
+++ b/test/spec/modules/riseBidAdapter_spec.js
@@ -0,0 +1,381 @@
+import { expect } from 'chai';
+import { spec } from 'modules/riseBidAdapter.js';
+import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
+import { VIDEO } from '../../../src/mediaTypes.js';
+
+const ENDPOINT = 'https://hb.yellowblue.io/hb';
+const TEST_ENDPOINT = 'https://hb.yellowblue.io/hb-test';
+const TTL = 360;
+
+describe('riseAdapter', 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',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const testModeBidRequests = [
+      {
+        'bidder': spec.code,
+        'adUnitCode': 'adunit-code',
+        'sizes': [[640, 480]],
+        'params': {
+          'org': 'jdye8weeyirk00000001',
+          'testMode': true
+        },
+        'bidId': '299ffc8cca0b87',
+        'bidderRequestId': '1144f487e563f9',
+        'auctionId': 'bfc420c3-8577-4568-9766-a8a935fb620d',
+      }
+    ];
+
+    const bidderRequest = {
+      bidderCode: 'rise',
+    }
+
+    const customSessionId = '12345678';
+
+    it('sends bid request to ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('sends the is_wrapper query param', function () {
+      bidRequests[0].params.isWrapper = true;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.is_wrapper).to.equal(true);
+      }
+    });
+
+    it('sends the custom session id as a query param', function () {
+      bidRequests[0].params.sessionId = customSessionId;
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.session_id).to.equal(customSessionId);
+      }
+    });
+
+    it('sends bid request to test ENDPOINT via GET', function () {
+      const requests = spec.buildRequests(testModeBidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.url).to.equal(TEST_ENDPOINT);
+        expect(request.method).to.equal('GET');
+      }
+    });
+
+    it('should send the correct bid Id', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data.bid_id).to.equal('299ffc8cca0b87');
+      }
+    });
+
+    it('should send the correct width and height', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('width', 640);
+        expect(request.data).to.have.property('height', 480);
+      }
+    });
+
+    it('should respect syncEnabled option', function() {
+      config.setConfig({
+        userSync: {
+          syncEnabled: false,
+          filterSettings: {
+            all: {
+              bidders: '*',
+              filter: 'include'
+            }
+          }
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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.setConfig({
+        userSync: {
+          syncEnabled: true
+        }
+      });
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('us_privacy', '1YNN');
+      }
+    });
+
+    it('should have an empty us_privacy param if usPrivacy is missing in the bidRequest', function () {
+      const requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.not.have.property('gdpr');
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('gdpr', true);
+        expect(request.data).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 requests = spec.buildRequests(bidRequests, bidderRequest);
+      for (const request of requests) {
+        expect(request.data).to.be.an('object');
+        expect(request.data).to.have.property('schain', '1.0,1!indirectseller.com,00001,,,,');
+      }
+    });
+  });
+
+  describe('interpretResponse', function () {
+    const response = {
+      cpm: 12.5,
+      vastXml: '',
+      width: 640,
+      height: 480,
+      requestId: '21e12606d47ba7',
+      netRevenue: true,
+      currency: 'USD'
+    };
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '21e12606d47ba7',
+          cpm: 12.5,
+          width: 640,
+          height: 480,
+          creativeId: '21e12606d47ba7',
+          currency: 'USD',
+          netRevenue: true,
+          ttl: TTL,
+          vastXml: '',
+          mediaType: VIDEO
+        }
+      ];
+      const result = spec.interpretResponse({ body: response });
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+    });
+  })
+
+  describe('getUserSyncs', function() {
+    const imageSyncResponse = {
+      body: {
+        userSyncPixels: [
+          'https://image-sync-url.test/1',
+          'https://image-sync-url.test/2',
+          'https://image-sync-url.test/3'
+        ]
+      }
+    };
+
+    const iframeSyncResponse = {
+      body: {
+        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([]);
+    });
+  })
+});
diff --git a/test/spec/modules/rtbhouseBidAdapter_spec.js b/test/spec/modules/rtbhouseBidAdapter_spec.js
index efaed87dd15..d6bee26d73b 100644
--- a/test/spec/modules/rtbhouseBidAdapter_spec.js
+++ b/test/spec/modules/rtbhouseBidAdapter_spec.js
@@ -51,38 +51,7 @@ describe('RTBHouseAdapter', () => {
   });
 
   describe('buildRequests', function () {
-    let bidRequests = [
-      {
-        'bidder': 'rtbhouse',
-        'params': {
-          'publisherId': 'PREBID_TEST',
-          'region': 'prebid-eu',
-          'test': 1
-        },
-        'adUnitCode': 'adunit-code',
-        'mediaTypes': {
-          'banner': {
-            'sizes': [[300, 250], [300, 600]],
-          }
-        },
-        'bidId': '30b31c1838de1e',
-        'bidderRequestId': '22edbae2733bf6',
-        'auctionId': '1d1a030790a475',
-        'transactionId': 'example-transaction-id',
-        'schain': {
-          'ver': '1.0',
-          'complete': 1,
-          'nodes': [
-            {
-              'asi': 'directseller.com',
-              'sid': '00001',
-              'rid': 'BidRequest1',
-              'hp': 1
-            }
-          ]
-        }
-      }
-    ];
+    let bidRequests;
     const bidderRequest = {
       'refererInfo': {
         'numIframes': 0,
@@ -92,6 +61,41 @@ describe('RTBHouseAdapter', () => {
       }
     };
 
+    beforeEach(() => {
+      bidRequests = [
+        {
+          'bidder': 'rtbhouse',
+          'params': {
+            'publisherId': 'PREBID_TEST',
+            'region': 'prebid-eu',
+            'test': 1
+          },
+          'adUnitCode': 'adunit-code',
+          'mediaTypes': {
+            'banner': {
+              'sizes': [[300, 250], [300, 600]],
+            }
+          },
+          'bidId': '30b31c1838de1e',
+          'bidderRequestId': '22edbae2733bf6',
+          'auctionId': '1d1a030790a475',
+          'transactionId': 'example-transaction-id',
+          'schain': {
+            'ver': '1.0',
+            'complete': 1,
+            'nodes': [
+              {
+                'asi': 'directseller.com',
+                'sid': '00001',
+                'rid': 'BidRequest1',
+                'hp': 1
+              }
+            ]
+          }
+        }
+      ];
+    });
+
     it('should build test param into the request', () => {
       let builtTestRequest = spec.buildRequests(bidRequests, bidderRequest).data;
       expect(JSON.parse(builtTestRequest).test).to.equal(1);
@@ -177,6 +181,23 @@ describe('RTBHouseAdapter', () => {
       expect(data.source.tid).to.equal('example-transaction-id');
     });
 
+    it('should include bidfloor from floor module if avaiable', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].getFloor = () => ({floor: 1.22});
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].bidfloor).to.equal(1.22)
+    });
+
+    it('should use bidfloor from floor module if both floor module and bid floor avaiable', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      bidRequest[0].getFloor = () => ({floor: 1.22});
+      bidRequest[0].params.bidfloor = 0.01;
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.imp[0].bidfloor).to.equal(1.22)
+    });
+
     it('should include bidfloor in request if available', () => {
       const bidRequest = Object.assign([], bidRequests);
       bidRequest[0].params.bidfloor = 0.01;
@@ -185,11 +206,11 @@ describe('RTBHouseAdapter', () => {
       expect(data.imp[0].bidfloor).to.equal(0.01)
     });
 
-    it('should include source.ext.schain in request', () => {
+    it('should include schain in request', () => {
       const bidRequest = Object.assign([], bidRequests);
       const request = spec.buildRequests(bidRequest, bidderRequest);
       const data = JSON.parse(request.data);
-      expect(data.source.ext.schain).to.deep.equal({
+      expect(data.ext.schain).to.deep.equal({
         'ver': '1.0',
         'complete': 1,
         'nodes': [
@@ -203,6 +224,13 @@ describe('RTBHouseAdapter', () => {
       });
     });
 
+    it('should include source.tid in request', () => {
+      const bidRequest = Object.assign([], bidRequests);
+      const request = spec.buildRequests(bidRequest, bidderRequest);
+      const data = JSON.parse(request.data);
+      expect(data.source).to.have.deep.property('tid');
+    });
+
     it('should not include invalid schain', () => {
       const bidRequest = Object.assign([], bidRequests);
       bidRequest[0].schain = {
@@ -424,6 +452,7 @@ describe('RTBHouseAdapter', () => {
           'mediaType': 'banner',
           'currency': 'USD',
           'ttl': 300,
+          'meta': { advertiserDomains: ['rtbhouse.com'] },
           'netRevenue': true
         }
       ];
@@ -486,6 +515,7 @@ describe('RTBHouseAdapter', () => {
 
       it('should contain native assets in valid format', () => {
         const bids = spec.interpretResponse({body: response}, {});
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(['rtbhouse.com']);
         expect(bids[0].native).to.deep.equal({
           title: 'Title text',
           clickUrl: encodeURIComponent('https://example.com'),
diff --git a/test/spec/modules/rtbsapeBidAdapter_spec.js b/test/spec/modules/rtbsapeBidAdapter_spec.js
new file mode 100644
index 00000000000..4c3814385b3
--- /dev/null
+++ b/test/spec/modules/rtbsapeBidAdapter_spec.js
@@ -0,0 +1,166 @@
+import {expect} from 'chai';
+import {spec} from 'modules/rtbsapeBidAdapter.js';
+import * as utils from 'src/utils.js';
+import {executeRenderer, Renderer} from 'src/Renderer.js';
+
+describe('rtbsapeBidAdapterTests', function () {
+  describe('isBidRequestValid', function () {
+    it('valid', function () {
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {banner: true}, params: {placeId: 4321}})).to.equal(true);
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {video: true}, params: {placeId: 4321}})).to.equal(true);
+    });
+
+    it('invalid', function () {
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', mediaTypes: {banner: true}, params: {}})).to.equal(false);
+      expect(spec.isBidRequestValid({bidder: 'rtbsape', params: {placeId: 4321}})).to.equal(false);
+    });
+  });
+
+  it('buildRequests', function () {
+    let bidRequestData = [{
+      bidId: 'bid1234',
+      bidder: 'rtbsape',
+      params: {placeId: 4321},
+      sizes: [[240, 400]]
+    }];
+    let bidderRequest = {
+      auctionId: '2e208334-cafe-4c2c-b06b-f055ff876852',
+      bidderRequestId: '1392d0aa613366',
+      refererInfo: {}
+    };
+    let request = spec.buildRequests(bidRequestData, bidderRequest);
+    expect(request.data.auctionId).to.equal('2e208334-cafe-4c2c-b06b-f055ff876852');
+    expect(request.data.requestId).to.equal('1392d0aa613366');
+    expect(request.data.bids[0].bidId).to.equal('bid1234');
+    expect(request.data.timezone).to.not.equal(undefined);
+  });
+
+  describe('interpretResponse', function () {
+    it('banner', function () {
+      let serverResponse = {
+        body: {
+          bids: [{
+            requestId: 'bid1234',
+            cpm: 2.21,
+            currency: 'RUB',
+            width: 240,
+            height: 400,
+            netRevenue: true,
+            ad: 'Ad html'
+          }]
+        }
+      };
+      let bids = spec.interpretResponse(serverResponse, {data: {bids: [{mediaTypes: {banner: true}}]}});
+      expect(bids).to.have.lengthOf(1);
+      let bid = bids[0];
+      expect(bid.cpm).to.equal(2.21);
+      expect(bid.currency).to.equal('RUB');
+      expect(bid.width).to.equal(240);
+      expect(bid.height).to.equal(400);
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.requestId).to.equal('bid1234');
+      expect(bid.ad).to.equal('Ad html');
+    });
+
+    describe('video (outstream)', function () {
+      let bid;
+
+      before(() => {
+        let serverResponse = {
+          body: {
+            bids: [{
+              requestId: 'bid1234',
+              adUnitCode: 'ad-bid1234',
+              cpm: 3.32,
+              currency: 'RUB',
+              width: 600,
+              height: 340,
+              netRevenue: true,
+              vastUrl: 'https://cdn-rtb.sape.ru/vast/4321.xml',
+              meta: {
+                mediaType: 'video'
+              }
+            }]
+          }
+        };
+        let serverRequest = {
+          data: {
+            bids: [{
+              bidId: 'bid1234',
+              adUnitCode: 'ad-bid1234',
+              mediaTypes: {
+                video: {
+                  context: 'outstream'
+                }
+              },
+              params: {
+                placeId: 4321,
+                video: {
+                  playerMuted: false
+                }
+              }
+            }]
+          }
+        };
+        let bids = spec.interpretResponse(serverResponse, serverRequest);
+        expect(bids).to.have.lengthOf(1);
+        bid = bids[0];
+      });
+
+      it('should add renderer', () => {
+        expect(bid).to.have.own.property('renderer');
+        expect(bid.renderer).to.be.instanceof(Renderer);
+        expect(bid.renderer.url).to.equal('https://cdn-rtb.sape.ru/js/player.js');
+        expect(bid.playerMuted).to.equal(false);
+      });
+
+      it('should create player instance', () => {
+        let spy = false;
+
+        window.sapeRtbPlayerHandler = function (id, w, h, m) {
+          const player = {addSlot: () => [id, w, h, m]}
+          expect(spy).to.equal(false);
+          spy = sinon.spy(player, 'addSlot');
+          return player;
+        };
+
+        executeRenderer(bid.renderer, bid);
+        expect(spy).to.not.equal(false);
+        expect(spy.called).to.be.true;
+
+        const spyCall = spy.getCall(0);
+        expect(spyCall.args[0].url).to.be.equal('https://cdn-rtb.sape.ru/vast/4321.xml');
+        expect(spyCall.returnValue[0]).to.be.equal('ad-bid1234');
+        expect(spyCall.returnValue[1]).to.be.equal(600);
+        expect(spyCall.returnValue[2]).to.be.equal(340);
+        expect(spyCall.returnValue[3]).to.be.equal(false);
+      });
+    });
+  });
+
+  it('getUserSyncs', function () {
+    const syncs = spec.getUserSyncs({iframeEnabled: true});
+    expect(syncs).to.be.an('array').that.to.have.lengthOf(1);
+    expect(syncs[0]).to.deep.equal({type: 'iframe', url: 'https://www.acint.net/mc/?dp=141'});
+  });
+
+  describe('onBidWon', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('called once', function () {
+      spec.onBidWon({cpm: '2.21', nurl: 'https://ssp-rtb.sape.ru/track?event=win'});
+      expect(utils.triggerPixel.calledOnce).to.equal(true);
+    });
+
+    it('called false', function () {
+      spec.onBidWon({cpm: '2.21'});
+      expect(utils.triggerPixel.called).to.equal(false);
+    });
+  });
+});
diff --git a/test/spec/modules/rubiconAnalyticsAdapter_spec.js b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
index 1639389fe24..d8aa9ede9a5 100644
--- a/test/spec/modules/rubiconAnalyticsAdapter_spec.js
+++ b/test/spec/modules/rubiconAnalyticsAdapter_spec.js
@@ -2,16 +2,17 @@ import rubiconAnalyticsAdapter, {
   SEND_TIMEOUT,
   parseBidResponse,
   getHostNameFromReferer,
+  storage,
+  rubiConf,
 } from 'modules/rubiconAnalyticsAdapter.js';
 import CONSTANTS from 'src/constants.json';
 import { config } from 'src/config.js';
 import { server } from 'test/mocks/xhr.js';
-
+import * as mockGpt from '../integration/faker/googletag.js';
 import {
   setConfig,
   addBidResponseHook,
 } from 'modules/currency.js';
-
 let Ajv = require('ajv');
 let schema = require('./rubiconAnalyticsSchema.json');
 let ajv = new Ajv({
@@ -110,10 +111,85 @@ const BID2 = Object.assign({}, BID, {
   }
 });
 
+const BID3 = Object.assign({}, BID, {
+  adUnitCode: '/19968336/siderail-tag1',
+  bidId: '5fg6hyy4r879f0',
+  adId: 'fake_ad_id',
+  requestId: '5fg6hyy4r879f0',
+  width: 300,
+  height: 250,
+  mediaType: 'banner',
+  cpm: 2.01,
+  source: 'server',
+  seatBidId: 'aaaa-bbbb-cccc-dddd',
+  rubiconTargeting: {
+    'rpfl_elemid': '/19968336/siderail-tag1',
+    'rpfl_14062': '15_tier0200'
+  },
+  adserverTargeting: {
+    'hb_bidder': 'rubicon',
+    'hb_adid': '5fg6hyy4r879f0',
+    'hb_pb': '2.00',
+    'hb_size': '300x250',
+    'hb_source': 'server'
+  }
+});
+
+const BID4 = Object.assign({}, BID, {
+  adUnitCode: '/19968336/header-bid-tag1',
+  bidId: '3bd4ebb1c900e2',
+  adId: 'fake_ad_id',
+  requestId: '3bd4ebb1c900e2',
+  width: 728,
+  height: 90,
+  mediaType: 'banner',
+  cpm: 1.52,
+  source: 'server',
+  pbsBidId: 'zzzz-yyyy-xxxx-wwww',
+  seatBidId: 'aaaa-bbbb-cccc-dddd',
+  rubiconTargeting: {
+    'rpfl_elemid': '/19968336/header-bid-tag1',
+    'rpfl_14062': '2_tier0100'
+  },
+  adserverTargeting: {
+    'hb_bidder': 'rubicon',
+    'hb_adid': '3bd4ebb1c900e2',
+    'hb_pb': '1.500',
+    'hb_size': '728x90',
+    'hb_source': 'server'
+  }
+});
+
+const floorMinRequest = {
+  'bidder': 'rubicon',
+  'params': {
+    'accountId': '14062',
+    'siteId': '70608',
+    'zoneId': '335918',
+    'userId': '12346',
+    'keywords': ['a', 'b', 'c'],
+    'inventory': {'rating': '4-star', 'prodtype': 'tech'},
+    'visitor': {'ucat': 'new', 'lastsearch': 'iphone'},
+    'position': 'atf'
+  },
+  'mediaTypes': {
+    'banner': {
+      'sizes': [[300, 250]]
+    }
+  },
+  'adUnitCode': '/19968336/siderail-tag1',
+  'transactionId': 'c435626g-9e3f-401a-bee1-d56aec29a1d4',
+  'sizes': [[300, 250]],
+  'bidId': '5fg6hyy4r879f0',
+  'bidderRequestId': '1be65d7958826a',
+  'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+};
+
 const MOCK = {
   SET_TARGETING: {
     [BID.adUnitCode]: BID.adserverTargeting,
-    [BID2.adUnitCode]: BID2.adserverTargeting
+    [BID2.adUnitCode]: BID2.adserverTargeting,
+    [BID3.adUnitCode]: BID3.adserverTargeting
   },
   AUCTION_INIT: {
     'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
@@ -198,13 +274,19 @@ const MOCK = {
             }
           }
         },
-        'mediaType': 'video',
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [640, 480]
+          }
+        },
         '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'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 'client'
       },
       {
         'bidder': 'rubicon',
@@ -228,7 +310,8 @@ const MOCK = {
         'sizes': [[1000, 300], [970, 250], [728, 90]],
         'bidId': '3bd4ebb1c900e2',
         'bidderRequestId': '1be65d7958826a',
-        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
+        'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
+        'src': 's2s'
       }
     ],
     'auctionStart': 1519149536560,
@@ -240,7 +323,8 @@ const MOCK = {
   },
   BID_RESPONSE: [
     BID,
-    BID2
+    BID2,
+    BID3
   ],
   AUCTION_END: {
     'auctionId': '25c6d7f5-699a-4bfc-87c9-996f915341fa'
@@ -251,14 +335,21 @@ const MOCK = {
     }),
     Object.assign({}, BID2, {
       'status': 'rendered'
+    }),
+    Object.assign({}, BID3, {
+      'status': 'rendered'
     })
   ],
   BIDDER_DONE: {
     'bidderCode': 'rubicon',
+    'serverResponseTimeMs': 42,
     'bids': [
       BID,
       Object.assign({}, BID2, {
         'serverResponseTimeMs': 42,
+      }),
+      Object.assign({}, BID3, {
+        'serverResponseTimeMs': 55,
       })
     ]
   },
@@ -272,14 +363,28 @@ const MOCK = {
   ]
 };
 
+const STUBBED_UUID = '12345678-1234-1234-1234-123456789abc';
+
 const ANALYTICS_MESSAGE = {
-  'eventTimeMillis': 1519767013781,
+  'channel': 'web',
   'integration': 'pbjs',
   'version': '$prebid.version$',
   'referrerUri': 'http://www.test.com/page.html',
+  'session': {
+    'expires': 1519788613781,
+    'id': STUBBED_UUID,
+    'start': 1519767013781
+  },
+  'timestamps': {
+    'auctionEnded': 1519767013781,
+    'eventTime': 1519767013781,
+    'prebidLoaded': rubiconAnalyticsAdapter.MODULE_INITIALIZED_TIME
+  },
+  'trigger': 'allBidWons',
   'referrerHostname': 'www.test.com',
   'auctions': [
     {
+      'requestId': '25c6d7f5-699a-4bfc-87c9-996f915341fa',
       'clientTimeoutMillis': 3000,
       'serverTimeoutMillis': 1000,
       'accountId': 1001,
@@ -463,16 +568,23 @@ const ANALYTICS_MESSAGE = {
       'bidwonStatus': 'success'
     }
   ],
-  'wrapperName': '10000_fakewrapper_test'
+  'wrapper': {
+    'name': '10000_fakewrapper_test'
+  }
 };
 
-function performStandardAuction() {
+function performStandardAuction(gptEvents) {
   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);
+
+  if (gptEvents && gptEvents.length) {
+    gptEvents.forEach(gptEvent => mockGpt.emitEvent(gptEvent.eventName, gptEvent.params));
+  }
+
   events.emit(SET_TARGETING, MOCK.SET_TARGETING);
   events.emit(BID_WON, MOCK.BID_WON[0]);
   events.emit(BID_WON, MOCK.BID_WON[1]);
@@ -481,12 +593,20 @@ function performStandardAuction() {
 describe('rubicon analytics adapter', function () {
   let sandbox;
   let clock;
-
+  let getDataFromLocalStorageStub, setDataInLocalStorageStub, localStorageIsEnabledStub;
   beforeEach(function () {
+    getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    setDataInLocalStorageStub = sinon.stub(storage, 'setDataInLocalStorage');
+    localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+    mockGpt.disable();
     sandbox = sinon.sandbox.create();
 
+    localStorageIsEnabledStub.returns(true);
+
     sandbox.stub(events, 'getEvents').returns([]);
 
+    sandbox.stub(utils, 'generateUUID').returns(STUBBED_UUID);
+
     clock = sandbox.useFakeTimers(1519767013781);
 
     rubiconAnalyticsAdapter.referrerHostname = '';
@@ -505,6 +625,10 @@ describe('rubicon analytics adapter', function () {
   afterEach(function () {
     sandbox.restore();
     config.resetConfig();
+    mockGpt.enable();
+    getDataFromLocalStorageStub.restore();
+    setDataInLocalStorageStub.restore();
+    localStorageIsEnabledStub.restore();
   });
 
   it('should require accountId', function () {
@@ -531,6 +655,76 @@ describe('rubicon analytics adapter', function () {
     expect(utils.logError.called).to.equal(true);
   });
 
+  describe('config subscribe', function() {
+    it('should update the pvid if user asks', function () {
+      expect(utils.generateUUID.called).to.equal(false);
+      config.setConfig({rubicon: {updatePageView: true}});
+      expect(utils.generateUUID.called).to.equal(true);
+    });
+    it('should merge in and preserve older set configs', function () {
+      config.setConfig({
+        rubicon: {
+          wrapperName: '1001_general',
+          int_type: 'dmpbjs',
+          fpkvs: {
+            source: 'fb'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb'
+        },
+        updatePageView: true
+      });
+
+      // update it with stuff
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'email'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          source: 'fb',
+          link: 'email'
+        },
+        updatePageView: true
+      });
+
+      // overwriting specific edge keys should update them
+      config.setConfig({
+        rubicon: {
+          fpkvs: {
+            link: 'iMessage',
+            source: 'twitter'
+          }
+        }
+      });
+      expect(rubiConf).to.deep.equal({
+        analyticsEventDelay: 0,
+        pvid: '12345678',
+        wrapperName: '1001_general',
+        int_type: 'dmpbjs',
+        fpkvs: {
+          link: 'iMessage',
+          source: 'twitter'
+        },
+        updatePageView: true
+      });
+    });
+  });
+
   describe('sampling', function () {
     beforeEach(function () {
       sandbox.stub(Math, 'random').returns(0.08);
@@ -659,14 +853,115 @@ describe('rubicon analytics adapter', function () {
       expect(message).to.deep.equal(ANALYTICS_MESSAGE);
     });
 
-    it('should capture price floor information correctly', function () {
+    it('should handle bidResponse dimensions correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // mock bid response with playerWidth and playerHeight (NO width and height)
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      delete bidResponse1.width;
+      delete bidResponse1.height;
+      bidResponse1.playerWidth = 640;
+      bidResponse1.playerHeight = 480;
+
+      // mock bid response with no width height or playerwidth playerheight
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      delete bidResponse2.width;
+      delete bidResponse2.height;
+      delete bidResponse2.playerWidth;
+      delete bidResponse2.playerHeight;
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      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]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.dimensions).to.deep.equal({
+        width: 640,
+        height: 480
+      });
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.dimensions).to.equal(undefined);
+    });
+
+    it('should pass along adomians correctly', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // 1 adomains
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: ['magnite.com']
+      }
+
+      // two adomains
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: ['prebid.org', 'magnite.com']
+      }
+
+      // make sure we only pass max 10 adomains
+      bidResponse2.meta.advertiserDomains = [...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains, ...bidResponse2.meta.advertiserDomains]
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      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]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.deep.equal(['magnite.com']);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.deep.equal(['prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com', 'prebid.org', 'magnite.com']);
+    });
+
+    it('should NOT pass along adomians correctly when edge cases', function () {
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+
+      // empty => nothing
+      let bidResponse1 = utils.deepClone(MOCK.BID_RESPONSE[0]);
+      bidResponse1.meta = {
+        advertiserDomains: []
+      }
+
+      // not array => nothing
+      let bidResponse2 = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse2.meta = {
+        advertiserDomains: 'prebid.org'
+      }
+
+      events.emit(BID_RESPONSE, bidResponse1);
+      events.emit(BID_RESPONSE, bidResponse2);
+      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]);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.adomains).to.be.undefined;
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.adomains).to.be.undefined;
+    });
+
+    function performFloorAuction(provider) {
       let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
       auctionInit.bidderRequests[0].bids[0].floorData = {
         skipped: false,
         modelVersion: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         location: 'setConfig',
         skipRate: 15,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        floorProvider: provider
       };
       let flooredResponse = {
         ...BID,
@@ -713,50 +1008,714 @@ describe('rubicon analytics adapter', function () {
         }
       };
 
+      let floorMinResponse = {
+        ...BID3,
+        floorData: {
+          floorValue: 1.5,
+          floorRuleValue: 1,
+          floorRule: '12345/entertainment|banner',
+          floorCurrency: 'USD',
+          cpmAfterAdjustments: 2.00,
+          enforcements: {
+            enforceJS: true,
+            enforcePBS: false,
+            floorDeals: false,
+            bidAdjustment: true
+          },
+          matchedFields: {
+            gptSlot: '12345/entertainment',
+            mediaType: 'banner'
+          }
+        }
+      };
+
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids.push(floorMinRequest)
+
       // spoof the auction with just our duplicates
       events.emit(AUCTION_INIT, auctionInit);
-      events.emit(BID_REQUESTED, MOCK.BID_REQUESTED);
+      events.emit(BID_REQUESTED, bidRequest);
       events.emit(BID_RESPONSE, flooredResponse);
       events.emit(BID_RESPONSE, notFlooredResponse);
+      events.emit(BID_RESPONSE, floorMinResponse);
       events.emit(AUCTION_END, MOCK.AUCTION_END);
       events.emit(SET_TARGETING, MOCK.SET_TARGETING);
       events.emit(BID_WON, MOCK.BID_WON[1]);
+      events.emit(BID_WON, MOCK.BID_WON[2]);
       clock.tick(SEND_TIMEOUT + 1000);
 
       expect(server.requests.length).to.equal(1);
 
       let message = JSON.parse(server.requests[0].requestBody);
       validate(message);
+      return message;
+    }
+
+    it('should capture price floor information correctly', function () {
+      let message = performFloorAuction('rubicon');
 
       // verify our floor stuff is passed
       // top level floor info
       expect(message.auctions[0].floors).to.deep.equal({
         location: 'setConfig',
         modelName: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
         skipped: false,
         enforcement: true,
         dealsEnforced: false,
         skipRate: 15,
-        fetchStatus: 'error'
+        fetchStatus: 'error',
+        provider: 'rubicon'
       });
       // first adUnit's adSlot
-      expect(message.auctions[0].adUnits[0].adSlot).to.equal('12345/sports');
+      expect(message.auctions[0].adUnits[0].gam.adSlot).to.equal('12345/sports');
       // since no other bids, we set adUnit status to no-bid
       expect(message.auctions[0].adUnits[0].status).to.equal('no-bid');
       // first adUnits bid is rejected
-      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected');
+      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected-ipf');
       expect(message.auctions[0].adUnits[0].bids[0].bidResponse.floorValue).to.equal(4);
       // if bid rejected should take cpmAfterAdjustments val
       expect(message.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD).to.equal(2.1);
 
       // second adUnit's adSlot
-      expect(message.auctions[0].adUnits[1].adSlot).to.equal('12345/news');
+      expect(message.auctions[0].adUnits[1].gam.adSlot).to.equal('12345/news');
       // top level adUnit status is success
       expect(message.auctions[0].adUnits[1].status).to.equal('success');
       // second adUnits bid is success
       expect(message.auctions[0].adUnits[1].bids[0].status).to.equal('success');
       expect(message.auctions[0].adUnits[1].bids[0].bidResponse.floorValue).to.equal(1);
       expect(message.auctions[0].adUnits[1].bids[0].bidResponse.bidPriceUSD).to.equal(1.52);
+
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[2].gam.adSlot).to.equal('12345/entertainment');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[2].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[2].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorValue).to.equal(1.5);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorRuleValue).to.equal(1);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.bidPriceUSD).to.equal(2.01);
+    });
+
+    it('should still send floor info if provider is not rubicon', function () {
+      let message = performFloorAuction('randomProvider');
+
+      // verify our floor stuff is passed
+      // top level floor info
+      expect(message.auctions[0].floors).to.deep.equal({
+        location: 'setConfig',
+        modelName: 'someModelName',
+        modelWeight: 10,
+        modelTimestamp: 1606772895,
+        skipped: false,
+        enforcement: true,
+        dealsEnforced: false,
+        skipRate: 15,
+        fetchStatus: 'error',
+        provider: 'randomProvider'
+      });
+      // first adUnit's adSlot
+      expect(message.auctions[0].adUnits[0].gam.adSlot).to.equal('12345/sports');
+      // since no other bids, we set adUnit status to no-bid
+      expect(message.auctions[0].adUnits[0].status).to.equal('no-bid');
+      // first adUnits bid is rejected
+      expect(message.auctions[0].adUnits[0].bids[0].status).to.equal('rejected-ipf');
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.floorValue).to.equal(4);
+      // if bid rejected should take cpmAfterAdjustments val
+      expect(message.auctions[0].adUnits[0].bids[0].bidResponse.bidPriceUSD).to.equal(2.1);
+
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[1].gam.adSlot).to.equal('12345/news');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[1].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[1].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.floorValue).to.equal(1);
+      expect(message.auctions[0].adUnits[1].bids[0].bidResponse.bidPriceUSD).to.equal(1.52);
+
+      // second adUnit's adSlot
+      expect(message.auctions[0].adUnits[2].gam.adSlot).to.equal('12345/entertainment');
+      // top level adUnit status is success
+      expect(message.auctions[0].adUnits[2].status).to.equal('success');
+      // second adUnits bid is success
+      expect(message.auctions[0].adUnits[2].bids[0].status).to.equal('success');
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorValue).to.equal(1.5);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.floorRuleValue).to.equal(1);
+      expect(message.auctions[0].adUnits[2].bids[0].bidResponse.bidPriceUSD).to.equal(2.01);
+    });
+
+    describe('with session handling', function () {
+      const expectedPvid = STUBBED_UUID.slice(0, 8);
+      beforeEach(function () {
+        config.setConfig({rubicon: {updatePageView: true}});
+      });
+
+      it('should not log any session data if local storage is not enabled', function () {
+        localStorageIsEnabledStub.returns(false);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.session;
+        delete expectedMessage.fpkvs;
+
+        performStandardAuction();
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+
+        expect(request.url).to.equal('//localhost:9999/event');
+
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should should pass along custom rubicon kv and pvid when defined', function () {
+        config.setConfig({rubicon: {
+          fpkvs: {
+            source: 'fb',
+            link: 'email'
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'fb'},
+          {key: 'link', value: 'email'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should convert kvs to strings before sending', function () {
+        config.setConfig({rubicon: {
+          fpkvs: {
+            number: 24,
+            boolean: false,
+            string: 'hello',
+            array: ['one', 2, 'three'],
+            object: {one: 'two'}
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          {key: 'number', value: '24'},
+          {key: 'boolean', value: 'false'},
+          {key: 'string', value: 'hello'},
+          {key: 'array', value: 'one,2,three'},
+          {key: 'object', value: '[object Object]'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should use the query utm param rubicon kv value and pass updated kv and pvid when defined', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({'search': '?utm_source=other', 'pbjs_debug': 'true'});
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            source: 'fb',
+            link: 'email'
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session.pvid = STUBBED_UUID.slice(0, 8);
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'other'},
+          {key: 'link', value: 'email'}
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick up existing localStorage and use its values', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            link: 'email' // should merge this with what is in the localStorage!
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'tw'},
+          {key: 'link', value: 'email'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { source: 'tw', link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should overwrite matching localstorge value and use its remaining values', function () {
+        sandbox.stub(utils, 'getWindowLocation').returns({'search': '?utm_source=fb&utm_click=dog'});
+
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519766113781, // 15 mins before "now"
+          expires: 1519787713781, // six hours later
+          lastSeen: 1519766113781,
+          fpkvs: { source: 'tw', link: 'email' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            link: 'email' // should merge this with what is in the localStorage!
+          }
+        }});
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.session = {
+          id: '987654',
+          start: 1519766113781,
+          expires: 1519787713781,
+          pvid: expectedPvid
+        }
+        expectedMessage.fpkvs = [
+          {key: 'source', value: 'fb'},
+          {key: 'link', value: 'email'},
+          {key: 'click', value: 'dog'}
+        ]
+
+        message.fpkvs.sort((left, right) => left.key < right.key);
+        expectedMessage.fpkvs.sort((left, right) => left.key < right.key);
+
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: '987654', // should have stayed same
+          start: 1519766113781, // should have stayed same
+          expires: 1519787713781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { source: 'fb', link: 'email', click: 'dog' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if lastSeen > 30 mins ago and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519764313781, // 45 mins before "now"
+          expires: 1519785913781, // six hours later
+          lastSeen: 1519764313781, // 45 mins before "now"
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            link: 'email' // should merge this with what is in the localStorage!
+          }
+        }});
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          {key: 'link', value: 'email'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have stayed same
+          start: 1519767013781, // should have stayed same
+          expires: 1519788613781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+
+      it('should throw out session if past expires time and create new one', function () {
+        // set some localStorage
+        let inputlocalStorage = {
+          id: '987654',
+          start: 1519745353781, // 6 hours before "expires"
+          expires: 1519766953781, // little more than six hours ago
+          lastSeen: 1519767008781, // 5 seconds ago
+          fpkvs: { source: 'tw' }
+        };
+        getDataFromLocalStorageStub.withArgs('rpaSession').returns(btoa(JSON.stringify(inputlocalStorage)));
+
+        config.setConfig({rubicon: {
+          fpkvs: {
+            link: 'email' // should merge this with what is in the localStorage!
+          }
+        }});
+
+        performStandardAuction();
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        // session should match what is already in ANALYTICS_MESSAGE, just need to add pvid
+        expectedMessage.session.pvid = expectedPvid;
+
+        // the saved fpkvs should have been thrown out since session expired
+        expectedMessage.fpkvs = [
+          {key: 'link', value: 'email'}
+        ]
+        expect(message).to.deep.equal(expectedMessage);
+
+        let calledWith;
+        try {
+          calledWith = JSON.parse(atob(setDataInLocalStorageStub.getCall(0).args[1]));
+        } catch (e) {
+          calledWith = {};
+        }
+
+        expect(calledWith).to.deep.equal({
+          id: STUBBED_UUID, // should have stayed same
+          start: 1519767013781, // should have stayed same
+          expires: 1519788613781, // should have stayed same
+          lastSeen: 1519767013781, // lastSeen updated to our "now"
+          fpkvs: { link: 'email' }, // link merged in
+          pvid: expectedPvid // new pvid stored
+        });
+      });
+    });
+    describe('with googletag enabled', function () {
+      let gptSlot0, gptSlot1;
+      let gptSlotRenderEnded0, gptSlotRenderEnded1;
+      beforeEach(function () {
+        mockGpt.enable();
+        gptSlot0 = mockGpt.makeSlot({code: '/19968336/header-bid-tag-0'});
+        gptSlotRenderEnded0 = {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot0,
+            isEmpty: false,
+            advertiserId: 1111,
+            sourceAgnosticCreativeId: 2222,
+            sourceAgnosticLineItemId: 3333
+          }
+        };
+
+        gptSlot1 = mockGpt.makeSlot({code: '/19968336/header-bid-tag1'});
+        gptSlotRenderEnded1 = {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 4444,
+            sourceAgnosticCreativeId: 5555,
+            sourceAgnosticLineItemId: 6666
+          }
+        };
+      });
+
+      afterEach(function () {
+        mockGpt.disable();
+      });
+
+      it('should add necessary gam information if gpt is enabled and slotRender event emmited', function () {
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should handle empty gam renders', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: true
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          isSlotEmpty: true,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should still add gam ids if falsy', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 0,
+            sourceAgnosticCreativeId: 0,
+            sourceAgnosticLineItemId: 0
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 0,
+          creativeId: 0,
+          lineItemId: 0,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should pick backup Ids if no sourceAgnostic available first', function () {
+        performStandardAuction([gptSlotRenderEnded0, {
+          eventName: 'slotRenderEnded',
+          params: {
+            slot: gptSlot1,
+            isEmpty: false,
+            advertiserId: 0,
+            lineItemId: 1234,
+            creativeId: 5678
+          }
+        }]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 0,
+          creativeId: 5678,
+          lineItemId: 1234,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should correctly set adUnit for associated slots', function () {
+        performStandardAuction([gptSlotRenderEnded0, gptSlotRenderEnded1]);
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should send request when waitForGamSlots is present but no bidWons are sent', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true,
+          }
+        });
+        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);
+
+        // should send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+
+        let expectedMessage = utils.deepClone(ANALYTICS_MESSAGE);
+        delete expectedMessage.bidsWon; // should not be any of these
+        expectedMessage.auctions[0].adUnits[0].gam = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        expectedMessage.auctions[0].adUnits[1].gam = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expectedMessage.trigger = 'gam';
+        expect(message).to.deep.equal(expectedMessage);
+      });
+
+      it('should delay the event call depending on analyticsEventDelay config', function () {
+        config.setConfig({
+          rubicon: {
+            waitForGamSlots: true,
+            analyticsEventDelay: 2000
+          }
+        });
+        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);
+
+        // should send if just slotRenderEnded is emmitted for both
+        mockGpt.emitEvent(gptSlotRenderEnded0.eventName, gptSlotRenderEnded0.params);
+        mockGpt.emitEvent(gptSlotRenderEnded1.eventName, gptSlotRenderEnded1.params);
+
+        // Should not be sent until delay
+        expect(server.requests.length).to.equal(0);
+
+        // tick the clock and it should fire
+        clock.tick(2000);
+
+        expect(server.requests.length).to.equal(1);
+        let request = server.requests[0];
+        let message = JSON.parse(request.requestBody);
+        validate(message);
+        let expectedGam0 = {
+          advertiserId: 1111,
+          creativeId: 2222,
+          lineItemId: 3333,
+          adSlot: '/19968336/header-bid-tag-0'
+        };
+        let expectedGam1 = {
+          advertiserId: 4444,
+          creativeId: 5555,
+          lineItemId: 6666,
+          adSlot: '/19968336/header-bid-tag1'
+        };
+        expect(expectedGam0).to.deep.equal(message.auctions[0].adUnits[0].gam);
+        expect(expectedGam1).to.deep.equal(message.auctions[0].adUnits[1].gam);
+      });
     });
 
     it('should correctly overwrite bidId if seatBidId is on the bidResponse', function () {
@@ -793,6 +1752,73 @@ describe('rubicon analytics adapter', function () {
       expect(message.bidsWon[0].bidId).to.equal('abc-123-do-re-me');
     });
 
+    it('should correctly overwrite bidId if pbsBidId is on the bidResponse', function () {
+      // Only want one bid request in our mock auction
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids.shift();
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits.shift();
+
+      // clone the mock bidResponse and duplicate
+      let seatBidResponse = utils.deepClone(BID4);
+
+      const setTargeting = {
+        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
+      };
+
+      const bidWon = Object.assign({}, seatBidResponse, {
+        'status': 'rendered'
+      });
+
+      // spoof the auction with just our duplicates
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, seatBidResponse);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, setTargeting);
+      events.emit(BID_WON, bidWon);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidId).to.equal('zzzz-yyyy-xxxx-wwww');
+      expect(message.bidsWon[0].bidId).to.equal('zzzz-yyyy-xxxx-wwww');
+    });
+
+    it('should correctly generate new bidId if it is 0', function () {
+      // Only want one bid request in our mock auction
+      let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequested.bids.shift();
+      let auctionInit = utils.deepClone(MOCK.AUCTION_INIT);
+      auctionInit.adUnits.shift();
+
+      // clone the mock bidResponse and duplicate
+      let seatBidResponse = utils.deepClone(BID4);
+      seatBidResponse.pbsBidId = '0';
+
+      const setTargeting = {
+        [seatBidResponse.adUnitCode]: seatBidResponse.adserverTargeting
+      };
+
+      const bidWon = Object.assign({}, seatBidResponse, {
+        'status': 'rendered'
+      });
+
+      // spoof the auction with just our duplicates
+      events.emit(AUCTION_INIT, auctionInit);
+      events.emit(BID_REQUESTED, bidRequested);
+      events.emit(BID_RESPONSE, seatBidResponse);
+      events.emit(AUCTION_END, MOCK.AUCTION_END);
+      events.emit(SET_TARGETING, setTargeting);
+      events.emit(BID_WON, bidWon);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+
+      validate(message);
+      expect(message.auctions[0].adUnits[0].bids[0].bidId).to.equal(STUBBED_UUID);
+      expect(message.bidsWon[0].bidId).to.equal(STUBBED_UUID);
+    });
+
     it('should pick the highest cpm bid if more than one bid per bidRequestId', function () {
       // Only want one bid request in our mock auction
       let bidRequested = utils.deepClone(MOCK.BID_REQUESTED);
@@ -890,6 +1916,65 @@ describe('rubicon analytics adapter', function () {
       expect(timedOutBid).to.not.have.property('bidResponse');
     });
 
+    it('should pass aupName as pattern', function () {
+      let bidRequest = utils.deepClone(MOCK.BID_REQUESTED);
+      bidRequest.bids[0].ortb2Imp = {
+        ext: {
+          data: {
+            aupname: '1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile'
+          }
+        }
+      };
+      bidRequest.bids[1].ortb2Imp = {
+        ext: {
+          data: {
+            aupname: '1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile'
+          }
+        }
+      };
+      events.emit(AUCTION_INIT, MOCK.AUCTION_INIT);
+      events.emit(BID_REQUESTED, bidRequest);
+      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);
+
+      clock.tick(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+      expect(message.auctions[0].adUnits[0].pattern).to.equal('1234/mycoolsite/*&gpt_leaderboard&deviceType=mobile');
+      expect(message.auctions[0].adUnits[1].pattern).to.equal('1234/mycoolsite/*&gpt_skyscraper&deviceType=mobile');
+    });
+
+    it('should pass bidderDetail for multibid auctions', function () {
+      let bidResponse = utils.deepClone(MOCK.BID_RESPONSE[1]);
+      bidResponse.targetingBidder = 'rubi2';
+      bidResponse.originalRequestId = bidResponse.requestId;
+      bidResponse.requestId = '1a2b3c4d5e6f7g8h9';
+
+      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, bidResponse);
+      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(SEND_TIMEOUT + 1000);
+
+      expect(server.requests.length).to.equal(1);
+
+      let message = JSON.parse(server.requests[0].requestBody);
+      validate(message);
+
+      expect(message.auctions[0].adUnits[1].bids[1].bidder).to.equal('rubicon');
+      expect(message.auctions[0].adUnits[1].bids[1].bidderDetail).to.equal('rubi2');
+    });
+
     it('should successfully convert bid price to USD in parseBidResponse', function () {
       // Set the rates
       setConfig({
@@ -921,12 +2006,9 @@ describe('rubicon analytics adapter', function () {
 
   describe('config with integration type', () => {
     it('should use the integration type provided in the config instead of the default', () => {
-      sandbox.stub(config, 'getConfig').callsFake(function (key) {
-        const config = {
-          'rubicon.int_type': 'testType'
-        };
-        return config[key];
-      });
+      config.setConfig({rubicon: {
+        int_type: 'testType'
+      }})
 
       rubiconAnalyticsAdapter.enableAnalytics({
         options: {
@@ -946,6 +2028,36 @@ describe('rubicon analytics adapter', function () {
     });
   });
 
+  describe('wrapper details passed in', () => {
+    it('should correctly pass in the wrapper details if provided', () => {
+      config.setConfig({rubicon: {
+        wrapperName: '1001_wrapperName_exp.4',
+        wrapperFamily: '1001_wrapperName',
+        rule_name: 'na-mobile'
+      }});
+
+      rubiconAnalyticsAdapter.enableAnalytics({
+        options: {
+          endpoint: '//localhost:9999/event',
+          accountId: 1001
+        }
+      });
+
+      performStandardAuction();
+
+      expect(server.requests.length).to.equal(1);
+      const request = server.requests[0];
+      const message = JSON.parse(request.requestBody);
+      expect(message.wrapper).to.deep.equal({
+        name: '1001_wrapperName_exp.4',
+        family: '1001_wrapperName',
+        rule: 'na-mobile'
+      });
+
+      rubiconAnalyticsAdapter.disableAnalytics();
+    });
+  });
+
   it('getHostNameFromReferer correctly grabs hostname from an input URL', function () {
     let inputUrl = 'https://www.prebid.org/some/path?pbjs_debug=true';
     expect(getHostNameFromReferer(inputUrl)).to.equal('www.prebid.org');
diff --git a/test/spec/modules/rubiconAnalyticsSchema.json b/test/spec/modules/rubiconAnalyticsSchema.json
index 16cca629d8c..a8fdeae5268 100644
--- a/test/spec/modules/rubiconAnalyticsSchema.json
+++ b/test/spec/modules/rubiconAnalyticsSchema.json
@@ -4,7 +4,6 @@
   "description": "A batched data object describing the lifecycle of an auction or multiple auction across a single page view.",
   "type": "object",
   "required": [
-    "eventTimeMillis",
     "integration",
     "version"
   ],
@@ -21,10 +20,6 @@
     }
   ],
   "properties": {
-    "eventTimeMillis": {
-      "type": "integer",
-      "description": "Unix timestamp of time of creation for this batched event in milliseconds."
-    },
     "integration": {
       "type": "string",
       "description": "Integration type that generated this event.",
@@ -34,6 +29,53 @@
       "type": "string",
       "description": "Version of Prebid.js responsible for the auctions contained within."
     },
+    "fpkvs": {
+      "type": "array",
+      "description": "List of any dynamic key value pairs set by publisher.",
+      "minItems": 1,
+      "items": {
+        "type": "object",
+        "required": [
+          "key",
+          "value"
+        ],
+        "properties": {
+          "key": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "session": {
+      "type": "object",
+      "description": "The session information for a given event",
+      "required": [
+        "id",
+        "start",
+        "expires"
+      ],
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "UUID of session."
+        },
+        "start": {
+          "type": "integer",
+          "description": "Unix timestamp of time of creation for this session in milliseconds."
+        },
+        "expires": {
+          "type": "integer",
+          "description": "Unix timestamp of the maximum allowed time in milliseconds of the session."
+        },
+        "pvid": {
+          "type": "string",
+          "description": "id to track page view."
+        }
+      }
+    },
     "auctions": {
       "type": "array",
       "minItems": 1,
@@ -125,6 +167,9 @@
                 "zoneId": {
                   "type": "number",
                   "description": "The Rubicon zoneId associated with this adUnit - Removed if null"
+                },
+                "gam": {
+                  "$ref": "#/definitions/gam"
                 }
               }
             }
@@ -197,6 +242,31 @@
     }
   },
   "definitions": {
+    "gam": {
+      "type": "object",
+      "description": "The gam information for a given ad unit",
+      "required": [
+        "adSlot"
+      ],
+      "properties": {
+        "adSlot": {
+          "type": "string"
+        },
+        "advertiserId": {
+          "type": "integer"
+        },
+        "creativeId": {
+          "type": "integer"
+        },
+        "LineItemId": {
+          "type": "integer"
+        },
+        "isSlotEmpty": {
+          "type": "boolean",
+          "enum": [true]
+        }
+      }
+    },
     "adserverTargeting": {
       "type": "object",
       "description": "The adserverTargeting key/value pairs",
@@ -293,7 +363,8 @@
             "success",
             "no-bid",
             "error",
-            "rejected"
+            "rejected-gdpr",
+            "rejected-ipf"
           ]
         },
         "error": {
@@ -333,7 +404,6 @@
         "bidResponse": {
           "type": "object",
           "required": [
-            "dimensions",
             "mediaType",
             "bidPriceUSD"
           ],
diff --git a/test/spec/modules/rubiconBidAdapter_spec.js b/test/spec/modules/rubiconBidAdapter_spec.js
index 11ed17df5f8..a290a9bdb0a 100644
--- a/test/spec/modules/rubiconBidAdapter_spec.js
+++ b/test/spec/modules/rubiconBidAdapter_spec.js
@@ -1,10 +1,17 @@
 import {expect} from 'chai';
-import adapterManager from 'src/adapterManager.js';
-import {spec, getPriceGranularity, masSizeOrdering, resetUserSync, hasVideoMediaType, FASTLANE_ENDPOINT} from 'modules/rubiconBidAdapter.js';
+import {
+  spec,
+  getPriceGranularity,
+  masSizeOrdering,
+  resetUserSync,
+  hasVideoMediaType,
+  resetRubiConf
+} 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 'core-js-pure/features/array/find.js';
+import {createEidsArray} from 'modules/userId/eids.js';
 
 const INTEGRATION = `pbjs_lite_v$prebid.version$`; // $prebid.version$ will be substituted in by gulp in built prebid
 const PBS_INTEGRATION = 'pbjs';
@@ -13,7 +20,8 @@ describe('the rubicon adapter', function () {
   let sandbox,
     bidderRequest,
     sizeMap,
-    getFloorResponse;
+    getFloorResponse,
+    logErrorSpy;
 
   /**
    * @typedef {Object} sizeMapConverted
@@ -136,7 +144,7 @@ describe('the rubicon adapter', function () {
       'targeting': [
         {
           'key': getProp('targeting_key', `rpfl_${i}`),
-          'values': [ '43_tier_all_test' ]
+          'values': ['43_tier_all_test']
         }
       ]
     };
@@ -219,12 +227,28 @@ describe('the rubicon adapter', function () {
       'size_id': 201,
     };
     bid.userId = {
-      lipb: {
-        lipbid: '0000-1111-2222-3333',
-        segments: ['segA', 'segB']
-      },
-      idl_env: '1111-2222-3333-4444'
+      lipb: {lipbid: '0000-1111-2222-3333', segments: ['segA', 'segB']},
+      idl_env: '1111-2222-3333-4444',
+      sharedid: {id: '1111', third: '2222'},
+      tdid: '3000',
+      pubcid: '4000',
+      pubProvidedId: [{
+        source: 'example.com',
+        uids: [{
+          id: '333333',
+          ext: {
+            stype: 'ppuid'
+          }
+        }]
+      }, {
+        source: 'id-partner.com',
+        uids: [{
+          id: '4444444'
+        }]
+      }],
+      criteoId: '1111',
     };
+    bid.userIdAsEids = createEidsArray(bid.userId);
     bid.storedAuctionResponse = 11111;
   }
 
@@ -272,6 +296,7 @@ describe('the rubicon adapter', function () {
 
   beforeEach(function () {
     sandbox = sinon.sandbox.create();
+    logErrorSpy = sinon.spy(utils, 'logError');
     getFloorResponse = {};
     bidderRequest = {
       bidderCode: 'rubicon',
@@ -343,6 +368,10 @@ describe('the rubicon adapter', function () {
 
   afterEach(function () {
     sandbox.restore();
+    utils.logError.restore();
+    config.resetConfig();
+    resetRubiConf();
+    delete $$PREBID_GLOBAL$$.installedModules;
   });
 
   describe('MAS mapping / ordering', function () {
@@ -368,7 +397,10 @@ describe('the rubicon adapter', function () {
       describe('to fastlane', function () {
         it('should make a well-formed request object', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let duplicate = Object.assign(bidderRequest);
+          duplicate.bids[0].params.floor = 0.01;
+
+          let [request] = spec.buildRequests(duplicate.bids, duplicate);
           let data = parseQuery(request.data);
 
           expect(request.url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
@@ -412,7 +444,18 @@ describe('the rubicon adapter', function () {
         it('should correctly send hard floors when getFloor function is present and returns valid floor', function () {
           // default getFloor response is empty object so should not break and not send hard_floor
           bidderRequest.bids[0].getFloor = () => getFloorResponse;
+          sinon.spy(bidderRequest.bids[0], 'getFloor');
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // make sure banner bid called with right stuff
+          expect(
+            bidderRequest.bids[0].getFloor.calledWith({
+              currency: 'USD',
+              mediaType: 'banner',
+              size: '*'
+            })
+          ).to.be.true;
+
           let data = parseQuery(request.data);
           expect(data.rp_hard_floor).to.be.undefined;
 
@@ -446,35 +489,41 @@ describe('the rubicon adapter', function () {
           data = parseQuery(request.data);
           expect(data.rp_hard_floor).to.equal('1.23');
         });
-        it('should not send p_pos to AE if not params.position specified', function() {
-	      var noposRequest = utils.deepClone(bidderRequest);
-	      delete noposRequest.bids[0].params.position;
 
-	      let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
-	      let data = parseQuery(request.data);
+        it('should send rp_maxbids to AE if rubicon multibid config exists', function () {
+          var multibidRequest = utils.deepClone(bidderRequest);
+          multibidRequest.bidLimit = 5;
 
-	      expect(data['site_id']).to.equal('70608');
-	      expect(data['p_pos']).to.equal(undefined);
+          let [request] = spec.buildRequests(multibidRequest.bids, multibidRequest);
+          let data = parseQuery(request.data);
+
+          expect(data['rp_maxbids']).to.equal('5');
         });
 
-        it('should not send p_pos to AE if not params.position is invalid', function() {
-	      var badposRequest = utils.deepClone(bidderRequest);
-	      badposRequest.bids[0].params.position = 'bad';
+        it('should not send p_pos to AE if not params.position specified', function () {
+          var noposRequest = utils.deepClone(bidderRequest);
+          delete noposRequest.bids[0].params.position;
 
-	      let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
-	      let data = parseQuery(request.data);
+          let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
+          let data = parseQuery(request.data);
 
-	      expect(data['site_id']).to.equal('70608');
-	      expect(data['p_pos']).to.equal(undefined);
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal(undefined);
+        });
+
+        it('should not send p_pos to AE if not params.position is invalid', function () {
+          var badposRequest = utils.deepClone(bidderRequest);
+          badposRequest.bids[0].params.position = 'bad';
+
+          let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
+          let data = parseQuery(request.data);
+
+          expect(data['site_id']).to.equal('70608');
+          expect(data['p_pos']).to.equal(undefined);
         });
 
         it('should correctly send p_pos in sra fashion', function() {
-          sandbox.stub(config, 'getConfig').callsFake((key) => {
-            const config = {
-              'rubicon.singleRequest': true
-            };
-            return config[key];
-          });
+          config.setConfig({rubicon: {singleRequest: true}});
           // first one is atf
           var sraPosRequest = utils.deepClone(bidderRequest);
 
@@ -504,11 +553,11 @@ describe('the rubicon adapter', function () {
           expect(data['p_pos']).to.equal('atf;;btf;;');
         });
 
-        it('should not send x_source.pchain to AE if params.pchain is not specified', function() {
-	      var noPchainRequest = utils.deepClone(bidderRequest);
-	      delete noPchainRequest.bids[0].params.pchain;
+        it('should not send x_source.pchain to AE if params.pchain is not specified', function () {
+          var noPchainRequest = utils.deepClone(bidderRequest);
+          delete noPchainRequest.bids[0].params.pchain;
 
-	      let [request] = spec.buildRequests(noPchainRequest.bids, noPchainRequest);
+          let [request] = spec.buildRequests(noPchainRequest.bids, noPchainRequest);
           expect(request.data).to.contain('&site_id=70608&');
           expect(request.data).to.not.contain('x_source.pchain');
         });
@@ -517,7 +566,7 @@ describe('the rubicon adapter', function () {
           sandbox.stub(Math, 'random').callsFake(() => 0.1);
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
-          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'x_source.pchain', 'p_screen_res', 'rp_floor', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'slots', 'rand'];
+          const referenceOrdering = ['account_id', 'site_id', 'zone_id', 'size_id', 'alt_size_ids', 'p_pos', 'rf', 'p_geo.latitude', 'p_geo.longitude', 'kw', 'tg_v.ucat', 'tg_v.lastsearch', 'tg_v.likes', 'tg_i.rating', 'tg_i.prodtype', 'tk_flint', 'x_source.tid', 'x_source.pchain', 'p_screen_res', 'rp_secure', 'tk_user_key', 'tg_fl.eid', 'rp_maxbids', 'slots', 'rand'];
 
           request.data.split('&').forEach((item, i) => {
             expect(item.split('=')[0]).to.equal(referenceOrdering[i]);
@@ -532,7 +581,6 @@ describe('the rubicon adapter', function () {
             'size_id': '15',
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': '0.01',
             'rp_secure': /[01]/,
             'rand': '0.1',
             'tk_flint': INTEGRATION,
@@ -609,7 +657,7 @@ describe('the rubicon adapter', function () {
           expect(parseQuery(request.data).rf).to.equal('localhost');
 
           delete bidderRequest.bids[0].params.referrer;
-          let refererInfo = { referer: 'https://www.prebid.org' };
+          let refererInfo = {referer: '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');
@@ -668,233 +716,6 @@ describe('the rubicon adapter', function () {
           expect(data['rp_floor']).to.equal('2');
         });
 
-        it('should send digitrust params', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: true,
-              identity: {
-                privacy: {optout: false},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let expectedQuery = {
-            'dt.id': 'testId',
-            'dt.keyv': 'testKeyV',
-            'dt.pref': '0'
-          };
-
-          // test that all values above are both present and correct
-          Object.keys(expectedQuery).forEach(key => {
-            let value = expectedQuery[key];
-            expect(data[key]).to.equal(value);
-          });
-
-          delete window.DigiTrust;
-        });
-
-        it('should not send digitrust params when DigiTrust not loaded', function () {
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-        });
-
-        it('should not send digitrust params due to optout', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: true,
-              identity: {
-                privacy: {optout: true},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-
-          delete window.DigiTrust;
-        });
-
-        it('should not send digitrust params due to failure', function () {
-          window.DigiTrust = {
-            getUser: function () {
-            }
-          };
-          sandbox.stub(window.DigiTrust, 'getUser').callsFake(() =>
-            ({
-              success: false,
-              identity: {
-                privacy: {optout: false},
-                id: 'testId',
-                keyv: 'testKeyV'
-              }
-            })
-          );
-
-          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          let data = parseQuery(request.data);
-
-          let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-          // Test that none of the DigiTrust keys are part of the query
-          undefinedKeys.forEach(key => {
-            expect(typeof data[key]).to.equal('undefined');
-          });
-
-          delete window.DigiTrust;
-        });
-
-        describe('digiTrustId config', function () {
-          beforeEach(function () {
-            window.DigiTrust = {
-              getUser: sandbox.spy()
-            };
-          });
-
-          afterEach(function () {
-            delete window.DigiTrust;
-          });
-
-          it('should send digiTrustId config params', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: true,
-                  identity: {
-                    privacy: {optout: false},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              };
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let expectedQuery = {
-              'dt.id': 'testId',
-              'dt.keyv': 'testKeyV'
-            };
-
-            // test that all values above are both present and correct
-            Object.keys(expectedQuery).forEach(key => {
-              let value = expectedQuery[key];
-              expect(data[key]).to.equal(value);
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params due to optout', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: true,
-                  identity: {
-                    privacy: {optout: true},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              }
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params due to failure', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {
-                digiTrustId: {
-                  success: false,
-                  identity: {
-                    privacy: {optout: false},
-                    id: 'testId',
-                    keyv: 'testKeyV'
-                  }
-                }
-              }
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should not have called DigiTrust.getUser()
-            expect(window.DigiTrust.getUser.notCalled).to.equal(true);
-          });
-
-          it('should not send digiTrustId config params if they do not exist', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              var config = {};
-              return config[key];
-            });
-
-            let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-            let data = parseQuery(request.data);
-
-            let undefinedKeys = ['dt.id', 'dt.keyv'];
-
-            // Test that none of the DigiTrust keys are part of the query
-            undefinedKeys.forEach(key => {
-              expect(typeof data[key]).to.equal('undefined');
-            });
-
-            // should have called DigiTrust.getUser() once
-            expect(window.DigiTrust.getUser.calledOnce).to.equal(true);
-          });
-        });
-
         describe('GDPR consent config', function () {
           it('should send "gdpr" and "gdpr_consent", when gdprConsent defines consentString and gdprApplies', function () {
             createGdprBidderRequest(true);
@@ -1017,22 +838,55 @@ describe('the rubicon adapter', function () {
             });
           });
 
-          it('should use first party data from getConfig over the bid params, if present', () => {
-            const context = {
-              keywords: ['e', 'f'],
-              rating: '4-star'
+          it('should merge first party data from getConfig with the bid params, if present', () => {
+            const site = {
+              keywords: 'e,f',
+              rating: '4-star',
+              ext: {
+                data: {
+                  page: 'home'
+                }
+              },
+              content: {
+                data: [{
+                  'name': 'www.dataprovider1.com',
+                  'ext': { 'segtax': 1 },
+                  'segment': [
+                    { 'id': '987' }
+                  ]
+                }, {
+                  'name': 'www.dataprovider1.com',
+                  'ext': { 'segtax': 2 },
+                  'segment': [
+                    { 'id': '432' }
+                  ]
+                }]
+              }
             };
             const user = {
-              keywords: ['d'],
+              data: [{
+                'name': 'www.dataprovider1.com',
+                'ext': { 'segtax': 3 },
+                'segment': [
+                  { 'id': '687' },
+                  { 'id': '123' }
+                ]
+              }],
               gender: 'M',
               yob: '1984',
-              geo: { country: 'ca' }
+              geo: {country: 'ca'},
+              keywords: 'd',
+              ext: {
+                data: {
+                  age: 40
+                }
+              }
             };
 
             sandbox.stub(config, 'getConfig').callsFake(key => {
               const config = {
-                fpd: {
-                  context,
+                ortb2: {
+                  site,
                   user
                 }
               };
@@ -1040,14 +894,17 @@ describe('the rubicon adapter', function () {
             });
 
             const expectedQuery = {
-              'kw': 'a,b,c,d,e,f',
+              'kw': 'a,b,c,d',
               'tg_v.ucat': 'new',
               'tg_v.lastsearch': 'iphone',
               'tg_v.likes': 'sports,video games',
               'tg_v.gender': 'M',
+              'tg_v.age': '40',
+              'tg_v.iab': '687,123',
+              'tg_i.iab': '987,432',
               'tg_v.yob': '1984',
-              'tg_v.geo': '{"country":"ca"}',
-              'tg_i.rating': '4-star',
+              'tg_i.rating': '4-star,5-star',
+              'tg_i.page': 'home',
               'tg_i.prodtype': 'tech,mobile',
             };
 
@@ -1067,12 +924,7 @@ describe('the rubicon adapter', function () {
           it('should group all bid requests with the same site id', function () {
             sandbox.stub(Math, 'random').callsFake(() => 0.1);
 
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: true}});
 
             const expectedQuery = {
               'account_id': '14062',
@@ -1081,7 +933,6 @@ describe('the rubicon adapter', function () {
               'size_id': '15',
               'alt_size_ids': '43',
               'p_pos': 'atf',
-              'rp_floor': '0.01',
               'rp_secure': /[01]/,
               'rand': '0.1',
               'tk_flint': INTEGRATION,
@@ -1180,13 +1031,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not send more than 10 bids in a request (split into separate requests with <= 10 bids each)', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
-
+            config.setConfig({rubicon: {singleRequest: true}});
             let serverRequests;
             let data;
 
@@ -1228,12 +1073,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not group bid requests if singleRequest does not equal true', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': false
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: false}});
 
             const bidCopy = utils.deepClone(bidderRequest.bids[0]);
             bidderRequest.bids.push(bidCopy);
@@ -1251,12 +1091,7 @@ describe('the rubicon adapter', function () {
           });
 
           it('should not group video bid requests', function () {
-            sandbox.stub(config, 'getConfig').callsFake((key) => {
-              const config = {
-                'rubicon.singleRequest': true
-              };
-              return config[key];
-            });
+            config.setConfig({rubicon: {singleRequest: true}});
 
             const bidCopy = utils.deepClone(bidderRequest.bids[0]);
             bidderRequest.bids.push(bidCopy);
@@ -1300,33 +1135,39 @@ describe('the rubicon adapter', function () {
           });
         });
 
-        describe('user id config', function() {
-          it('should send tpid_tdid when userId defines tdid', 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 = createEidsArray(clonedBid.userId);
             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 userId defines lipd', 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'
+                  lipbid: '0000-1111-2222-3333',
+                  segments: ['segA', 'segB']
                 }
               };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
               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 userId defines lipd.segments', function () {
+            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: {
@@ -1334,6 +1175,7 @@ describe('the rubicon adapter', function () {
                   segments: ['segD', 'segE']
                 }
               };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
               const unescapedData = unescape(request.data);
 
@@ -1343,49 +1185,257 @@ describe('the rubicon adapter', function () {
           });
 
           describe('LiveRamp support', function () {
-            it('should send tpid_liveramp.com when userId defines idl_env', 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 = createEidsArray(clonedBid.userId);
               let [request] = spec.buildRequests([clonedBid], bidderRequest);
               let data = parseQuery(request.data);
 
-              expect(data['tpid_liveramp.com']).to.equal('1111-2222-3333-4444');
+              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 () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                pubcid: '1111'
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_pubcid.org']).to.equal('1111^1');
+            });
+          });
+
+          describe('Criteo support', function () {
+            it('should send eid_criteo.com when userIdAsEids contains criteo', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                criteoId: '1111'
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_criteo.com']).to.equal('1111^1');
+            });
+          });
+
+          describe('SharedID support', function () {
+            it('should send sharedid when userIdAsEids contains sharedId', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                sharedid: {
+                  id: '1111',
+                  third: '2222'
+                }
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_sharedid.org']).to.equal('1111^1^2222');
+            });
+          });
+
+          describe('pubProvidedId support', function () {
+            it('should send pubProvidedId when userIdAsEids contains pubProvidedId ids', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                pubProvidedId: [{
+                  source: 'example.com',
+                  uids: [{
+                    id: '11111',
+                    ext: {
+                      stype: 'ppuid'
+                    }
+                  }]
+                }, {
+                  source: 'id-partner.com',
+                  uids: [{
+                    id: '222222'
+                  }]
+                }]
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['ppuid']).to.equal('11111');
+            });
+          });
+
+          describe('ID5 support', function () {
+            it('should send ID5 id when userIdAsEids contains ID5', function () {
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                id5id: {
+                  uid: '11111',
+                  ext: {
+                    linkType: '22222'
+                  }
+                }
+              };
+              clonedBid.userIdAsEids = createEidsArray(clonedBid.userId);
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_id5-sync.com']).to.equal('11111^1^22222');
+            });
+          });
+
+          describe('UserID catchall support', 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
+                }]
+              }]
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['eid_catchall']).to.equal('11111^2');
+            });
+          });
+
+          describe('Config user.id support', function () {
+            it('should send ppuid when config defines user.id', function () {
+              config.setConfig({user: {id: '123'}});
+              const clonedBid = utils.deepClone(bidderRequest.bids[0]);
+              clonedBid.userId = {
+                sharedid: {
+                  id: '1111',
+                  third: '2222'
+                }
+              };
+              let [request] = spec.buildRequests([clonedBid], bidderRequest);
+              let data = parseQuery(request.data);
+
+              expect(data['ppuid']).to.equal('123');
+            });
+          });
+        });
 
         describe('Prebid AdSlot', function () {
           beforeEach(function () {
             // enforce that the bid at 0 does not have a 'context' property
-            if (bidderRequest.bids[0].hasOwnProperty('fpd')) {
-              delete bidderRequest.bids[0].fpd;
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
             }
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context\" object is not valid', 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);
 
             expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(data).to.not.have.property('tg_i.pbadslot’');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" is undefined', function () {
-            bidderRequest.bids[0].fpd = {};
+          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);
 
             expect(data).to.be.an('Object');
-            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
+            expect(data).to.not.have.property('tg_i.pbadslot’');
           });
 
-          it('should not send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is an empty string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: ''
+          it('should not send \"tg_i.pbadslot’\" if \"ortb2Imp.ext.data.pbadslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: ''
+                }
+              }
+            };
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.pbadslot');
+          });
+
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: 'abc'
+                }
+              }
+            }
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(request.data);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.have.property('tg_i.pbadslot');
+            expect(data['tg_i.pbadslot']).to.equal('abc');
+          });
+
+          it('should send \"tg_i.pbadslot\" if \"ortb2Imp.ext.data.pbadslot\" value is a valid string, but all leading slash characters should be removed', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  pbadslot: '/a/b/c'
+                }
+              }
+            }
+
+            const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+            const data = parseQuery(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');
+          });
+        });
+
+        describe('GAM ad unit', function () {
+          beforeEach(function () {
+            // enforce that the bid at 0 does not have a 'context' property
+            if (bidderRequest.bids[0].hasOwnProperty('ortb2Imp')) {
+              delete bidderRequest.bids[0].ortb2Imp;
+            }
+          });
+
+          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);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
+          });
+
+          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);
+
+            expect(data).to.be.an('Object');
+            expect(data).to.not.have.property('tg_i.dfp_ad_unit_code’');
+          });
+
+          it('should not send \"tg_i.dfp_ad_unit_code’\" if \"ortb2Imp.ext.data.adServer.adslot\" value is an empty string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: ''
+                  }
+                }
               }
             };
 
@@ -1396,10 +1446,14 @@ describe('the rubicon adapter', function () {
             expect(data).to.not.have.property('tg_i.dfp_ad_unit_code');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is a valid string', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: 'abc'
+          it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: 'abc'
+                  }
+                }
               }
             }
 
@@ -1411,10 +1465,14 @@ describe('the rubicon adapter', function () {
             expect(data['tg_i.dfp_ad_unit_code']).to.equal('abc');
           });
 
-          it('should send \"tg_i.dfp_ad_unit_code\" if \"fpd.context.pbAdSlot\" value is a valid string, but all leading slash characters should be removed', function () {
-            bidderRequest.bids[0].fpd = {
-              context: {
-                pbAdSlot: '/a/b/c'
+          it('should send \"tg_i.dfp_ad_unit_code\" if \"ortb2Imp.ext.data.adServer.adslot\" value is a valid string, but all leading slash characters should be removed', function () {
+            bidderRequest.bids[0].ortb2Imp = {
+              ext: {
+                data: {
+                  adserver: {
+                    adslot: 'a/b/c'
+                  }
+                }
               }
             };
 
@@ -1439,11 +1497,11 @@ describe('the rubicon adapter', function () {
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           let post = request.data;
 
-          expect(post).to.have.property('imp')
+          expect(post).to.have.property('imp');
           // .with.length.of(1);
           let imp = post.imp[0];
           expect(imp.id).to.equal(bidderRequest.bids[0].adUnitCode);
-          expect(imp.exp).to.equal(300);
+          expect(imp.exp).to.equal(undefined); // now undefined
           expect(imp.video.w).to.equal(640);
           expect(imp.video.h).to.equal(480);
           expect(imp.video.pos).to.equal(1);
@@ -1462,20 +1520,47 @@ describe('the rubicon adapter', function () {
           expect(imp.ext.rubicon.video.skip).to.equal(1);
           expect(imp.ext.rubicon.video.skipafter).to.equal(15);
           expect(imp.ext.prebid.auctiontimestamp).to.equal(1472239426000);
+          // should contain version
+          expect(post.ext.prebid.channel).to.deep.equal({name: 'pbjs', version: 'v$prebid.version$'});
           expect(post.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
+          // EIDs should exist
+          expect(post.user.ext).to.have.property('eids').that.is.an('array');
+          // LiveIntent should exist
           expect(post.user.ext.eids[0].source).to.equal('liveintent.com');
           expect(post.user.ext.eids[0].uids[0].id).to.equal('0000-1111-2222-3333');
-          expect(post.user.ext.tpid).that.is.an('object');
-          expect(post.user.ext.tpid.source).to.equal('liveintent.com');
-          expect(post.user.ext.tpid.uid).to.equal('0000-1111-2222-3333');
+          expect(post.user.ext.eids[0].uids[0].atype).to.equal(3);
+          expect(post.user.ext.eids[0]).to.have.property('ext').that.is.an('object');
+          expect(post.user.ext.eids[0].ext).to.have.property('segments').that.is.an('array');
+          expect(post.user.ext.eids[0].ext.segments[0]).to.equal('segA');
+          expect(post.user.ext.eids[0].ext.segments[1]).to.equal('segB');
           // LiveRamp should exist
           expect(post.user.ext.eids[1].source).to.equal('liveramp.com');
           expect(post.user.ext.eids[1].uids[0].id).to.equal('1111-2222-3333-4444');
-          expect(post.rp).that.is.an('object');
-          expect(post.rp.target).that.is.an('object');
-          expect(post.rp.target.LIseg).that.is.an('array');
-          expect(post.rp.target.LIseg[0]).to.equal('segA');
-          expect(post.rp.target.LIseg[1]).to.equal('segB');
+          expect(post.user.ext.eids[1].uids[0].atype).to.equal(3);
+          // SharedId should exist
+          expect(post.user.ext.eids[2].source).to.equal('sharedid.org');
+          expect(post.user.ext.eids[2].uids[0].id).to.equal('1111');
+          expect(post.user.ext.eids[2].uids[0].atype).to.equal(1);
+          expect(post.user.ext.eids[2].uids[0].ext.third).to.equal('2222');
+          // UnifiedId should exist
+          expect(post.user.ext.eids[3].source).to.equal('adserver.org');
+          expect(post.user.ext.eids[3].uids[0].atype).to.equal(1);
+          expect(post.user.ext.eids[3].uids[0].id).to.equal('3000');
+          // PubCommonId should exist
+          expect(post.user.ext.eids[4].source).to.equal('pubcid.org');
+          expect(post.user.ext.eids[4].uids[0].atype).to.equal(1);
+          expect(post.user.ext.eids[4].uids[0].id).to.equal('4000');
+          // example should exist
+          expect(post.user.ext.eids[5].source).to.equal('example.com');
+          expect(post.user.ext.eids[5].uids[0].id).to.equal('333333');
+          // id-partner.com
+          expect(post.user.ext.eids[6].source).to.equal('id-partner.com');
+          expect(post.user.ext.eids[6].uids[0].id).to.equal('4444444');
+          // CriteoId should exist
+          expect(post.user.ext.eids[7].source).to.equal('criteo.com');
+          expect(post.user.ext.eids[7].uids[0].id).to.equal('1111');
+          expect(post.user.ext.eids[7].uids[0].atype).to.equal(1);
+
           expect(post.regs.ext.gdpr).to.equal(1);
           expect(post.regs.ext.us_privacy).to.equal('1NYN');
           expect(post).to.have.property('ext').that.is.an('object');
@@ -1491,12 +1576,23 @@ describe('the rubicon adapter', function () {
           createVideoBidderRequest();
           // default getFloor response is empty object so should not break and not send hard_floor
           bidderRequest.bids[0].getFloor = () => getFloorResponse;
+          sinon.spy(bidderRequest.bids[0], 'getFloor');
+
           sandbox.stub(Date, 'now').callsFake(() =>
             bidderRequest.auctionStart + 100
           );
 
           let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
+          // make sure banner bid called with right stuff
+          expect(
+            bidderRequest.bids[0].getFloor.calledWith({
+              currency: 'USD',
+              mediaType: 'video',
+              size: [640, 480]
+            })
+          ).to.be.true;
+
           // not an object should work and not send
           expect(request.data.imp[0].bidfloor).to.be.undefined;
 
@@ -1520,7 +1616,31 @@ describe('the rubicon adapter', function () {
           [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(request.data.imp[0].bidfloor).to.equal(1.23);
         });
-        it('should add alias name to PBS Request', function() {
+
+        it('should continue with auction and log error if getFloor throws one', function () {
+          createVideoBidderRequest();
+          // default getFloor response is empty object so should not break and not send hard_floor
+          bidderRequest.bids[0].getFloor = () => {
+            throw new Error('An exception!');
+          };
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // log error called
+          expect(logErrorSpy.calledOnce).to.equal(true);
+
+          // should have an imp
+          expect(request.data.imp).to.exist.and.to.be.a('array');
+          expect(request.data.imp).to.have.lengthOf(1);
+
+          // should be NO bidFloor
+          expect(request.data.imp[0].bidfloor).to.be.undefined;
+        });
+
+        it('should add alias name to PBS Request', function () {
           createVideoBidderRequest();
 
           bidderRequest.bidderCode = 'superRubicon';
@@ -1536,7 +1656,93 @@ describe('the rubicon adapter', function () {
           expect(request.data.imp[0].ext).to.not.haveOwnProperty('rubicon');
         });
 
-        it('should send correct bidfloor to PBS', function() {
+        it('should add multibid configuration to PBS Request', function () {
+          createVideoBidderRequest();
+
+          const multibid = [{
+            bidder: 'bidderA',
+            maxBids: 2
+          }, {
+            bidder: 'bidderB',
+            maxBids: 2
+          }];
+          const expected = [{
+            bidder: 'bidderA',
+            maxbids: 2
+          }, {
+            bidder: 'bidderB',
+            maxbids: 2
+          }];
+
+          config.setConfig({multibid: multibid});
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+
+          // should have the aliases object sent to PBS
+          expect(request.data.ext.prebid).to.haveOwnProperty('multibid');
+          expect(request.data.ext.prebid.multibid).to.deep.equal(expected);
+        });
+
+        it('should pass client analytics to PBS endpoint if all modules included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = [];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.not.be.undefined;
+          expect(payload.ext.prebid.analytics).to.deep.equal({'rubicon': {'client-analytics': true}});
+        });
+
+        it('should pass client analytics to PBS endpoint if rubicon analytics adapter is included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = ['rubiconBidAdapter', 'rubiconAnalyticsAdapter'];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.not.be.undefined;
+          expect(payload.ext.prebid.analytics).to.deep.equal({'rubicon': {'client-analytics': true}});
+        });
+
+        it('should not pass client analytics to PBS endpoint if rubicon analytics adapter is not included', function () {
+          createVideoBidderRequest();
+          $$PREBID_GLOBAL$$.installedModules = ['rubiconBidAdapter'];
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let payload = request.data;
+
+          expect(payload.ext.prebid.analytics).to.be.undefined;
+        });
+
+        it('should send video exp param correctly when set', function () {
+          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 () {
+          createVideoBidderRequest();
+          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];
+          // bidderFactory stringifies request body before sending so removes undefined attributes:
+          expect(imp.exp).to.equal(undefined);
+        });
+
+        it('should send tmax as the bidderRequest timeout value', function () {
+          createVideoBidderRequest();
+          bidderRequest.timeout = 3333;
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+          expect(post.tmax).to.equal(3333);
+        });
+
+        it('should send correct bidfloor to PBS', function () {
           createVideoBidderRequest();
 
           bidderRequest.bids[0].params.floor = 0.1;
@@ -1663,16 +1869,6 @@ describe('the rubicon adapter', function () {
           delete bidderRequest.bids[0].mediaTypes.video.protocols;
           expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
 
-          // change maxduration to an string, no good
-          createVideoBidderRequest();
-          bidderRequest.bids[0].mediaTypes.video.maxduration = 'string';
-          expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
-          // delete maxduration, no good
-          createVideoBidderRequest();
-          delete bidderRequest.bids[0].mediaTypes.video.maxduration;
-          expect(spec.isBidRequestValid(bidderRequest.bids[0])).to.equal(false);
-
           // change linearity to an string, no good
           createVideoBidderRequest();
           bidderRequest.bids[0].mediaTypes.video.linearity = 'string';
@@ -1726,14 +1922,14 @@ describe('the rubicon adapter', function () {
           let requests = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
 
           bidderRequest.mediaTypes.video.context = 'instream';
 
           requests = spec.buildRequests(bidderRequest.bids, bidderRequest);
 
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
         });
 
         it('should send request as banner when invalid video bid in multiple mediaType bidRequest', function () {
@@ -1752,7 +1948,7 @@ describe('the rubicon adapter', function () {
 
           let requests = spec.buildRequests(bidRequestCopy.bids, bidRequestCopy);
           expect(requests.length).to.equal(1);
-          expect(requests[0].url).to.equal(FASTLANE_ENDPOINT);
+          expect(requests[0].url).to.equal('https://fastlane.rubiconproject.com/a/api/fastlane.json');
         });
 
         it('should include coppa flag in video bid request', () => {
@@ -1776,39 +1972,58 @@ describe('the rubicon adapter', function () {
         it('should include first party data', () => {
           createVideoBidderRequest();
 
-          const context = {
-            keywords: ['e', 'f'],
-            rating: '4-star'
+          const site = {
+            ext: {
+              data: {
+                page: 'home'
+              }
+            },
+            content: {
+              data: [{foo: 'bar'}]
+            },
+            keywords: 'e,f',
+            rating: '4-star',
+            data: [{foo: 'bar'}]
           };
           const user = {
-            keywords: ['d'],
+            ext: {
+              data: {
+                age: 31
+              }
+            },
+            keywords: 'd',
             gender: 'M',
             yob: '1984',
-            geo: { country: 'ca' }
+            geo: {country: 'ca'},
+            data: [{foo: 'bar'}]
           };
 
           sandbox.stub(config, 'getConfig').callsFake(key => {
             const config = {
-              fpd: {
-                context,
+              ortb2: {
+                site,
                 user
               }
             };
             return utils.deepAccess(config, key);
           });
 
-          const expected = [{
-            bidders: [ 'rubicon' ],
-            config: {
-              fpd: {
-                site: Object.assign({}, bidderRequest.bids[0].params.inventory, context),
-                user: Object.assign({}, bidderRequest.bids[0].params.visitor, user)
-              }
-            }
-          }];
-
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.ext.prebid.bidderconfig).to.deep.equal(expected);
+
+          const expected = {
+            site: Object.assign({}, site, {keywords: bidderRequest.bids[0].params.keywords.join(',')}),
+            user: Object.assign({}, user),
+            siteData: Object.assign({}, site.ext.data, bidderRequest.bids[0].params.inventory),
+            userData: Object.assign({}, user.ext.data, bidderRequest.bids[0].params.visitor),
+          };
+
+          delete request.data.site.page;
+          delete request.data.site.content.language;
+
+          expect(request.data.site.keywords).to.deep.equal('a,b,c');
+          expect(request.data.user.keywords).to.deep.equal('d');
+          expect(request.data.site.ext.data).to.deep.equal(expected.siteData);
+          expect(request.data.user.ext.data).to.deep.equal(expected.userData);
         });
 
         it('should include storedAuctionResponse in video bid request', function () {
@@ -1827,56 +2042,113 @@ describe('the rubicon adapter', function () {
           expect(request.data.imp[0].ext.prebid.storedauctionresponse.id).to.equal('11111');
         });
 
-        it('should include pbAdSlot in bid request', function () {
+        it('should include pbadslot in bid request', function () {
           createVideoBidderRequest();
-          bidderRequest.bids[0].fpd = {
-            context: {
-              pbAdSlot: '1234567890'
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                pbadslot: '1234567890'
+              }
             }
-          };
+          }
 
           sandbox.stub(Date, 'now').callsFake(() =>
             bidderRequest.auctionStart + 100
           );
 
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-          expect(request.data.imp[0].ext.context.data.adslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.pbadslot).to.equal('1234567890');
         });
 
-        it('should use the integration type provided in the config instead of the default', () => {
+        it('should include GAM ad unit in bid request', function () {
           createVideoBidderRequest();
-          sandbox.stub(config, 'getConfig').callsFake(function (key) {
-            const config = {
-              'rubicon.int_type': 'testType'
-            };
-            return config[key];
-          });
+          bidderRequest.bids[0].ortb2Imp = {
+            ext: {
+              data: {
+                adserver: {
+                  adslot: '1234567890',
+                  name: 'adServerName1'
+                }
+              }
+            }
+          };
+
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          expect(request.data.imp[0].ext.data.adserver.adslot).to.equal('1234567890');
+          expect(request.data.imp[0].ext.data.adserver.name).to.equal('adServerName1');
+        });
+
+        it('should use the integration type provided in the config instead of the default', () => {
+          createVideoBidderRequest();
+          config.setConfig({rubicon: {int_type: 'testType'}});
           const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
           expect(request.data.ext.prebid.bidders.rubicon.integration).to.equal('testType');
         });
-      });
 
-      it('should include pbAdSlot in bid request', function () {
-        createVideoBidderRequest();
-        bidderRequest.bids[0].fpd = {
-          context: {
-            pbAdSlot: '1234567890'
-          }
-        };
+        it('should pass the user.id provided in the config', function () {
+          config.setConfig({user: {id: '123'}});
+          createVideoBidderRequest();
+
+          sandbox.stub(Date, 'now').callsFake(() =>
+            bidderRequest.auctionStart + 100
+          );
+
+          let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+          let post = request.data;
+
+          expect(post).to.have.property('imp')
+          // .with.length.of(1);
+          let imp = post.imp[0];
+          expect(imp.id).to.equal(bidderRequest.bids[0].adUnitCode);
+          expect(imp.exp).to.equal(undefined);
+          expect(imp.video.w).to.equal(640);
+          expect(imp.video.h).to.equal(480);
+          expect(imp.video.pos).to.equal(1);
+          expect(imp.video.context).to.equal('instream');
+          expect(imp.video.minduration).to.equal(15);
+          expect(imp.video.maxduration).to.equal(30);
+          expect(imp.video.startdelay).to.equal(0);
+          expect(imp.video.skip).to.equal(1);
+          expect(imp.video.skipafter).to.equal(15);
+          expect(imp.ext.rubicon.video.playerWidth).to.equal(640);
+          expect(imp.ext.rubicon.video.playerHeight).to.equal(480);
+          expect(imp.ext.rubicon.video.size_id).to.equal(201);
+          expect(imp.ext.rubicon.video.language).to.equal('en');
+          // Also want it to be in post.site.content.language
+          expect(post.site.content.language).to.equal('en');
+          expect(imp.ext.rubicon.video.skip).to.equal(1);
+          expect(imp.ext.rubicon.video.skipafter).to.equal(15);
+          expect(imp.ext.prebid.auctiontimestamp).to.equal(1472239426000);
+          expect(post.user.ext.consent).to.equal('BOJ/P2HOJ/P2HABABMAAAAAZ+A==');
 
-        sandbox.stub(Date, 'now').callsFake(() =>
-          bidderRequest.auctionStart + 100
-        );
+          // Config user.id
+          expect(post.user.id).to.equal('123');
 
-        const [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
-        expect(request.data.imp[0].ext.context.data.adslot).to.equal('1234567890');
+          expect(post.regs.ext.gdpr).to.equal(1);
+          expect(post.regs.ext.us_privacy).to.equal('1NYN');
+          expect(post).to.have.property('ext').that.is.an('object');
+          expect(post.ext.prebid.targeting.includewinners).to.equal(true);
+          expect(post.ext.prebid).to.have.property('cache').that.is.an('object');
+          expect(post.ext.prebid.cache).to.have.property('vastxml').that.is.an('object');
+          expect(post.ext.prebid.cache.vastxml).to.have.property('returnCreative').that.is.an('boolean');
+          expect(post.ext.prebid.cache.vastxml.returnCreative).to.equal(false);
+          expect(post.ext.prebid.bidders.rubicon.integration).to.equal(PBS_INTEGRATION);
+        })
       });
 
       describe('combineSlotUrlParams', function () {
         it('should combine an array of slot url params', function () {
           expect(spec.combineSlotUrlParams([])).to.deep.equal({});
 
-          expect(spec.combineSlotUrlParams([{p1: 'foo', p2: 'test', p3: ''}])).to.deep.equal({p1: 'foo', p2: 'test', p3: ''});
+          expect(spec.combineSlotUrlParams([{p1: 'foo', p2: 'test', p3: ''}])).to.deep.equal({
+            p1: 'foo',
+            p2: 'test',
+            p3: ''
+          });
 
           expect(spec.combineSlotUrlParams([{}, {p1: 'foo', p2: 'test'}])).to.deep.equal({p1: ';foo', p2: ';test'});
 
@@ -1907,7 +2179,6 @@ describe('the rubicon adapter', function () {
             'size_id': 15,
             'alt_size_ids': '43',
             'p_pos': 'atf',
-            'rp_floor': 0.01,
             'rp_secure': /[01]/,
             'tk_flint': INTEGRATION,
             'x_source.tid': 'd45dd707-a418-42ec-b8a7-b70a6c6fab0b',
@@ -1939,7 +2210,7 @@ describe('the rubicon adapter', function () {
         it('should not fail if keywords param is not an array', function () {
           bidderRequest.bids[0].params.keywords = 'a,b,c';
           const slotParams = spec.createSlotParams(bidderRequest.bids[0], bidderRequest);
-          expect(slotParams.kw).to.equal('');
+          expect(slotParams.kw).to.equal('a,b,c');
         });
       });
 
@@ -2018,6 +2289,7 @@ describe('the rubicon adapter', function () {
                 'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
                 'size_id': '15',
                 'ad_id': '6',
+                'adomain': ['test.com'],
                 'advertiser': 7,
                 'network': 8,
                 'creative_id': 'crid-9',
@@ -2039,6 +2311,7 @@ describe('the rubicon adapter', function () {
                 'impression_id': '153dc240-8229-4604-b8f5-256933b9374d',
                 'size_id': '43',
                 'ad_id': '7',
+                'adomain': ['test.com'],
                 'advertiser': 7,
                 'network': 8,
                 'creative_id': 'crid-9',
@@ -2073,6 +2346,8 @@ describe('the rubicon adapter', function () {
           expect(bids[0].rubicon.networkId).to.equal(8);
           expect(bids[0].creativeId).to.equal('crid-9');
           expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].meta.mediaType).to.equal('banner');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
           expect(bids[0].ad).to.contain(`alert('foo')`)
             .and.to.contain(``)
             .and.to.contain(`
`);
@@ -2357,6 +2632,146 @@ describe('the rubicon adapter', function () {
           expect(bids[0].cpm).to.be.equal(0);
         });
 
+        it('should create bids with matching requestIds if imp id matches', function () {
+          let bidRequests = [{
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 12345,
+              'zoneId': 67890,
+              'floor': null
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [[300, 250]]
+              }
+            },
+            'adUnitCode': 'div-gpt-ad-1460505748561-0',
+            'transactionId': '404a7b28-f276-41cc-a5cf-c1d3dc5671f9',
+            'sizes': [[300, 250]],
+            'bidId': '557ba307cef098',
+            'bidderRequestId': '46a00704ffeb7',
+            'auctionId': '3fdc6494-da94-44a0-a292-b55a90b08b2c',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0,
+            'startTime': 1615412098213
+          }, {
+            'bidder': 'rubicon',
+            'params': {
+              'accountId': 1001,
+              'siteId': 12345,
+              'zoneId': 67890,
+              'floor': null
+            },
+            'mediaTypes': {
+              'banner': {
+                'sizes': [[300, 250]]
+              }
+            },
+            'adUnitCode': 'div-gpt-ad-1460505748561-1',
+            'transactionId': '404a7b28-f276-41cc-a5cf-c1d3dc5671f9',
+            'sizes': [[300, 250]],
+            'bidId': '456gt123jkl098',
+            'bidderRequestId': '46a00704ffeb7',
+            'auctionId': '3fdc6494-da94-44a0-a292-b55a90b08b2c',
+            'src': 'client',
+            'bidRequestsCount': 1,
+            'bidderRequestsCount': 1,
+            'bidderWinsCount': 0,
+            'startTime': 1615412098213
+          }];
+
+          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,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '15_tier_all_test'
+                    ]
+                  }
+                ]
+              },
+              {
+                'status': 'ok',
+                'impression_id': '153dc240-8229-4604-b8f5-256933b9374c',
+                'size_id': '15',
+                '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'
+                    ]
+                  }
+                ]
+              },
+              {
+                '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': 1.911,
+                'targeting': [
+                  {
+                    'key': 'rpfl_14062',
+                    'values': [
+                      '43_tier_all_test'
+                    ]
+                  }
+                ]
+              }
+            ]
+          };
+
+          config.setConfig({ multibid: [{bidder: 'rubicon', maxbids: 2, targetbiddercodeprefix: 'rubi'}] });
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidRequests
+          });
+
+          expect(bids).to.be.lengthOf(3);
+          expect(bids[0].requestId).to.not.equal(bids[1].requestId);
+          expect(bids[1].requestId).to.equal(bids[2].requestId);
+        });
+
         it('should handle an error with no ads returned', function () {
           let response = {
             'status': 'ok',
@@ -2432,7 +2847,7 @@ describe('the rubicon adapter', function () {
             }]
           };
 
-          let bids = spec.interpretResponse({ body: response }, {
+          let bids = spec.interpretResponse({body: response}, {
             bidRequest: [utils.deepClone(bidderRequest.bids[0])]
           });
 
@@ -2443,7 +2858,7 @@ describe('the rubicon adapter', function () {
         describe('singleRequest enabled', function () {
           it('handles bidRequest of type Array and returns associated adUnits', function () {
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
+            overrideMap[0] = {impression_id: '1'};
 
             const stubAds = [];
             for (let i = 0; i < 10; i++) {
@@ -2465,7 +2880,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
             expect(bids).to.be.a('array').with.lengthOf(10);
 
             bids.forEach((bid) => {
@@ -2498,7 +2914,7 @@ describe('the rubicon adapter', function () {
 
           it('handles incorrect adUnits length by returning all bids with matching ads', function () {
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
+            overrideMap[0] = {impression_id: '1'};
 
             const stubAds = [];
             for (let i = 0; i < 6; i++) {
@@ -2520,7 +2936,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
 
             // no bids expected because response didn't match requested bid number
             expect(bids).to.be.a('array').with.lengthOf(6);
@@ -2531,11 +2948,11 @@ describe('the rubicon adapter', function () {
             // Create overrides to break associations between bids and ads
             // Each override should cause one less bid to be returned by interpretResponse
             const overrideMap = [];
-            overrideMap[0] = { impression_id: '1' };
-            overrideMap[2] = { status: 'error' };
-            overrideMap[4] = { status: 'error' };
-            overrideMap[7] = { status: 'error' };
-            overrideMap[8] = { status: 'error' };
+            overrideMap[0] = {impression_id: '1'};
+            overrideMap[2] = {status: 'error'};
+            overrideMap[4] = {status: 'error'};
+            overrideMap[7] = {status: 'error'};
+            overrideMap[8] = {status: 'error'};
 
             for (let i = 0; i < 10; i++) {
               stubAds.push(createResponseAdByIndex(i, sizeMap[i].sizeId, overrideMap));
@@ -2556,7 +2973,8 @@ describe('the rubicon adapter', function () {
                 'tracking': '',
                 'inventory': {},
                 'ads': stubAds
-              }}, { bidRequest: stubBids });
+              }
+            }, {bidRequest: stubBids});
             expect(bids).to.be.a('array').with.lengthOf(6);
 
             bids.forEach((bid) => {
@@ -2603,13 +3021,15 @@ describe('the rubicon adapter', function () {
               bid: [{
                 id: '0',
                 impid: 'instream_video1',
+                adomain: ['test.com'],
                 price: 2,
                 crid: '4259970',
                 ext: {
                   bidder: {
                     rp: {
                       mime: 'application/javascript',
-                      size_id: 201
+                      size_id: 201,
+                      advid: 12345
                     }
                   },
                   prebid: {
@@ -2638,6 +3058,9 @@ describe('the rubicon adapter', function () {
           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');
+          expect(bids[0].meta.mediaType).to.equal('video');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
+          expect(bids[0].meta.advertiserId).to.equal(12345);
           expect(bids[0].bidderCode).to.equal('rubicon');
           expect(bids[0].currency).to.equal('USD');
           expect(bids[0].width).to.equal(640);
@@ -2645,14 +3068,156 @@ describe('the rubicon adapter', function () {
         });
       });
 
+      describe('for outstream video', function () {
+        const sandbox = sinon.createSandbox();
+        beforeEach(function () {
+          createVideoBidderRequestOutstream();
+          config.setConfig({rubicon: {
+            rendererConfig: {
+              align: 'left',
+              closeButton: true
+            },
+            rendererUrl: 'https://example.test/renderer.js'
+          }});
+          window.MagniteApex = {
+            renderAd: function() {
+              return null;
+            }
+          }
+        });
+
+        afterEach(function () {
+          sandbox.restore();
+          delete window.MagniteApex;
+        });
+
+        it('should register a successful bid', function () {
+          let response = {
+            cur: 'USD',
+            seatbid: [{
+              bid: [{
+                id: '0',
+                impid: 'outstream_video1',
+                adomain: ['test.com'],
+                price: 2,
+                crid: '4259970',
+                ext: {
+                  bidder: {
+                    rp: {
+                      mime: 'application/javascript',
+                      size_id: 201,
+                      advid: 12345
+                    }
+                  },
+                  prebid: {
+                    targeting: {
+                      hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'
+                    },
+                    type: 'video'
+                  }
+                }
+              }],
+              group: 0,
+              seat: 'rubicon'
+            }],
+          };
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+
+          expect(bids).to.be.lengthOf(1);
+
+          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].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');
+          expect(bids[0].meta.mediaType).to.equal('video');
+          expect(String(bids[0].meta.advertiserDomains)).to.equal('test.com');
+          expect(bids[0].meta.advertiserId).to.equal(12345);
+          expect(bids[0].bidderCode).to.equal('rubicon');
+          expect(bids[0].currency).to.equal('USD');
+          expect(bids[0].width).to.equal(640);
+          expect(bids[0].height).to.equal(320);
+          // check custom renderer
+          expect(typeof bids[0].renderer).to.equal('object');
+          expect(bids[0].renderer.getConfig()).to.deep.equal({
+            align: 'left',
+            closeButton: true
+          });
+          expect(bids[0].renderer.url).to.equal('https://example.test/renderer.js');
+        });
+
+        it('should render ad with Magnite renderer', function () {
+          let response = {
+            cur: 'USD',
+            seatbid: [{
+              bid: [{
+                id: '0',
+                impid: 'outstream_video1',
+                adomain: ['test.com'],
+                price: 2,
+                crid: '4259970',
+                ext: {
+                  bidder: {
+                    rp: {
+                      mime: 'application/javascript',
+                      size_id: 201,
+                      advid: 12345
+                    }
+                  },
+                  prebid: {
+                    targeting: {
+                      hb_uuid: '0c498f63-5111-4bed-98e2-9be7cb932a64'
+                    },
+                    type: 'video'
+                  }
+                },
+                nurl: 'https://test.com/vast.xml'
+              }],
+              group: 0,
+              seat: 'rubicon'
+            }],
+          };
+
+          sinon.spy(window.MagniteApex, 'renderAd');
+
+          let bids = spec.interpretResponse({body: response}, {
+            bidRequest: bidderRequest.bids[0]
+          });
+          const bid = bids[0];
+          bid.adUnitCode = 'outstream_video1_placement';
+          const adUnit = document.createElement('div');
+          adUnit.id = bid.adUnitCode;
+          document.body.appendChild(adUnit);
+
+          bid.renderer.render(bid);
+
+          const renderCall = window.MagniteApex.renderAd.getCall(0);
+          expect(renderCall.args[0]).to.deep.equal({
+            closeButton: true,
+            collapse: true,
+            height: 320,
+            label: undefined,
+            placement: {
+              align: 'left',
+              attachTo: '#outstream_video1_placement',
+              position: 'append',
+            },
+            vastUrl: 'https://test.com/vast.xml',
+            width: 640
+          });
+          // cleanup
+          adUnit.parentNode.removeChild(adUnit);
+        });
+      });
+
       describe('config with integration type', () => {
         it('should use the integration type provided in the config instead of the default', () => {
-          sandbox.stub(config, 'getConfig').callsFake(function (key) {
-            const config = {
-              'rubicon.int_type': 'testType'
-            };
-            return config[key];
-          });
+          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$');
         });
@@ -2687,7 +3252,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr params if consent is true', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         gdprApplies: true, consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr=1&gdpr_consent=foo`
@@ -2695,7 +3260,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr params if consent is false', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         gdprApplies: false, consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr=0&gdpr_consent=foo`
@@ -2703,7 +3268,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass gdpr param gdpr_consent only when gdprApplies is undefined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 'foo'
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr_consent=foo`
@@ -2711,13 +3276,13 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is not defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {})).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {})).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
       });
     });
 
     it('should pass no params if gdpr consentString is a number', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 0
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2725,7 +3290,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is null', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: null
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2733,7 +3298,7 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr consentString is a object', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: {}
       })).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
@@ -2741,19 +3306,19 @@ describe('the rubicon adapter', function () {
     });
 
     it('should pass no params if gdpr is not defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined)).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, undefined)).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}`
       });
     });
 
     it('should pass us_privacy if uspConsent is defined', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, undefined, '1NYN')).to.deep.equal({
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, undefined, '1NYN')).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?us_privacy=1NYN`
       });
     });
 
     it('should pass us_privacy after gdpr if both are present', function () {
-      expect(spec.getUserSyncs({ iframeEnabled: true }, {}, {
+      expect(spec.getUserSyncs({iframeEnabled: true}, {}, {
         consentString: 'foo'
       }, '1NYN')).to.deep.equal({
         type: 'iframe', url: `${emilyUrl}?gdpr_consent=foo&us_privacy=1NYN`
@@ -2761,8 +3326,8 @@ describe('the rubicon adapter', function () {
     });
   });
 
-  describe('get price granularity', function() {
-    it('should return correct buckets for all price granularity values', function() {
+  describe('get price granularity', function () {
+    it('should return correct buckets for all price granularity values', function () {
       const CUSTOM_PRICE_BUCKET_ITEM = {max: 5, increment: 0.5};
 
       const mockConfig = {
@@ -2795,7 +3360,7 @@ describe('the rubicon adapter', function () {
     });
   });
 
-  describe('Supply Chain Support', function() {
+  describe('Supply Chain Support', function () {
     const nodePropsOrder = ['asi', 'sid', 'hp', 'rid', 'name', 'domain'];
     let bidRequests;
     let schainConfig;
@@ -2888,4 +3453,51 @@ describe('the rubicon adapter', function () {
       expect(request[0].data.source.ext.schain).to.deep.equal(schain);
     });
   });
+
+  describe('configurable settings', function() {
+    afterEach(() => {
+      config.setConfig({
+        rubicon: {
+          bannerHost: 'rubicon',
+          videoHost: 'prebid-server',
+          syncHost: 'eus',
+          returnVast: false
+        }
+      });
+      config.resetConfig();
+    });
+
+    beforeEach(function () {
+      resetUserSync();
+    });
+
+    it('should update fastlane endpoint if', function () {
+      config.setConfig({
+        rubicon: {
+          bannerHost: 'fastlane-qa',
+          videoHost: 'prebid-server-qa',
+          syncHost: 'eus-qa',
+          returnVast: true
+        }
+      });
+
+      // banner
+      let [bannerRequest] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      expect(bannerRequest.url).to.equal('https://fastlane-qa.rubiconproject.com/a/api/fastlane.json');
+
+      // video and returnVast
+      createVideoBidderRequest();
+      let [videoRequest] = spec.buildRequests(bidderRequest.bids, bidderRequest);
+      let post = videoRequest.data;
+      expect(videoRequest.url).to.equal('https://prebid-server-qa.rubiconproject.com/openrtb2/auction');
+      expect(post.ext.prebid.cache.vastxml).to.have.property('returnCreative').that.is.an('boolean');
+      expect(post.ext.prebid.cache.vastxml.returnCreative).to.equal(true);
+
+      // user sync
+      let syncs = spec.getUserSyncs({
+        iframeEnabled: true
+      });
+      expect(syncs).to.deep.equal({type: 'iframe', url: 'https://eus-qa.rubiconproject.com/usync.html'});
+    });
+  });
 });
diff --git a/test/spec/modules/s2sTesting_spec.js b/test/spec/modules/s2sTesting_spec.js
index 5c7f3004dee..273f6747e52 100644
--- a/test/spec/modules/s2sTesting_spec.js
+++ b/test/spec/modules/s2sTesting_spec.js
@@ -1,5 +1,4 @@
 import s2sTesting from 'modules/s2sTesting.js';
-import { config } from 'src/config.js';
 
 var expect = require('chai').expect;
 
@@ -78,26 +77,16 @@ describe('s2sTesting', function () {
       beforeEach(function () {
         // set random number for testing
         s2sTesting.globalRand = 0.7;
-      });
-
-      it('does not work if testing is "false"', function () {
-        config.setConfig({s2sConfig: {
-          bidders: ['rubicon'],
-          testing: false,
-          bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
-        expect(s2sTesting.getSourceBidderMap()).to.eql({
-          server: [],
-          client: []
-        });
+        s2sTesting.bidSource = {};
       });
 
       it('sets one client bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 1, client: 1}}}
-        }});
+        };
+
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: [],
           client: ['rubicon']
@@ -105,11 +94,11 @@ describe('s2sTesting', function () {
       });
 
       it('sets one server bidder', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true,
           bidderControl: {rubicon: {bidSource: {server: 4, client: 1}}}
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -117,10 +106,10 @@ describe('s2sTesting', function () {
       });
 
       it('defaults to server', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon'],
-          testing: true
-        }});
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon'],
           client: []
@@ -128,13 +117,14 @@ describe('s2sTesting', function () {
       });
 
       it('sets two bidders', function () {
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 3, client: 1}},
             appnexus: {bidSource: {server: 1, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap();
         expect(serverClientBidders.server).to.eql(['rubicon']);
         expect(serverClientBidders.client).to.have.members(['appnexus']);
@@ -143,33 +133,37 @@ describe('s2sTesting', function () {
       it('sends both bidders to same source when weights are the same', function () {
         s2sTesting.globalRand = 0.01;
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 1, client: 99}},
             appnexus: {bidSource: {server: 1, client: 99}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
+        s2sTesting.calculateBidSources(s2sConfig);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           client: ['rubicon', 'appnexus'],
           server: []
         });
 
-        config.setConfig({s2sConfig: {
+        const s2sConfig2 = {
           bidders: ['rubicon', 'appnexus'],
-          testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 99, client: 1}},
             appnexus: {bidSource: {server: 99, client: 1}}
-          }}});
+          }
+        }
+        s2sTesting.calculateBidSources(s2sConfig2);
         expect(s2sTesting.getSourceBidderMap()).to.eql({
           server: ['rubicon', 'appnexus'],
           client: []
@@ -186,11 +180,12 @@ describe('s2sTesting', function () {
     });
 
     describe('setting source through adUnits', function () {
+      const s2sConfig3 = {testing: true};
+
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
+        s2sTesting.bidSource = {};
       });
 
       it('sets one bidder source from one adUnit', function () {
@@ -199,7 +194,8 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 4, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: ['rubicon'],
           client: []
         });
@@ -212,7 +208,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {server: 1, client: 1}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -227,7 +223,7 @@ describe('s2sTesting', function () {
             {bidder: 'rubicon', bidSource: {}}
           ]}
         ];
-        expect(s2sTesting.getSourceBidderMap(adUnits)).to.eql({
+        expect(s2sTesting.getSourceBidderMap(adUnits, [])).to.eql({
           server: [],
           client: ['rubicon']
         });
@@ -243,7 +239,7 @@ describe('s2sTesting', function () {
             {bidder: 'appnexus', bidSource: {server: 3, client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.eql(['appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon']);
         // should have saved the source on the bid
@@ -264,7 +260,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
         expect(serverClientBidders.server).to.have.members(['rubicon']);
         expect(serverClientBidders.server).to.not.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus', 'bidder3']);
@@ -287,7 +283,7 @@ describe('s2sTesting', function () {
             {bidder: 'bidder3', calcSource: 'server', bidSource: {client: 1}}
           ]}
         ];
-        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
+        var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits, []);
 
         expect(serverClientBidders.server).to.have.members(['appnexus', 'bidder3']);
         expect(serverClientBidders.server).to.not.have.members(['rubicon']);
@@ -305,8 +301,6 @@ describe('s2sTesting', function () {
 
     describe('setting source through s2sconfig and adUnits', function () {
       beforeEach(function () {
-        // reset s2sconfig bid sources
-        config.setConfig({s2sConfig: {testing: true}});
         // set random number for testing
         s2sTesting.globalRand = 0.7;
       });
@@ -321,15 +315,15 @@ describe('s2sTesting', function () {
         ];
 
         // set rubicon: client and appnexus: server
-        config.setConfig({s2sConfig: {
+        const s2sConfig = {
           bidders: ['rubicon', 'appnexus'],
           testing: true,
           bidderControl: {
             rubicon: {bidSource: {server: 2, client: 1}},
             appnexus: {bidSource: {server: 1}}
           }
-        }});
-
+        }
+        s2sTesting.calculateBidSources(s2sConfig);
         var serverClientBidders = s2sTesting.getSourceBidderMap(adUnits);
         expect(serverClientBidders.server).to.have.members(['rubicon', 'appnexus']);
         expect(serverClientBidders.client).to.have.members(['rubicon', 'appnexus']);
diff --git a/test/spec/modules/saambaaBidAdapter_spec.js b/test/spec/modules/saambaaBidAdapter_spec.js
new file mode 100755
index 00000000000..80a85ae895d
--- /dev/null
+++ b/test/spec/modules/saambaaBidAdapter_spec.js
@@ -0,0 +1,139 @@
+import { expect } from 'chai';
+import { spec } from 'modules/saambaaBidAdapter.js';
+import { BANNER, VIDEO } from 'src/mediaTypes.js';
+
+describe('saambaaBidAdapter', function () {
+  let bidRequests;
+  let bidRequestsVid;
+
+  beforeEach(function () {
+    bidRequests = [{'bidder': 'saambaa', 'params': {'pubid': '121ab139faf7ac67428a23f1d0a9a71b', 'floor': 0.5, 'placement': 1234, size: '320x250'}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'banner': {'sizes': [[300, 250]]}}, 'adUnitCode': 'div-gpt-ad-1460505748561-0', 'transactionId': 'f72931e6-2b0e-4e37-a2bc-1ea912141f81', 'sizes': [[300, 250]], 'bidId': '2aa73f571eaf29', 'bidderRequestId': '1bac84515a7af3', 'auctionId': '5dbc60fa-1aa1-41ce-9092-e6bbd4d478f7', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
+
+    bidRequestsVid = [{'bidder': 'saambaa', 'params': {'pubid': '121ab139faf7ac67428a23f1d0a9a71b', 'floor': 1.0, 'placement': 1234, size: '320x480', 'video': {'id': 123, 'skip': 1, 'mimes': ['video/mp4', 'application/javascript'], 'playbackmethod': [2, 6], 'maxduration': 30}}, 'crumbs': {'pubcid': '979fde13-c71e-4ac2-98b7-28c90f99b449'}, 'mediaTypes': {'video': {'playerSize': [[320, 480]], 'context': 'instream'}}, 'adUnitCode': 'video1', 'transactionId': '8b060952-93f7-4863-af44-bb8796b97c42', 'sizes': [], 'bidId': '25c6ab92aa0e81', 'bidderRequestId': '1d420b73a013fc', 'auctionId': '9a69741c-34fb-474c-83e1-cfa003aaee17', 'src': 'client', 'bidRequestsCount': 1, 'pageurl': 'http://google.com'}];
+  });
+
+  describe('spec.isBidRequestValid', function () {
+    it('should return true when the required params are passed for banner', function () {
+      const bidRequest = bidRequests[0];
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(true);
+    });
+
+    it('should return true when the required params are passed for video', function () {
+      const bidRequests = bidRequestsVid[0];
+      expect(spec.isBidRequestValid(bidRequests)).to.equal(true);
+    });
+
+    it('should return false when no pub id params are passed', function () {
+      const bidRequest = bidRequests[0];
+      bidRequest.params.pubid = '';
+      expect(spec.isBidRequestValid(bidRequest)).to.equal(false);
+    });
+
+    it('should return false when no placement params are passed', function () {
+      const bidRequest = bidRequests[0];
+      bidRequest.params.placement = '';
+      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 () {
+    it('should create a POST request for each bid', function () {
+      const bidRequest = bidRequests[0];
+      const requests = spec.buildRequests([ bidRequest ]);
+      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 ]);
+      expect(requests[0].method).to.equal('POST');
+    });
+
+    it('should have domain in request', function () {
+      const bidRequest = bidRequests[0];
+      const requests = spec.buildRequests([ bidRequest ]);
+      expect(requests[0].data.site.domain).length !== 0;
+    });
+  });
+
+  describe('spec.interpretResponse', function () {
+    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 });
+
+        if (typeof bidResponse !== 'undefined') {
+          expect(bidResponse.length).to.equal(0);
+        } else {
+          expect(true).to.equal(true);
+        }
+      });
+
+      it('should return no bids if the response is empty', function () {
+        const bidRequest = bidRequests[0];
+        bidRequest.mediaTypes = { banner: {} };
+        const bidResponse = spec.interpretResponse({ body: [] }, { bidRequest });
+        if (typeof bidResponse !== 'undefined') {
+          expect(bidResponse.length).to.equal(0);
+        } else { expect(true).to.equal(true); }
+      });
+
+      it('should return valid video bid responses', function () {
+        let _mediaTypes = VIDEO;
+        const saambaabidreqVid = {'bidRequest': {'mediaTypes': {'video': {'w': 320, 'h': 480}}}};
+        const serverResponseVid = {'cur': 'USD', 'id': '25c6ab92aa0e81', 'seatbid': [{'seat': '3', 'bid': [{'crid': '1855', 'h': 480, 'protocol': 2, 'nurl': 'http://nep.advangelists.com/xp/evt?pp=1MO1wiaMhhq7wLRzZZwwwPkJxxKpYEnM5k5MH4qSGm1HR8rp3Nl7vDocvzZzSAvE4pnREL9mQ1kf5PDjk6E8em6DOk7vVrYUH1TYQyqCucd58PFpJNN7h30RXKHHFg3XaLuQ3PKfMuI1qZATBJ6WHcu875y0hqRdiewn0J4JsCYF53M27uwmcV0HnQxARQZZ72mPqrW95U6wgkZljziwKrICM3aBV07TU6YK5R5AyzJRuD6mtrQ2xtHlQ3jXVYKE5bvWFiUQd90t0jOGhPtYBNoOfP7uQ4ZZj4pyucxbr96orHe9PSOn9UpCSWArdx7s8lOfDpwOvbMuyGxynbStDWm38sDgd4bMHnIt762m5VMDNJfiUyX0vWzp05OsufJDVEaWhAM62i40lQZo7mWP4ipoOWLkmlaAzFIMsTcNaHAHiKKqGEOZLkCEhFNM0SLcvgN2HFRULOOIZvusq7TydOKxuXgCS91dLUDxDDDFUK83BFKlMkTxnCzkLbIR1bd9GKcr1TRryOrulyvRWAKAIhEsUzsc5QWFUhmI2dZ1eqnBQJ0c89TaPcnoaP2WipF68UgyiOstf2CBy0M34858tC5PmuQwQYwXscg6zyqDwR0i9MzGH4FkTyU5yeOlPcsA0ht6UcoCdFpHpumDrLUwAaxwGk1Nj8S6YlYYT5wNuTifDGbg22QKXzZBkUARiyVvgPn9nRtXnrd7WmiMYq596rya9RQj7LC0auQW8bHVQLEe49shsZDnAwZTWr4QuYKqgRGZcXteG7RVJe0ryBZezOq11ha9C0Lv0siNVBahOXE35Wzoq4c4BDaGpqvhaKN7pjeWLGlQR04ufWekwxiMWAvjmfgAfexBJ7HfbYNZpq__', 'adid': '61_1855', 'adomain': ['chevrolet.com'], 'price': 2, 'w': 320, 'iurl': 'https://daf37cpxaja7f.cloudfront.net/c61/creative_url_14922301369663_1.png', 'cat': ['IAB2'], 'id': '7f570b40-aca1-4806-8ea8-818ea679c82b_0', 'attr': [], 'impid': '0', 'cid': '61'}]}], 'bidid': '7f570b40-aca1-4806-8ea8-818ea679c82b'}
+        const bidResponseVid = spec.interpretResponse({ body: serverResponseVid }, saambaabidreqVid);
+        delete bidResponseVid['vastUrl'];
+        delete bidResponseVid['ad'];
+        expect(bidResponseVid).to.deep.equal({
+          requestId: bidRequestsVid[0].bidId,
+          bidderCode: 'saambaa',
+          creativeId: serverResponseVid.seatbid[0].bid[0].crid,
+          cpm: serverResponseVid.seatbid[0].bid[0].price,
+          width: serverResponseVid.seatbid[0].bid[0].w,
+          height: serverResponseVid.seatbid[0].bid[0].h,
+          mediaType: 'video',
+          meta: { advertiserDomains: serverResponseVid.seatbid[0].bid[0].adomain },
+          currency: 'USD',
+          netRevenue: true,
+          ttl: 60
+        });
+      });
+
+      it('should return valid banner bid responses', function () {
+        const saambaabidreq = {bids: {}};
+        bidRequests.forEach(bid => {
+          let _mediaTypes = (bid.mediaTypes && bid.mediaTypes.video ? VIDEO : BANNER);
+          saambaabidreq.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': '2aa73f571eaf29', '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 }, saambaabidreq);
+        expect(bidResponse).to.deep.equal({
+          requestId: bidRequests[0].bidId,
+          ad: serverResponse.seatbid[0].bid[0].adm,
+          bidderCode: 'saambaa',
+          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,
+          mediaType: 'banner',
+          meta: { advertiserDomains: serverResponse.seatbid[0].bid[0].adomain },
+          currency: 'USD',
+          netRevenue: true,
+          ttl: 60
+        });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/seedingAllianceAdapter_spec.js b/test/spec/modules/seedingAllianceAdapter_spec.js
index e6f96c92fd9..81af9546ff0 100755
--- a/test/spec/modules/seedingAllianceAdapter_spec.js
+++ b/test/spec/modules/seedingAllianceAdapter_spec.js
@@ -38,7 +38,7 @@ describe('SeedingAlliance adapter', function () {
     });
 
     it('should have default request structure', function () {
-      let keys = 'site,device,cur,imp,user'.split(',');
+      let keys = 'site,device,cur,imp,user,regs'.split(',');
       let validBidRequests = [{
         bidId: 'bidId',
         params: {}
diff --git a/test/spec/modules/seedtagBidAdapter_spec.js b/test/spec/modules/seedtagBidAdapter_spec.js
index 5c8c58196f7..95fba601ecb 100644
--- a/test/spec/modules/seedtagBidAdapter_spec.js
+++ b/test/spec/modules/seedtagBidAdapter_spec.js
@@ -1,5 +1,9 @@
 import { expect } from 'chai'
 import { spec, getTimeoutUrl } from 'modules/seedtagBidAdapter.js'
+import * as utils from 'src/utils.js'
+
+const PUBLISHER_ID = '0000-0000-01'
+const ADUNIT_ID = '000000'
 
 function getSlotConfigs(mediaTypes, params) {
   return {
@@ -16,10 +20,16 @@ function getSlotConfigs(mediaTypes, params) {
   }
 }
 
+function createVideoSlotConfig(mediaType) {
+  return getSlotConfigs(mediaType, {
+    publisherId: PUBLISHER_ID,
+    adUnitId: ADUNIT_ID,
+    placement: 'video'
+  })
+}
+
 describe('Seedtag Adapter', function() {
   describe('isBidRequestValid method', function() {
-    const PUBLISHER_ID = '0000-0000-01'
-    const ADUNIT_ID = '000000'
     describe('returns true', function() {
       describe('when banner slot config has all mandatory params', () => {
         describe('and placement has the correct value', function() {
@@ -33,7 +43,7 @@ describe('Seedtag Adapter', function() {
               }
             )
           }
-          const placements = ['banner', 'video', 'inImage', 'inScreen']
+          const placements = ['banner', 'video', 'inImage', 'inScreen', 'inArticle']
           placements.forEach(placement => {
             it('should be ' + placement, function() {
               const isBidRequestValid = spec.isBidRequestValid(
@@ -44,8 +54,8 @@ describe('Seedtag Adapter', function() {
           })
         })
       })
-      describe('when video slot has all mandatory params.', function() {
-        it('should return true, when video mediatype object are correct.', function() {
+      describe('when video slot has all mandatory params', function() {
+        it('should return true, when video context is instream', function () {
           const slotConfig = getSlotConfigs(
             {
               video: {
@@ -62,17 +72,35 @@ describe('Seedtag Adapter', function() {
           const isBidRequestValid = spec.isBidRequestValid(slotConfig)
           expect(isBidRequestValid).to.equal(true)
         })
+
+        it('should return true, when video context is outstream', function () {
+          const slotConfig = getSlotConfigs(
+            {
+              video: {
+                context: 'outstream',
+                playerSize: [[600, 200]]
+              }
+            },
+            {
+              publisherId: PUBLISHER_ID,
+              adUnitId: ADUNIT_ID,
+              placement: 'video'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
       })
     })
     describe('returns false', function() {
       describe('when params are not correct', function() {
-        function createSlotconfig(params) {
+        function createSlotConfig(params) {
           return getSlotConfigs({ banner: {} }, params)
         }
         it('does not have the PublisherToken.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              adUnitId: '000000',
+            createSlotConfig({
+              adUnitId: ADUNIT_ID,
               placement: 'banner'
             })
           )
@@ -80,8 +108,8 @@ describe('Seedtag Adapter', function() {
         })
         it('does not have the AdUnitId.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              publisherId: '0000-0000-01',
+            createSlotConfig({
+              publisherId: PUBLISHER_ID,
               placement: 'banner'
             })
           )
@@ -89,25 +117,25 @@ describe('Seedtag Adapter', function() {
         })
         it('does not have the placement.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
-            createSlotconfig({
-              publisherId: '0000-0000-01',
-              adUnitId: '000000'
+            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: '0000-0000-01',
-              adUnitId: '000000',
+            createSlotConfig({
+              publisherId: PUBLISHER_ID,
+              adUnitId: ADUNIT_ID,
               placement: 'another_thing'
             })
           )
           expect(isBidRequestValid).to.equal(false)
         })
       })
-      describe('when video mediaType object is not correct.', function() {
+      describe('when video mediaType object is not correct', function() {
         function createVideoSlotconfig(mediaType) {
           return getSlotConfigs(mediaType, {
             publisherId: PUBLISHER_ID,
@@ -117,26 +145,40 @@ describe('Seedtag Adapter', function() {
         }
         it('is a void object', function() {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({ video: {} })
+            createVideoSlotConfig({ video: {} })
           )
           expect(isBidRequestValid).to.equal(false)
         })
         it('does not have playerSize.', function() {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({ video: { context: 'instream' } })
+            createVideoSlotConfig({ video: { context: 'instream' } })
           )
           expect(isBidRequestValid).to.equal(false)
         })
-        it('is not instream ', function() {
+        it('is outstream ', function () {
           const isBidRequestValid = spec.isBidRequestValid(
-            createVideoSlotconfig({
+            createVideoSlotConfig({
               video: {
                 context: 'outstream',
                 playerSize: [[600, 200]]
               }
             })
           )
-          expect(isBidRequestValid).to.equal(false)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('order does not matter', function() {
+          it('when video is not the first slot', function() {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createVideoSlotConfig({ banner: {}, video: {} })
+            )
+            expect(isBidRequestValid).to.equal(false)
+          })
+          it('when video is the first slot', function() {
+            const isBidRequestValid = spec.isBidRequestValid(
+              createVideoSlotConfig({ video: {}, banner: {} })
+            )
+            expect(isBidRequestValid).to.equal(false)
+          })
         })
       })
     })
@@ -148,8 +190,8 @@ describe('Seedtag Adapter', function() {
       timeout: 1000
     }
     const mandatoryParams = {
-      publisherId: '0000-0000-01',
-      adUnitId: '000000',
+      publisherId: PUBLISHER_ID,
+      adUnitId: ADUNIT_ID,
       placement: 'banner'
     }
     const inStreamParams = Object.assign({}, mandatoryParams, {
@@ -176,6 +218,7 @@ describe('Seedtag Adapter', function() {
       expect(data.url).to.equal('referer')
       expect(data.publisherToken).to.equal('0000-0000-01')
       expect(typeof data.version).to.equal('string')
+      expect(['fixed', 'mobile', 'unknown'].indexOf(data.connectionType)).to.be.above(-1)
     })
 
     describe('adPosition param', function() {
@@ -248,6 +291,7 @@ describe('Seedtag Adapter', function() {
         expect(bannerBid.sizes[0][1]).to.equal(250)
         expect(bannerBid.sizes[1][0]).to.equal(300)
         expect(bannerBid.sizes[1][1]).to.equal(600)
+        expect(bannerBid.requestCount).to.equal(1)
       })
       it('should request an InStream Video', function() {
         const videoBid = bidRequests[1]
@@ -264,6 +308,7 @@ describe('Seedtag Adapter', function() {
         expect(videoBid.sizes[0][1]).to.equal(250)
         expect(videoBid.sizes[1][0]).to.equal(300)
         expect(videoBid.sizes[1][1]).to.equal(600)
+        expect(videoBid.requestCount).to.equal(1)
       })
     })
   })
@@ -278,7 +323,7 @@ describe('Seedtag Adapter', function() {
       expect(typeof bids).to.equal('object')
       expect(bids.length).to.equal(0)
     })
-    it('should return a void array, when the server response have not got bids.', function() {
+    it('should return a void array, when the server response have no bids.', function() {
       const request = { data: JSON.stringify({}) }
       const serverResponse = { body: { bids: [] } }
       const bids = spec.interpretResponse(serverResponse, request)
@@ -300,7 +345,9 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'display',
-                  ttl: 360
+                  ttl: 360,
+                  nurl: 'testurl.com/nurl',
+                  adomain: ['advertiserdomain.com']
                 }
               ],
               cookieSync: { url: '' }
@@ -315,6 +362,8 @@ describe('Seedtag Adapter', function() {
           expect(bids[0].currency).to.equal('USD')
           expect(bids[0].netRevenue).to.equal(true)
           expect(bids[0].ad).to.equal('content')
+          expect(bids[0].nurl).to.equal('testurl.com/nurl')
+          expect(bids[0].meta.advertiserDomains).to.deep.equal(['advertiserdomain.com'])
         })
       })
       describe('the bid is a video', function() {
@@ -331,7 +380,8 @@ describe('Seedtag Adapter', function() {
                   width: 728,
                   height: 90,
                   mediaType: 'video',
-                  ttl: 360
+                  ttl: 360,
+                  nurl: undefined
                 }
               ],
               cookieSync: { url: '' }
@@ -346,6 +396,7 @@ describe('Seedtag Adapter', function() {
           expect(bids[0].currency).to.equal('USD')
           expect(bids[0].netRevenue).to.equal(true)
           expect(bids[0].vastXml).to.equal('content')
+          expect(bids[0].meta.advertiserDomains).to.deep.equal([])
         })
       })
     })
@@ -381,6 +432,14 @@ describe('Seedtag Adapter', function() {
   })
 
   describe('onTimeout', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel')
+    })
+
+    afterEach(function() {
+      utils.triggerPixel.restore()
+    })
+
     it('should return the correct endpoint', function () {
       const params = { publisherId: '0000', adUnitId: '11111' }
       const timeoutData = [{ params: [ params ] }];
@@ -392,5 +451,44 @@ describe('Seedtag Adapter', function() {
         params.adUnitId
       )
     })
+
+    it('should set the timeout pixel', function() {
+      const params = { publisherId: '0000', adUnitId: '11111' }
+      const timeoutData = [{ params: [ params ] }];
+      spec.onTimeout(timeoutData)
+      expect(utils.triggerPixel.calledWith('https://s.seedtag.com/se/hb/timeout?publisherToken=' +
+      params.publisherId +
+      '&adUnitId=' +
+      params.adUnitId)).to.equal(true);
+    })
+  })
+
+  describe('onBidWon', function () {
+    beforeEach(function() {
+      sinon.stub(utils, 'triggerPixel')
+    })
+
+    afterEach(function() {
+      utils.triggerPixel.restore()
+    })
+
+    describe('without nurl', function() {
+      const bid = {}
+
+      it('does not create pixel ', function() {
+        spec.onBidWon(bid)
+        expect(utils.triggerPixel.called).to.equal(false);
+      })
+    })
+
+    describe('with nurl', function () {
+      const nurl = 'http://seedtag_domain/won'
+      const bid = { nurl }
+
+      it('creates nurl pixel if bid nurl', function() {
+        spec.onBidWon({ nurl })
+        expect(utils.triggerPixel.calledWith(nurl)).to.equal(true);
+      })
+    })
   })
 })
diff --git a/test/spec/modules/shareUserIds_spec.js b/test/spec/modules/shareUserIds_spec.js
index 451892919cb..67e39533fc7 100644
--- a/test/spec/modules/shareUserIds_spec.js
+++ b/test/spec/modules/shareUserIds_spec.js
@@ -50,6 +50,16 @@ describe('#userIdTargeting', function() {
     pubads.setTargeting('test', ['TEST']);
     config.GAM_KEYS.tdid = '';
     userIdTargeting(userIds, config);
+    expect(pubads.getTargeting('tdid')).to.be.an('array').that.is.empty;
     expect(pubads.getTargeting('test')).to.deep.equal(['TEST']);
   });
+
+  it('User Id Targeting is added to googletag queue when GPT is not ready', function() {
+    let pubads = window.googletag.pubads;
+    delete window.googletag.pubads;
+    userIdTargeting(userIds, config);
+    window.googletag.pubads = pubads;
+    window.googletag.cmd.map(command => command());
+    expect(window.googletag.pubads().getTargeting('TD_ID')).to.deep.equal(['my-tdid']);
+  });
 });
diff --git a/test/spec/modules/sharedIdSystem_spec.js b/test/spec/modules/sharedIdSystem_spec.js
new file mode 100644
index 00000000000..ad51fe81cde
--- /dev/null
+++ b/test/spec/modules/sharedIdSystem_spec.js
@@ -0,0 +1,77 @@
+import {
+  sharedIdSubmodule,
+} from 'modules/sharedIdSystem.js';
+import { server } from 'test/mocks/xhr.js';
+import {uspDataHandler} from 'src/adapterManager';
+
+let expect = require('chai').expect;
+
+describe('SharedId System', function() {
+  const SHAREDID_RESPONSE = {sharedId: 'testsharedid'};
+  let uspConsentDataStub;
+  describe('Xhr Requests from getId()', function() {
+    let callbackSpy = sinon.spy();
+
+    beforeEach(function() {
+      callbackSpy.resetHistory();
+      uspConsentDataStub = sinon.stub(uspDataHandler, 'getConsentData');
+    });
+
+    afterEach(function () {
+      uspConsentDataStub.restore();
+    });
+
+    it('should call shared id endpoint without consent data and handle a valid response', function () {
+      let submoduleCallback = sharedIdSubmodule.getId(undefined, undefined).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      expect(request.url).to.equal('https://id.sharedid.org/id');
+      expect(request.withCredentials).to.be.true;
+
+      request.respond(200, {}, JSON.stringify(SHAREDID_RESPONSE));
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg.id).to.equal(SHAREDID_RESPONSE.sharedId);
+    });
+
+    it('should call shared id endpoint with consent data and handle a valid response', function () {
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'abc12345234',
+      };
+
+      let submoduleCallback = sharedIdSubmodule.getId(undefined, consentData).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      expect(request.url).to.equal('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234');
+      expect(request.withCredentials).to.be.true;
+
+      request.respond(200, {}, JSON.stringify(SHAREDID_RESPONSE));
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg.id).to.equal(SHAREDID_RESPONSE.sharedId);
+    });
+
+    it('should call shared id endpoint with usp consent data and handle a valid response', function () {
+      uspConsentDataStub.returns('1YYY');
+      let consentData = {
+        gdprApplies: true,
+        consentString: 'abc12345234',
+      };
+
+      let submoduleCallback = sharedIdSubmodule.getId(undefined, consentData).callback;
+      submoduleCallback(callbackSpy);
+
+      let request = server.requests[0];
+      expect(request.url).to.equal('https://id.sharedid.org/id?us_privacy=1YYY&gdpr=1&gdpr_consent=abc12345234');
+      expect(request.withCredentials).to.be.true;
+
+      request.respond(200, {}, JSON.stringify(SHAREDID_RESPONSE));
+
+      expect(callbackSpy.calledOnce).to.be.true;
+      expect(callbackSpy.lastCall.lastArg.id).to.equal(SHAREDID_RESPONSE.sharedId);
+    });
+  });
+});
diff --git a/test/spec/modules/sharethroughBidAdapter_spec.js b/test/spec/modules/sharethroughBidAdapter_spec.js
index 92f9fd11eeb..b8d91249ec3 100644
--- a/test/spec/modules/sharethroughBidAdapter_spec.js
+++ b/test/spec/modules/sharethroughBidAdapter_spec.js
@@ -1,6 +1,8 @@
 import { expect } from 'chai';
 import { sharethroughAdapterSpec, sharethroughInternal } from 'modules/sharethroughBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from '../../../src/utils.js';
+import { config } from 'src/config';
 
 const spec = newBidder(sharethroughAdapterSpec).getSpec();
 const bidRequests = [
@@ -12,7 +14,27 @@ const bidRequests = [
     params: {
       pkey: 'aaaa1111'
     },
-    userId: { tdid: 'fake-tdid' }
+    userId: {
+      tdid: 'fake-tdid',
+      pubcid: 'fake-pubcid',
+      idl_env: 'fake-identity-link',
+      id5id: {
+        uid: 'fake-id5id',
+        ext: {
+          linkType: 2
+        }
+      },
+      sharedid: {
+        id: 'fake-sharedid',
+        third: 'fake-sharedthird'
+      },
+      lipb: {
+        lipbid: 'fake-lipbid'
+      }
+    },
+    crumbs: {
+      pubcid: 'fake-pubcid-in-crumbs-obj'
+    }
   },
   {
     bidder: 'sharethrough',
@@ -33,13 +55,33 @@ const bidRequests = [
       pkey: 'cccc3333',
       iframe: true,
       iframeSize: [500, 500]
-    },
+    }
+  },
+  {
+    bidder: 'sharethrough',
+    bidId: 'bidId4',
+    sizes: [[700, 400]],
+    placementCode: 'bar',
+    params: {
+      pkey: 'dddd4444',
+      badv: ['domain1.com', 'domain2.com']
+    }
+  },
+  {
+    bidder: 'sharethrough',
+    bidId: 'bidId5',
+    sizes: [[700, 400]],
+    placementCode: 'bar',
+    params: {
+      pkey: 'eeee5555',
+      bcat: ['IAB1-1', 'IAB1-2']
+    }
   },
 ];
 
 const prebidRequests = [
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -51,7 +93,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -63,7 +105,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -76,7 +118,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -88,7 +130,7 @@ const prebidRequests = [
     }
   },
   {
-    method: 'GET',
+    method: 'POST',
     url: 'https://btlr.sharethrough.com/WYu2BXv1/v1',
     data: {
       bidId: 'bidId',
@@ -98,7 +140,7 @@ const prebidRequests = [
       skipIframeBusting: false,
       sizes: [[300, 250], [300, 300], [250, 250], [600, 50]]
     }
-  },
+  }
 ];
 
 const bidderResponse = {
@@ -121,27 +163,31 @@ const bidderResponse = {
 };
 
 const setUserAgent = (uaString) => {
-  window.navigator['__defineGetter__']('userAgent', function () {
+  window.navigator['__defineGetter__']('userAgent', function() {
     return uaString;
   });
 };
 
-describe('sharethrough internal spec', function () {
-  let windowSpy, windowTopSpy;
-
+describe('sharethrough internal spec', function() {
+  let windowStub, windowTopStub;
+  let stubbedReturn = [{
+    appendChild: () => undefined
+  }]
   beforeEach(function() {
-    windowSpy = sinon.spy(window.document, 'getElementsByTagName');
-    windowTopSpy = sinon.spy(window.top.document, 'getElementsByTagName');
+    windowStub = sinon.stub(window.document, 'getElementsByTagName');
+    windowTopStub = sinon.stub(window.top.document, 'getElementsByTagName');
+    windowStub.withArgs('body').returns(stubbedReturn);
+    windowTopStub.withArgs('body').returns(stubbedReturn);
   });
 
   afterEach(function() {
-    windowSpy.restore();
-    windowTopSpy.restore();
+    windowStub.restore();
+    windowTopStub.restore();
     window.STR = undefined;
     window.top.STR = undefined;
   });
 
-  describe('we cannot access top level document', function () {
+  describe('we cannot access top level document', function() {
     beforeEach(function() {
       window.lockedInFrame = true;
     });
@@ -150,44 +196,44 @@ describe('sharethrough internal spec', function () {
       window.lockedInFrame = false;
     });
 
-    it('appends sfp.js to the safeframe', function () {
+    it('appends sfp.js to the safeframe', function() {
       sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
+      expect(windowStub.calledOnce).to.be.true;
     });
 
-    it('does not append anything if sfp.js is already loaded in the safeframe', function () {
+    it('does not append anything if sfp.js is already loaded in the safeframe', function() {
       window.STR = { Tag: true };
       sharethroughInternal.handleIframe();
-      expect(windowSpy.notCalled).to.be.true;
-      expect(windowTopSpy.notCalled).to.be.true;
+      expect(windowStub.notCalled).to.be.true;
+      expect(windowTopStub.notCalled).to.be.true;
     });
   });
 
-  describe('we are able to bust out of the iframe', function () {
-    it('appends sfp.js to window.top', function () {
+  describe('we are able to bust out of the iframe', function() {
+    it('appends sfp.js to window.top', function() {
       sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
-      expect(windowTopSpy.calledOnce).to.be.true;
+      expect(windowStub.calledOnce).to.be.true;
+      expect(windowTopStub.calledOnce).to.be.true;
     });
 
-    it('only appends sfp-set-targeting.js if sfp.js is already loaded on the page', function () {
+    it('only appends sfp-set-targeting.js if sfp.js is already loaded on the page', function() {
       window.top.STR = { Tag: true };
       sharethroughInternal.handleIframe();
-      expect(windowSpy.calledOnce).to.be.true;
-      expect(windowTopSpy.notCalled).to.be.true;
+      expect(windowStub.calledOnce).to.be.true;
+      expect(windowTopStub.notCalled).to.be.true;
     });
   });
 });
 
-describe('sharethrough adapter spec', function () {
-  describe('.code', function () {
-    it('should return a bidder code of sharethrough', function () {
+describe('sharethrough adapter spec', function() {
+  describe('.code', function() {
+    it('should return a bidder code of sharethrough', function() {
       expect(spec.code).to.eql('sharethrough');
     });
   });
 
-  describe('.isBidRequestValid', function () {
-    it('should return false if req has no pkey', function () {
+  describe('.isBidRequestValid', function() {
+    it('should return false if req has no pkey', function() {
       const invalidBidRequest = {
         bidder: 'sharethrough',
         params: {
@@ -197,7 +243,7 @@ describe('sharethrough adapter spec', function () {
       expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
     });
 
-    it('should return false if req has wrong bidder code', function () {
+    it('should return false if req has wrong bidder code', function() {
       const invalidBidRequest = {
         bidder: 'notSharethrough',
         params: {
@@ -207,22 +253,22 @@ describe('sharethrough adapter spec', function () {
       expect(spec.isBidRequestValid(invalidBidRequest)).to.eql(false);
     });
 
-    it('should return true if req is correct', function () {
+    it('should return true if req is correct', function() {
       expect(spec.isBidRequestValid(bidRequests[0])).to.eq(true);
       expect(spec.isBidRequestValid(bidRequests[1])).to.eq(true);
-    })
+    });
   });
 
-  describe('.buildRequests', function () {
-    it('should return an array of requests', function () {
+  describe('.buildRequests', function() {
+    it('should return an array of requests', function() {
       const builtBidRequests = spec.buildRequests(bidRequests);
 
       expect(builtBidRequests[0].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
       expect(builtBidRequests[1].url).to.eq('https://btlr.sharethrough.com/WYu2BXv1/v1');
-      expect(builtBidRequests[0].method).to.eq('GET');
+      expect(builtBidRequests[0].method).to.eq('POST');
     });
 
-    it('should set the instant_play_capable parameter correctly based on browser userAgent string', function () {
+    it('should set the instant_play_capable parameter correctly based on browser userAgent string', function() {
       setUserAgent('Android Chrome/60');
       let builtBidRequests = spec.buildRequests(bidRequests);
       expect(builtBidRequests[0].data.instant_play_capable).to.be.true;
@@ -252,31 +298,31 @@ describe('sharethrough adapter spec', function () {
       const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('http:');
       const bidRequest = spec.buildRequests(bidRequests, null)[0];
       expect(bidRequest.data.secure).to.be.false;
-      stub.restore()
+      stub.restore();
     });
 
     it('should set the secure parameter to true when the protocol is https', function() {
       const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('https:');
       const bidRequest = spec.buildRequests(bidRequests, null)[0];
       expect(bidRequest.data.secure).to.be.true;
-      stub.restore()
+      stub.restore();
     });
 
     it('should set the secure parameter to true when the protocol is neither http or https', function() {
       const stub = sinon.stub(sharethroughInternal, 'getProtocol').returns('about:');
       const bidRequest = spec.buildRequests(bidRequests, null)[0];
       expect(bidRequest.data.secure).to.be.true;
-      stub.restore()
+      stub.restore();
     });
 
-    it('should add ccpa parameter if uspConsent is present', function () {
+    it('should add ccpa parameter if uspConsent is present', function() {
       const uspConsent = '1YNN';
       const bidderRequest = { uspConsent: uspConsent };
       const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(bidRequest.data.us_privacy).to.eq(uspConsent);
     });
 
-    it('should add consent parameters if gdprConsent is present', function () {
+    it('should add consent parameters if gdprConsent is present', function() {
       const gdprConsent = { consentString: 'consent_string123', gdprApplies: true };
       const bidderRequest = { gdprConsent: gdprConsent };
       const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
@@ -284,19 +330,63 @@ describe('sharethrough adapter spec', function () {
       expect(bidRequest.data.consent_string).to.eq('consent_string123');
     });
 
-    it('should handle gdprConsent is present but values are undefined case', function () {
+    it('should handle gdprConsent is present but values are undefined case', function() {
       const gdprConsent = { consent_string: undefined, gdprApplies: undefined };
       const bidderRequest = { gdprConsent: gdprConsent };
       const bidRequest = spec.buildRequests(bidRequests, bidderRequest)[0];
-      expect(bidRequest.data).to.not.include.any.keys('consent_string')
+      expect(bidRequest.data).to.not.include.any.keys('consent_string');
     });
 
-    it('should add the ttduid parameter if a bid request contains a value for Unified ID from The Trade Desk', function () {
+    it('should add the ttduid parameter if a bid request contains a value for Unified ID from The Trade Desk', function() {
       const bidRequest = spec.buildRequests(bidRequests)[0];
       expect(bidRequest.data.ttduid).to.eq('fake-tdid');
     });
 
-    it('should add Sharethrough specific parameters', function () {
+    it('should add the pubcid parameter if a bid request contains a value for the Publisher Common ID Module in the' +
+      ' userId object of the bidrequest', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.pubcid).to.eq('fake-pubcid');
+    });
+
+    it('should add the pubcid parameter if a bid request contains a value for the Publisher Common ID Module in the' +
+      ' crumbs object of the bidrequest', function() {
+      const bidData = utils.deepClone(bidRequests);
+      delete bidData[0].userId.pubcid;
+
+      const bidRequest = spec.buildRequests(bidData)[0];
+      expect(bidRequest.data.pubcid).to.eq('fake-pubcid-in-crumbs-obj');
+    });
+
+    it('should add the pubcid parameter if a bid request contains a value for the Publisher Common ID Module in the' +
+      ' crumbs object of the bidrequest', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      delete bidRequest.userId;
+      expect(bidRequest.data.pubcid).to.eq('fake-pubcid');
+    });
+
+    it('should add the idluid parameter if a bid request contains a value for Identity Link from Live Ramp', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.idluid).to.eq('fake-identity-link');
+    });
+
+    it('should add the id5uid parameter if a bid request contains a value for ID5', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.id5uid.id).to.eq('fake-id5id');
+      expect(bidRequest.data.id5uid.linkType).to.eq(2);
+    });
+
+    it('should add the shduid parameter if a bid request contains a value for Shared ID', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.shduid.id).to.eq('fake-sharedid');
+      expect(bidRequest.data.shduid.third).to.eq('fake-sharedthird');
+    });
+
+    it('should add the liuid parameter if a bid request contains a value for LiveIntent ID', function() {
+      const bidRequest = spec.buildRequests(bidRequests)[0];
+      expect(bidRequest.data.liuid).to.eq('fake-lipbid');
+    });
+
+    it('should add Sharethrough specific parameters', function() {
       const builtBidRequests = spec.buildRequests(bidRequests);
       expect(builtBidRequests[0]).to.deep.include({
         strData: {
@@ -327,6 +417,18 @@ describe('sharethrough adapter spec', function () {
       expect(builtBidRequest.data.schain).to.eq(JSON.stringify(bidRequest.schain));
     });
 
+    it('should add badv if provided', () => {
+      const builtBidRequest = spec.buildRequests([bidRequests[3]])[0];
+
+      expect(builtBidRequest.data.badv).to.have.members(['domain1.com', 'domain2.com'])
+    });
+
+    it('should add bcat if provided', () => {
+      const builtBidRequest = spec.buildRequests([bidRequests[4]])[0];
+
+      expect(builtBidRequest.data.bcat).to.have.members(['IAB1-1', 'IAB1-2'])
+    });
+
     it('should not add a supply chain parameter if schain is missing', function() {
       const bidRequest = spec.buildRequests(bidRequests)[0];
       expect(bidRequest.data).to.not.include.any.keys('schain');
@@ -334,7 +436,7 @@ describe('sharethrough adapter spec', function () {
 
     it('should include the bidfloor parameter if it is present in the bid request', function() {
       const bidRequest = Object.assign({}, bidRequests[0]);
-      bidRequest['bidfloor'] = 0.50;
+      bidRequest['getFloor'] = () => ({ currency: 'USD', floor: 0.5 });
       const builtBidRequest = spec.buildRequests([bidRequest])[0];
       expect(builtBidRequest.data.bidfloor).to.eq(0.5);
     });
@@ -344,11 +446,34 @@ describe('sharethrough adapter spec', function () {
       const builtBidRequest = spec.buildRequests([bidRequest])[0];
       expect(builtBidRequest.data).to.not.include.any.keys('bidfloor');
     });
+
+    describe('coppa', function() {
+      it('should add coppa to request if enabled', function() {
+        config.setConfig({coppa: true});
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        const builtBidRequest = spec.buildRequests([bidRequest])[0];
+        expect(builtBidRequest.data.coppa).to.eq(true);
+      });
+
+      it('should not add coppa to request if disabled', function() {
+        config.setConfig({coppa: false});
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        const builtBidRequest = spec.buildRequests([bidRequest])[0];
+        expect(builtBidRequest.data.coppa).to.be.undefined;
+      });
+
+      it('should not add coppa to request if unknown value', function() {
+        config.setConfig({coppa: 'something'});
+        const bidRequest = Object.assign({}, bidRequests[0]);
+        const builtBidRequest = spec.buildRequests([bidRequest])[0];
+        expect(builtBidRequest.data.coppa).to.be.undefined;
+      });
+    });
   });
 
-  describe('.interpretResponse', function () {
-    it('returns a correctly parsed out response', function () {
-      expect(spec.interpretResponse(bidderResponse, prebidRequests[0])[0]).to.include(
+  describe('.interpretResponse', function() {
+    it('returns a correctly parsed out response', function() {
+      expect(spec.interpretResponse(bidderResponse, prebidRequests[0])[0]).to.deep.include(
         {
           width: 1,
           height: 1,
@@ -358,10 +483,11 @@ describe('sharethrough adapter spec', function () {
           currency: 'USD',
           netRevenue: true,
           ttl: 360,
+          meta: { advertiserDomains: [] }
         });
     });
 
-    it('returns a correctly parsed out response with largest size when strData.skipIframeBusting is true', function () {
+    it('returns a correctly parsed out response with largest size when strData.skipIframeBusting is true', function() {
       expect(spec.interpretResponse(bidderResponse, prebidRequests[1])[0]).to.include(
         {
           width: 300,
@@ -371,11 +497,11 @@ describe('sharethrough adapter spec', function () {
           dealId: 'aDealId',
           currency: 'USD',
           netRevenue: true,
-          ttl: 360,
+          ttl: 360
         });
     });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is true and strData.iframeSize is provided', function () {
+    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is true and strData.iframeSize is provided', function() {
       expect(spec.interpretResponse(bidderResponse, prebidRequests[2])[0]).to.include(
         {
           width: 500,
@@ -385,11 +511,11 @@ describe('sharethrough adapter spec', function () {
           dealId: 'aDealId',
           currency: 'USD',
           netRevenue: true,
-          ttl: 360,
+          ttl: 360
         });
     });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains [0, 0] only', function () {
+    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains [0, 0] only', function() {
       expect(spec.interpretResponse(bidderResponse, prebidRequests[3])[0]).to.include(
         {
           width: 0,
@@ -399,11 +525,11 @@ describe('sharethrough adapter spec', function () {
           dealId: 'aDealId',
           currency: 'USD',
           netRevenue: true,
-          ttl: 360,
+          ttl: 360
         });
     });
 
-    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains multiple sizes', function () {
+    it('returns a correctly parsed out response with explicitly defined size when strData.skipIframeBusting is false and strData.sizes contains multiple sizes', function() {
       expect(spec.interpretResponse(bidderResponse, prebidRequests[4])[0]).to.include(
         {
           width: 300,
@@ -413,26 +539,26 @@ describe('sharethrough adapter spec', function () {
           dealId: 'aDealId',
           currency: 'USD',
           netRevenue: true,
-          ttl: 360,
+          ttl: 360
         });
     });
 
-    it('returns a blank array if there are no creatives', function () {
+    it('returns a blank array if there are no creatives', function() {
       const bidResponse = { body: { creatives: [] } };
       expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
     });
 
-    it('returns a blank array if body object is empty', function () {
+    it('returns a blank array if body object is empty', function() {
       const bidResponse = { body: {} };
       expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
     });
 
-    it('returns a blank array if body is null', function () {
+    it('returns a blank array if body is null', function() {
       const bidResponse = { body: null };
       expect(spec.interpretResponse(bidResponse, prebidRequests[0])).to.be.an('array').that.is.empty;
     });
 
-    it('correctly generates ad markup when skipIframeBusting is false', function () {
+    it('correctly generates ad markup when skipIframeBusting is false', function() {
       const adMarkup = spec.interpretResponse(bidderResponse, prebidRequests[0])[0].ad;
       let resp = null;
 
@@ -447,7 +573,7 @@ describe('sharethrough adapter spec', function () {
       expect(adMarkup).to.match(/handleIframe/);
     });
 
-    it('correctly generates ad markup when skipIframeBusting is true', function () {
+    it('correctly generates ad markup when skipIframeBusting is true', function() {
       const adMarkup = spec.interpretResponse(bidderResponse, prebidRequests[1])[0].ad;
       let resp = null;
 
@@ -461,11 +587,11 @@ describe('sharethrough adapter spec', function () {
     });
   });
 
-  describe('.getUserSyncs', function () {
+  describe('.getUserSyncs', function() {
     const cookieSyncs = ['cookieUrl1', 'cookieUrl2', 'cookieUrl3'];
     const serverResponses = [{ body: { cookieSyncUrls: cookieSyncs } }];
 
-    it('returns an array of correctly formatted user syncs', function () {
+    it('returns an array of correctly formatted user syncs', function() {
       const syncArray = spec.getUserSyncs({ pixelEnabled: true }, serverResponses, null, 'fake-privacy-signal');
       expect(syncArray).to.deep.equal([
         { type: 'image', url: 'cookieUrl1&us_privacy=fake-privacy-signal' },
@@ -474,22 +600,22 @@ describe('sharethrough adapter spec', function () {
       );
     });
 
-    it('returns an empty array if serverResponses is empty', function () {
+    it('returns an empty array if serverResponses is empty', function() {
       const syncArray = spec.getUserSyncs({ pixelEnabled: true }, []);
       expect(syncArray).to.be.an('array').that.is.empty;
     });
 
-    it('returns an empty array if the body is null', function () {
+    it('returns an empty array if the body is null', function() {
       const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: null }]);
       expect(syncArray).to.be.an('array').that.is.empty;
     });
 
-    it('returns an empty array if the body.cookieSyncUrls is missing', function () {
+    it('returns an empty array if the body.cookieSyncUrls is missing', function() {
       const syncArray = spec.getUserSyncs({ pixelEnabled: true }, [{ body: { creatives: ['creative'] } }]);
       expect(syncArray).to.be.an('array').that.is.empty;
     });
 
-    it('returns an empty array if pixels are not enabled', function () {
+    it('returns an empty array if pixels are not enabled', function() {
       const syncArray = spec.getUserSyncs({ pixelEnabled: false }, serverResponses);
       expect(syncArray).to.be.an('array').that.is.empty;
     });
diff --git a/test/spec/modules/shinezBidAdapter_spec.js b/test/spec/modules/shinezBidAdapter_spec.js
new file mode 100644
index 00000000000..cc3c2451c5d
--- /dev/null
+++ b/test/spec/modules/shinezBidAdapter_spec.js
@@ -0,0 +1,152 @@
+import { expect } from 'chai';
+import sinon from 'sinon';
+import { spec, internal } from 'modules/shinezBidAdapter.js';
+
+describe('shinezBidAdapter', () => {
+  let sandbox;
+  beforeEach(() => {
+    sandbox = sinon.sandbox.create();
+  });
+  afterEach(() => {
+    sandbox.restore();
+  });
+  describe('isBidRequestValid', () => {
+    const cases = [
+      [
+        'should return false when placementId is missing',
+        {
+          params: {},
+        },
+        false,
+      ],
+      [
+        'should return false when placementId has wrong type',
+        {
+          params: {
+            placementId: 123,
+          },
+        },
+        false,
+      ],
+      [
+        'should return false when unit has wrong type',
+        {
+          params: {
+            placementId: '00654321',
+            unit: 150,
+          },
+        },
+        false,
+      ],
+      [
+        'should return true when required params found and valid',
+        {
+          params: {
+            placementId: '00654321',
+          },
+        },
+        true,
+      ],
+      [
+        'should return true when all params found and valid',
+        {
+          params: {
+            placementId: '00654321',
+            unit: '__header-bid-1',
+          },
+        },
+        true,
+      ],
+    ];
+    cases.map(([description, request, expected]) => {
+      it(description, () => {
+        const result = spec.isBidRequestValid(request);
+        expect(result).to.be.equal(expected);
+      });
+    });
+  });
+  describe('buildRequests', () => {
+    it('should build server request correctly', () => {
+      const utcOffset = 300;
+      const validBidRequests = [
+        {
+          params: {
+            placementId: '00654321',
+            unit: 'header-bid-tag-1-shinez',
+          },
+          crumbs: {
+            pubcid: 'c8584a82-bec3-4347-8d3e-e7612438a161',
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 250]],
+            },
+          },
+          adUnitCode: 'header-bid-tag-1',
+          transactionId: '665760dc-a249-4be7-ae86-91f417b2c65d',
+        },
+      ];
+      const bidderRequest = {
+        refererInfo: {
+          referer: 'http://site-with-ads.com',
+        },
+      };
+      sandbox.stub(Date.prototype, 'getTimezoneOffset').returns(utcOffset);
+      const result = spec.buildRequests(validBidRequests, bidderRequest);
+      const expectedData = [
+        {
+          bidId: validBidRequests[0].bidId,
+          transactionId: validBidRequests[0].transactionId,
+          crumbs: validBidRequests[0].crumbs,
+          mediaTypes: validBidRequests[0].mediaTypes,
+          refererInfo: bidderRequest.refererInfo,
+          adUnitCode: validBidRequests[0].adUnitCode,
+          utcOffset: utcOffset,
+          placementId: validBidRequests[0].params.placementId,
+          unit: validBidRequests[0].params.unit,
+        },
+      ];
+      expect(result.method, "request should be POST'ed").equal('POST');
+      expect(result.url, 'request should be send to correct url').equal(
+        internal.TARGET_URL
+      );
+      expect(result.data, 'request should have correct payload').to.deep.equal(
+        expectedData
+      );
+    });
+  });
+  describe('interpretResponse', () => {
+    it('should interpret bid responses correctly', () => {
+      const response = {
+        body: [
+          {
+            bidId: '2ece6496f4d0c9',
+            cpm: 0.03,
+            currency: 'USD',
+            width: 300,
+            height: 250,
+            ad: `
The Ad
`,
+            ttl: 60,
+            creativeId: 'V8qlA6guwm',
+            netRevenue: true,
+          },
+        ],
+      };
+      const bids = [
+        {
+          requestId: response.body[0].bidId,
+          cpm: response.body[0].cpm,
+          currency: response.body[0].currency,
+          width: response.body[0].width,
+          height: response.body[0].height,
+          ad: response.body[0].ad,
+          ttl: response.body[0].ttl,
+          creativeId: response.body[0].creativeId,
+          netRevenue: response.body[0].netRevenue,
+        },
+      ];
+      const result = spec.interpretResponse(response);
+      expect(result).to.deep.equal(bids);
+    });
+  });
+});
diff --git a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
index 75afb0ed86e..854c3a8e22d 100644
--- a/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
+++ b/test/spec/modules/sigmoidAnalyticsAdapter_spec.js
@@ -38,7 +38,7 @@ describe('sigmoid Prebid Analytic', function () {
       events.emit(constants.EVENTS.BID_RESPONSE, {});
       events.emit(constants.EVENTS.BID_WON, {});
 
-      sinon.assert.callCount(sigmoidAnalytic.track, 5);
+      sinon.assert.callCount(sigmoidAnalytic.track, 7);
     });
   });
   describe('build utm tag data', function () {
diff --git a/test/spec/modules/sirdataRtdProvider_spec.js b/test/spec/modules/sirdataRtdProvider_spec.js
new file mode 100644
index 00000000000..a16359c50cb
--- /dev/null
+++ b/test/spec/modules/sirdataRtdProvider_spec.js
@@ -0,0 +1,94 @@
+import { addSegmentData, getSegmentsAndCategories, sirdataSubmodule } from 'modules/sirdataRtdProvider.js';
+import { server } from 'test/mocks/xhr.js';
+
+const responseHeader = {'Content-Type': 'application/json'};
+
+describe('sirdataRtdProvider', function() {
+  describe('sirdataSubmodule', function() {
+    it('successfully instantiates', function () {
+		      expect(sirdataSubmodule.init()).to.equal(true);
+    });
+  });
+
+  describe('Add Segment Data', function() {
+    it('adds segment data', function() {
+      const config = {
+        params: {
+          setGptKeyValues: false,
+          contextualMinRelevancyScore: 50,
+          bidders: [{
+            bidder: 'appnexus'
+          }, {
+            bidder: 'other'
+          }]
+        }
+      };
+
+      let adUnits = [
+        {
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }, {
+            bidder: 'other'
+          }]
+        }
+      ];
+
+      let data = {
+        segments: [111111, 222222],
+        contextual_categories: {'333333': 100}
+      };
+
+      addSegmentData(adUnits, data, config, () => {});
+      expect(adUnits[0].bids[0].params.keywords).to.have.deep.property('sd_rtd', ['111111', '222222', '333333']);
+      expect(adUnits[0].bids[1].ortb2.site.ext.data).to.have.deep.property('sd_rtd', ['333333']);
+      expect(adUnits[0].bids[1].ortb2.user.ext.data).to.have.deep.property('sd_rtd', ['111111', '222222']);
+    });
+  });
+
+  describe('Get Segments And Categories', function() {
+    it('gets data from async request and adds segment data', function() {
+      const config = {
+        params: {
+          setGptKeyValues: false,
+          contextualMinRelevancyScore: 50,
+          bidders: [{
+            bidder: 'appnexus'
+          }, {
+            bidder: 'other'
+          }]
+        }
+      };
+
+      let reqBidsConfigObj = {
+        adUnits: [{
+          bids: [{
+            bidder: 'appnexus',
+            params: {
+              placementId: 13144370
+            }
+          }, {
+            bidder: 'other'
+          }]
+        }]
+      };
+
+      let data = {
+        segments: [111111, 222222],
+        contextual_categories: {'333333': 100}
+      };
+
+      getSegmentsAndCategories(reqBidsConfigObj, () => {}, config, {});
+
+      let request = server.requests[0];
+      request.respond(200, responseHeader, JSON.stringify(data));
+
+      expect(reqBidsConfigObj.adUnits[0].bids[0].params.keywords).to.have.deep.property('sd_rtd', ['111111', '222222', '333333']);
+      expect(reqBidsConfigObj.adUnits[0].bids[1].ortb2.site.ext.data).to.have.deep.property('sd_rtd', ['333333']);
+      expect(reqBidsConfigObj.adUnits[0].bids[1].ortb2.user.ext.data).to.have.deep.property('sd_rtd', ['111111', '222222']);
+    });
+  });
+});
diff --git a/test/spec/modules/sizeMappingV2_spec.js b/test/spec/modules/sizeMappingV2_spec.js
index 2462db3b144..ab06ddc8f51 100644
--- a/test/spec/modules/sizeMappingV2_spec.js
+++ b/test/spec/modules/sizeMappingV2_spec.js
@@ -205,6 +205,18 @@ describe('sizeMappingV2', function () {
       expect(adUnits[0].code).to.equal('div-gpt-ad-1460505748561-1');
     });
 
+    it('should filter out adUnit if it does not contain the required property "bids"', function() {
+      let adUnits = utils.deepClone(AD_UNITS);
+      delete adUnits[0].mediaTypes;
+      // before checkAdUnitSetupHook is called, the length of the adUnits should equal '2'
+      expect(adUnits.length).to.equal(2);
+      adUnits = checkAdUnitSetupHook(adUnits);
+
+      // after checkAdUnitSetupHook is called, the length of the adUnits should be '1'
+      expect(adUnits.length).to.equal(1);
+      expect(adUnits[0].code).to.equal('div-gpt-ad-1460505748561-1');
+    });
+
     it('should filter out adUnit if it has declared property mediaTypes with an empty object', function () {
       let adUnits = utils.deepClone(AD_UNITS);
       adUnits[0].mediaTypes = {};
@@ -235,7 +247,7 @@ describe('sizeMappingV2', function () {
         adUnitSetupChecks.validateBannerMediaType.restore();
       });
 
-      it('should delete banner mediaType if it does not constain sizes or sizeConfig property', function () {
+      it('should delete banner mediaType if it does not contain sizes or sizeConfig property', function () {
         let adUnits = utils.deepClone(AD_UNITS);
         delete adUnits[0].mediaTypes.banner.sizeConfig;
 
@@ -255,7 +267,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, 'Detected a mediaTypes.banner object did not include required property sizes or sizeConfig. Removing invalid mediaTypes.banner object from Ad Unit.');
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: 'mediaTypes.banner' does not contain either 'sizes' or 'sizeConfig' property. Removing 'mediaTypes.banner' from ad unit.`);
       });
 
       it('should call function "validateBannerMediaType" if mediaTypes.sizes is present', function () {
@@ -293,7 +305,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig is NOT an Array. Removing the invalid object mediaTypes.banner from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizeConfig' in 'mediaTypes.banner.sizeConfig'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig does not contain the required properties "minViewPort" and "sizes"', function () {
@@ -329,7 +341,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[2] is missing required property minViewPort or sizes or both.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.banner.sizeConfig[2]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig has declared minViewPort property which is NOT an Array of two integers', function () {
@@ -365,7 +377,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[0] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.banner.sizeConfig[0]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should delete mediaTypes.banner object if it\'s property sizeConfig has declared sizes property which is not in the format, [[vw1, vh1], [vw2, vh2]], where vw is viewport width and vh is viewport height', function () {
@@ -401,7 +413,7 @@ describe('sizeMappingV2', function () {
 
         checkAdUnitSetupHook(adUnits);
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.banner.sizeConfig[1] has propery sizes declared with invalid value. Please ensure the sizes are listed like: [[300, 250], ...] or like: [] if no sizes are present for that size bucket.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizes' in 'mediaTypes.banner.sizeConfig[1]'. Removing mediaTypes.banner from ad unit.`);
       });
 
       it('should convert sizeConfig.sizes to an array of array, i.e., [360, 600] to [[360, 600]]', function () {
@@ -427,6 +439,21 @@ describe('sizeMappingV2', function () {
         expect(validatedAdUnits[0].mediaTypes.banner.sizeConfig[0].sizes).to.deep.equal([[]]);
       });
 
+      it('should log an error message if "sizes" in sizeConfig is not declared as an array', function () {
+        const adUnits = utils.deepClone(AD_UNITS);
+        const badSizeConfig = [
+          { minViewPort: [0, 0], sizes: [] },
+          { minViewPort: [750, 0], sizes: { 'incorrect': 'format' } },
+          { minViewPort: [1200, 0], sizes: [[300, 250], [300, 600]] }
+        ]
+        adUnits[0].mediaTypes.banner.sizeConfig = badSizeConfig;
+
+        checkAdUnitSetupHook(adUnits);
+
+        // Assertions
+        sinon.assert.callCount(utils.logError, 1);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizes' in 'mediaTypes.banner.sizeConfig[1]'. Removing mediaTypes.banner from ad unit.`);
+      });
       it('should NOT delete mediaTypes.banner object if sizeConfig object is declared correctly', function () {
         const adUnits = utils.deepClone(AD_UNITS);
 
@@ -451,8 +478,31 @@ describe('sizeMappingV2', function () {
         adUnitSetupChecks.validateVideoMediaType.restore();
       });
 
-      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize is present in the Ad Unit', function () {
+      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize is present in the Ad Unit (PART - 1)', function () {
+        // PART - 1 (Ad unit has banner.sizes defined, so, validateVideoMediaType function would be called with 'validatedBanner' as an argument)
+
+        const adUnits = utils.deepClone(AD_UNITS);
+
+        checkAdUnitSetupHook(adUnits);
+
+        // since adUntis[1].mediaTypes.video has defined property "playserSize", it should call function "validateVideoMediaType" only once
+        sinon.assert.callCount(adUnitSetupChecks.validateVideoMediaType, 1);
+        /*
+          'validateVideoMediaType' function should be called with 'validatedBanner' as an argument instead of the adUnit because validatedBanner is already a processed form of adUnit and is validated by banner checks.
+          It is not 'undefined' in this case because the adUnit[1] is using 'mediaTypes.banner.sizes' which will populate data into 'validatedBanner' variable.
+
+          'validatedBanner' will be idetical to adUnits[1] with the exceptions of an added property, 'sizes' on the validateBanner object itself.
+        */
+        const validatedBanner = adUnits[1];
+        validatedBanner.sizes = [[300, 250], [300, 600]];
+        sinon.assert.calledWith(adUnitSetupChecks.validateVideoMediaType, validatedBanner);
+      });
+
+      it('should call function "validateVideoMediaType" if mediaTypes.video.playerSize" is present in the Ad Unit (PART - 2)', function () {
+        // PART - 2 (Ad unit does not have banner.sizes defined, so, validateVideoMediaType function would be called with 'adUnit' as an argument)
+
         const adUnits = utils.deepClone(AD_UNITS);
+        delete adUnits[1].mediaTypes.banner;
 
         checkAdUnitSetupHook(adUnits);
 
@@ -480,7 +530,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig is NOT an Array. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'sizeConfig' in 'mediaTypes.video.sizeConfig'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig does not contain the required properties "minViewPort" and "playerSize"', function () {
@@ -503,7 +553,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[0] is missing required property minViewPort or playerSize or both. Removing the invalid property mediaTypes.video.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.video.sizeConfig[0]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig has declared minViewPort property which is NOT an Array of two integers', function () {
@@ -526,7 +576,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[1] has property minViewPort decalared with invalid value. Please ensure minViewPort is an Array and is listed like: [700, 0]. Declaring an empty array is not allowed, instead use: [0, 0].`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.video.sizeConfig[1]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.video.sizeConfig property if sizeConfig has declared "playerSize" property which is not in the format, [[vw1, vh1]], where vw is viewport width and vh is viewport height', function () {
@@ -549,7 +599,7 @@ describe('sizeMappingV2', function () {
 
         // check if correct logError is written to the console.
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.video.sizeConfig[0] has propery playerSize declared with invalid value. Please ensure the playerSize is listed like: [640, 480] or like: [] if no playerSize is present for that size bucket.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'playerSize' in 'mediaTypes.video.sizeConfig[0]'. Removing mediaTypes.video.sizeConfig from ad unit.`);
       });
 
       it('should convert sizeConfig.playerSize to an array of array, i.e., [360, 600] to [[360, 600]]', function () {
@@ -602,7 +652,72 @@ describe('sizeMappingV2', function () {
       it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined', function () {
         const adUnits = utils.deepClone(AD_UNITS);
         checkAdUnitSetupHook(adUnits);
+
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 1)', function () {
+        // PART - 1 (Ad unit contains 'banner', 'video' and 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 400]]
+            },
+            video: {
+              playerSize: [[600, 400]]
+            },
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'validatedVideo' should be passed as an argument to "validatedNativeMediaType"
+        const validatedVideo = adUnit[0];
+        validatedVideo.sizes = [[600, 400]];
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, validatedVideo);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 2)', function () {
+        // PART - 2 (Ad unit contains only 'banner' and 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 400]]
+            },
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'validatedBanner' should be passed as an argument to "validatedNativeMediaType"
+        const validatedBanner = adUnit[0];
+        validatedBanner.sizes = [[300, 400]];
+        sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, validatedBanner);
+      });
+
+      it('should call function "validateNativeMediaTypes" if mediaTypes.native is defined (PART - 3)', function () {
+        // PART - 2 (Ad unit contains only 'native' media types)
+        const adUnit = [{
+          code: 'ad-unit-1',
+          mediaTypes: {
+            native: {}
+          },
+          bids: [{bidder: 'appnexus', params: 1234}]
+        }];
+
+        checkAdUnitSetupHook(adUnit);
+
+        // 'adUnit[0]' should be passed as an argument to "validatedNativeMediaType"
         sinon.assert.callCount(adUnitSetupChecks.validateNativeMediaType, 1);
+        sinon.assert.calledWith(adUnitSetupChecks.validateNativeMediaType, adUnit[0]);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig does not contain the required properties "minViewPort" and "active"', function () {
@@ -618,7 +733,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig is missing required property minViewPort or active or both. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Missing required property 'minViewPort' or 'sizes' from 'mediaTypes.native.sizeConfig[1]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig[].minViewPort is NOT an array of TWO integers', function () {
@@ -634,7 +749,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'minViewPort' in 'mediaTypes.native.sizeConfig[0]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should delete mediaTypes.native.sizeConfig property if sizeConfig[].active is NOT a Boolean', function () {
@@ -651,7 +766,7 @@ describe('sizeMappingV2', function () {
         const validatedAdUnits = checkAdUnitSetupHook(adUnits);
         expect(validatedAdUnits[0].mediaTypes.native).to.not.have.property('sizeConfig');
         sinon.assert.callCount(utils.logError, 1);
-        sinon.assert.calledWith(utils.logError, `Ad Unit: div-gpt-ad-1460505748561-0: mediaTypes.native.sizeConfig has properties minViewPort or active decalared with invalid values. Removing the invalid property mediaTypes.native.sizeConfig from Ad Unit.`);
+        sinon.assert.calledWith(utils.logError, `Ad unit div-gpt-ad-1460505748561-0: Invalid declaration of 'active' in 'mediaTypes.native.sizeConfig[0]'. Removing mediaTypes.native.sizeConfig from ad unit.`);
       });
 
       it('should NOT delete mediaTypes.native.sizeConfig property if sizeConfig property is declared correctly', function () {
@@ -886,7 +1001,7 @@ describe('sizeMappingV2', function () {
       expect(activeBidder).to.equal(true);
     });
 
-    it('should throw a warning message if labelAny/labelAll operator found on adunit/bidder when "label" is not passed to pbjs.requestBids', function() {
+    it('should throw a warning message if labelAny/labelAll operator found on adunit/bidder when "label" is not passed to pbjs.requestBids', function () {
       const adUnit = {
         code: 'ad-unit-1',
         mediaTypes: {
@@ -1209,7 +1324,7 @@ describe('sizeMappingV2', function () {
       sinon.assert.calledWith(utils.logInfo, `Size Mapping V2:: Ad Unit: div-gpt-ad-1460505748561-1(1) => Active size buckets after filtration: `, adUnitDetailFixture_2.sizeBucketToSizeMap);
     });
 
-    it('should increment "instance" count if presence of "Identical ad units" is detected', function() {
+    it('should increment "instance" count if presence of "Identical ad units" is detected', function () {
       const adUnit = {
         code: 'div-gpt-ad-1460505748561-0',
         mediaTypes: {
@@ -1235,7 +1350,7 @@ describe('sizeMappingV2', function () {
       expect(adUnitDetail.instance).to.equal(2);
     });
 
-    it('should not execute "getFilteredMediaTypes" function if label is not activated on the ad unit', function() {
+    it('should not execute "getFilteredMediaTypes" function if label is not activated on the ad unit', function () {
       const [adUnit] = utils.deepClone(AD_UNITS);
       adUnit.labelAny = ['tablet'];
       getAdUnitDetail('a1b2c3', adUnit, labels);
diff --git a/test/spec/modules/smaatoBidAdapter_spec.js b/test/spec/modules/smaatoBidAdapter_spec.js
new file mode 100644
index 00000000000..0abc8463d28
--- /dev/null
+++ b/test/spec/modules/smaatoBidAdapter_spec.js
@@ -0,0 +1,692 @@
+import { spec } from 'modules/smaatoBidAdapter.js';
+import * as utils from 'src/utils.js';
+import { config } from 'src/config.js';
+import { createEidsArray } from 'modules/userId/eids.js';
+
+const ADTYPE_IMG = 'Img';
+const ADTYPE_RICHMEDIA = 'Richmedia';
+const ADTYPE_VIDEO = 'Video';
+
+const request = {
+  method: 'POST',
+  url: 'https://prebid.ad.smaato.net/oapi/prebid',
+  data: ''
+};
+
+const REFERRER = 'http://example.com/page.html'
+const CONSENT_STRING = 'HFIDUYFIUYIUYWIPOI87392DSU'
+
+const defaultBidderRequest = {
+  gdprConsent: {
+    consentString: CONSENT_STRING,
+    gdprApplies: true
+  },
+  uspConsent: 'uspConsentString',
+  refererInfo: {
+    referer: REFERRER,
+  },
+  timeout: 1200
+};
+
+const minimalBidderRequest = {
+  refererInfo: {
+    referer: REFERRER,
+  }
+};
+
+const singleBannerBidRequest = {
+  bidder: 'smaato',
+  params: {
+    publisherId: 'publisherId',
+    adspaceId: 'adspaceId'
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 50]]
+    }
+  },
+  adUnitCode: '/19968336/header-bid-tag-0',
+  transactionId: 'transactionId',
+  sizes: [[300, 50]],
+  bidId: 'bidId',
+  bidderRequestId: 'bidderRequestId',
+  auctionId: 'auctionId',
+  src: 'client',
+  bidRequestsCount: 1,
+  bidderRequestsCount: 1,
+  bidderWinsCount: 0
+};
+
+const inAppBidRequest = {
+  bidder: 'smaato',
+  params: {
+    publisherId: 'publisherId',
+    adspaceId: 'adspaceId',
+    app: {
+      ifa: 'aDeviceId',
+      geo: {
+        lat: 33.3,
+        lon: -88.8
+      }
+    }
+  },
+  mediaTypes: {
+    banner: {
+      sizes: [[300, 50]]
+    }
+  },
+  adUnitCode: '/19968336/header-bid-tag-0',
+  transactionId: 'transactionId',
+  sizes: [[300, 50]],
+  bidId: 'bidId',
+  bidderRequestId: 'bidderRequestId',
+  auctionId: 'auctionId',
+  src: 'client',
+  bidRequestsCount: 1,
+  bidderRequestsCount: 1,
+  bidderWinsCount: 0
+};
+
+const extractPayloadOfFirstAndOnlyRequest = (reqs) => {
+  expect(reqs).to.have.length(1);
+  return JSON.parse(reqs[0].data);
+}
+
+describe('smaatoBidAdapterTest', () => {
+  describe('isBidRequestValid', () => {
+    it('has valid params', () => {
+      expect(spec.isBidRequestValid({params: {publisherId: '123', adspaceId: '456'}})).to.be.true;
+      expect(spec.isBidRequestValid(singleBannerBidRequest)).to.be.true;
+    });
+    it('has invalid params', () => {
+      expect(spec.isBidRequestValid({})).to.be.false;
+      expect(spec.isBidRequestValid({params: {}})).to.be.false;
+      expect(spec.isBidRequestValid({params: {publisherId: '123'}})).to.be.false;
+      expect(spec.isBidRequestValid({params: {publisherId: '123', adspaceId: 456}})).to.be.false;
+    });
+  });
+
+  describe('buildRequests', () => {
+    describe('common', () => {
+      it('auction type is 1 (first price auction)', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.at).to.be.equal(1);
+      })
+
+      it('currency is US dollar', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.cur).to.be.deep.equal(['USD']);
+      })
+
+      it('can override endpoint', () => {
+        const overridenEndpoint = 'https://prebid/bidder';
+        const updatedBidRequest = utils.deepClone(singleBannerBidRequest);
+        utils.deepSetValue(updatedBidRequest, 'params.endpoint', overridenEndpoint);
+
+        const reqs = spec.buildRequests([updatedBidRequest], defaultBidderRequest);
+
+        expect(reqs).to.have.length(1);
+        expect(reqs[0].url).to.equal(overridenEndpoint);
+      });
+
+      it('sends correct imp', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp).to.deep.equal([
+          {
+            id: 'bidId',
+            banner: {
+              w: 300,
+              h: 50,
+              format: [
+                {
+                  h: 50,
+                  w: 300
+                }
+              ]
+            },
+            tagid: 'adspaceId'
+          }
+        ]);
+      });
+
+      it('sends correct site', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.site.id).to.exist.and.to.be.a('string');
+        expect(req.site.domain).to.exist.and.to.be.a('string');
+        expect(req.site.page).to.exist.and.to.be.a('string');
+        expect(req.site.ref).to.equal(REFERRER);
+        expect(req.site.publisher.id).to.equal('publisherId');
+      })
+
+      it('sends gdpr applies if exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.gdpr).to.equal(1);
+        expect(req.user.ext.consent).to.equal(CONSENT_STRING);
+      });
+
+      it('sends no gdpr applies if no gdpr exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], minimalBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.gdpr).to.not.exist;
+        expect(req.user.ext.consent).to.not.exist;
+      });
+
+      it('sends us_privacy if exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.us_privacy).to.equal('uspConsentString');
+      });
+
+      it('sends tmax', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.tmax).to.equal(1200);
+      });
+
+      it('sends no us_privacy if no us_privacy exists', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], minimalBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.regs.ext.us_privacy).to.not.exist;
+      });
+
+      it('sends first party data', () => {
+        this.sandbox = sinon.sandbox.create()
+        this.sandbox.stub(config, 'getConfig').callsFake(key => {
+          const config = {
+            ortb2: {
+              site: {
+                keywords: 'power tools,drills'
+              },
+              user: {
+                keywords: 'a,b',
+                gender: 'M',
+                yob: 1984
+              }
+            }
+          };
+          return utils.deepAccess(config, key);
+        });
+
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.gender).to.equal('M');
+        expect(req.user.yob).to.equal(1984);
+        expect(req.user.keywords).to.eql('a,b');
+        expect(req.user.ext.consent).to.equal(CONSENT_STRING);
+        expect(req.site.keywords).to.eql('power tools,drills');
+        expect(req.site.publisher.id).to.equal('publisherId');
+        this.sandbox.restore();
+      });
+
+      it('has no user ids', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.ext.eids).to.not.exist;
+      });
+    });
+
+    describe('multiple requests', () => {
+      it('build individual server request for each bid request', () => {
+        const bidRequest1 = utils.deepClone(singleBannerBidRequest);
+        const bidRequest1BidId = '1111';
+        utils.deepSetValue(bidRequest1, 'bidId', bidRequest1BidId);
+        const bidRequest2 = utils.deepClone(singleBannerBidRequest);
+        const bidRequest2BidId = '2222';
+        utils.deepSetValue(bidRequest2, 'bidId', bidRequest2BidId);
+
+        const reqs = spec.buildRequests([bidRequest1, bidRequest2], defaultBidderRequest);
+
+        expect(reqs).to.have.length(2);
+        expect(JSON.parse(reqs[0].data).imp[0].id).to.be.equal(bidRequest1BidId);
+        expect(JSON.parse(reqs[1].data).imp[0].id).to.be.equal(bidRequest2BidId);
+      });
+    });
+
+    describe('buildRequests for video imps', () => {
+      it('sends correct video imps', () => {
+        const singleVideoBidRequest = {
+          bidder: 'smaato',
+          params: {
+            publisherId: 'publisherId',
+            adspaceId: 'adspaceId'
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [[768, 1024]],
+              mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+              minduration: 5,
+              maxduration: 30,
+              startdelay: 0,
+              linearity: 1,
+              protocols: [7],
+              skip: 1,
+              skipmin: 5,
+              api: [7],
+              ext: {rewarded: 0}
+            }
+          },
+          adUnitCode: '/19968336/header-bid-tag-0',
+          transactionId: 'transactionId',
+          sizes: [[300, 50]],
+          bidId: 'bidId',
+          bidderRequestId: 'bidderRequestId',
+          auctionId: 'auctionId',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        };
+
+        const reqs = spec.buildRequests([singleVideoBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp).to.deep.equal([
+          {
+            id: 'bidId',
+            video: {
+              mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+              minduration: 5,
+              startdelay: 0,
+              linearity: 1,
+              h: 1024,
+              maxduration: 30,
+              skip: 1,
+              protocols: [7],
+              ext: {
+                rewarded: 0
+              },
+              skipmin: 5,
+              api: [7],
+              w: 768
+            },
+            tagid: 'adspaceId'
+          }
+        ]);
+      });
+
+      it('allows combined banner and video imp in single bid request', () => {
+        const combinedBannerAndVideoBidRequest = {
+          bidder: 'smaato',
+          params: {
+            publisherId: 'publisherId',
+            adspaceId: 'adspaceId'
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 50]]
+            },
+            video: {
+              context: 'outstream',
+              playerSize: [[768, 1024]],
+              mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+              minduration: 5,
+              maxduration: 30,
+              startdelay: 0,
+              linearity: 1,
+              protocols: [7],
+              skip: 1,
+              skipmin: 5,
+              api: [7],
+              ext: {rewarded: 0}
+            }
+          },
+          adUnitCode: '/19968336/header-bid-tag-0',
+          transactionId: 'transactionId',
+          sizes: [[300, 50]],
+          bidId: 'bidId',
+          bidderRequestId: 'bidderRequestId',
+          auctionId: 'auctionId',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0
+        };
+
+        const reqs = spec.buildRequests([combinedBannerAndVideoBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.imp).to.deep.equal([
+          {
+            id: 'bidId',
+            banner: {
+              w: 300,
+              h: 50,
+              format: [
+                {
+                  h: 50,
+                  w: 300
+                }
+              ]
+            },
+            video: {
+              mimes: ['video/mp4', 'video/quicktime', 'video/3gpp', 'video/x-m4v'],
+              minduration: 5,
+              startdelay: 0,
+              linearity: 1,
+              h: 1024,
+              maxduration: 30,
+              skip: 1,
+              protocols: [7],
+              ext: {
+                rewarded: 0
+              },
+              skipmin: 5,
+              api: [7],
+              w: 768
+            },
+            tagid: 'adspaceId'
+          }
+        ]);
+      });
+    });
+
+    describe('in-app requests', () => {
+      it('add geo and ifa info to device object', () => {
+        const reqs = spec.buildRequests([inAppBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.deep.equal({'lat': 33.3, 'lon': -88.8});
+        expect(req.device.ifa).to.equal('aDeviceId');
+      });
+
+      it('when geo is missing, then add only ifa to device object', () => {
+        const inAppBidRequestWithoutGeo = utils.deepClone(inAppBidRequest);
+        delete inAppBidRequestWithoutGeo.params.app.geo
+
+        const reqs = spec.buildRequests([inAppBidRequestWithoutGeo], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.not.exist;
+        expect(req.device.ifa).to.equal('aDeviceId');
+      });
+
+      it('add no specific device info if param does not exist', () => {
+        const reqs = spec.buildRequests([singleBannerBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.device.geo).to.not.exist;
+        expect(req.device.ifa).to.not.exist;
+      });
+    });
+
+    describe('user ids in requests', () => {
+      it('user ids are added to user.ext.eids', () => {
+        const userIdBidRequest = {
+          bidder: 'smaato',
+          params: {
+            publisherId: 'publisherId',
+            adspaceId: 'adspaceId'
+          },
+          mediaTypes: {
+            banner: {
+              sizes: [[300, 50]]
+            }
+          },
+          adUnitCode: '/19968336/header-bid-tag-0',
+          transactionId: 'transactionId',
+          sizes: [[300, 50]],
+          bidId: 'bidId',
+          bidderRequestId: 'bidderRequestId',
+          auctionId: 'auctionId',
+          src: 'client',
+          bidRequestsCount: 1,
+          bidderRequestsCount: 1,
+          bidderWinsCount: 0,
+          userId: {
+            criteoId: '123456',
+            tdid: '89145'
+          },
+          userIdAsEids: createEidsArray({
+            criteoId: '123456',
+            tdid: '89145'
+          })
+        };
+
+        const reqs = spec.buildRequests([userIdBidRequest], defaultBidderRequest);
+
+        const req = extractPayloadOfFirstAndOnlyRequest(reqs);
+        expect(req.user.ext.eids).to.exist;
+        expect(req.user.ext.eids).to.have.length(2);
+      });
+    });
+  });
+
+  describe('interpretResponse', () => {
+    const buildOpenRtbBidResponse = (adType) => {
+      let adm = '';
+
+      switch (adType) {
+        case ADTYPE_IMG:
+          adm = JSON.stringify({
+            image: {
+              img: {
+                url: 'https://prebid/static/ad.jpg',
+                w: 320,
+                h: 50,
+                ctaurl: 'https://prebid/track/ctaurl'
+              },
+              impressiontrackers: [
+                'https://prebid/track/imp/1',
+                'https://prebid/track/imp/2'
+              ],
+              clicktrackers: [
+                'https://prebid/track/click/1'
+              ]
+            }
+          });
+          break;
+        case ADTYPE_RICHMEDIA:
+          adm = JSON.stringify({
+            richmedia: {
+              mediadata: {
+                content: '
RICHMEDIA CONTENT
',
+                w: 800,
+                h: 600
+              },
+              impressiontrackers: [
+                'https://prebid/track/imp/1',
+                'https://prebid/track/imp/2'
+              ],
+              clicktrackers: [
+                'https://prebid/track/click/1'
+              ]
+            }
+          });
+          break;
+        case ADTYPE_VIDEO:
+          adm = '';
+          break;
+        default:
+          throw Error('Invalid AdType');
+      }
+
+      return {
+        body: {
+          bidid: '04db8629-179d-4bcd-acce-e54722969006',
+          cur: 'USD',
+          ext: {},
+          id: '5ebea288-f13a-4754-be6d-4ade66c68877',
+          seatbid: [
+            {
+              bid: [
+                {
+                  'adm': adm,
+                  'adomain': [
+                    'smaato.com'
+                  ],
+                  'bidderName': 'smaato',
+                  'cid': 'CM6523',
+                  'crid': 'CR69381',
+                  'dealid': '12345',
+                  'id': '6906aae8-7f74-4edd-9a4f-f49379a3cadd',
+                  'impid': '226416e6e6bf41',
+                  'iurl': 'https://prebid/iurl',
+                  'nurl': 'https://prebid/nurl',
+                  'price': 0.01,
+                  'w': 350,
+                  'h': 50
+                }
+              ],
+              seat: 'CM6523'
+            }
+          ],
+        },
+        headers: {
+          get: function (header) {
+            if (header === 'X-SMT-ADTYPE') {
+              return adType;
+            }
+          }
+        }
+      };
+    };
+
+    it('returns empty array on no bid responses', () => {
+      const response_with_empty_body = {body: {}}
+
+      const bids = spec.interpretResponse(response_with_empty_body, request);
+
+      expect(bids).to.be.empty
+    });
+
+    it('single image reponse', () => {
+      const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_IMG), request);
+
+      expect(bids).to.deep.equal([
+        {
+          requestId: '226416e6e6bf41',
+          cpm: 0.01,
+          width: 350,
+          height: 50,
+          ad: '
',
+          ttl: 300,
+          creativeId: 'CR69381',
+          dealId: '12345',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['smaato.com'],
+            agencyId: 'CM6523',
+            networkName: 'smaato',
+            mediaType: 'banner'
+          }
+        }
+      ]);
+    });
+
+    it('single richmedia reponse', () => {
+      const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_RICHMEDIA), request);
+
+      expect(bids).to.deep.equal([
+        {
+          requestId: '226416e6e6bf41',
+          cpm: 0.01,
+          width: 350,
+          height: 50,
+          ad: '
RICHMEDIA CONTENT
',
+          ttl: 300,
+          creativeId: 'CR69381',
+          dealId: '12345',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['smaato.com'],
+            agencyId: 'CM6523',
+            networkName: 'smaato',
+            mediaType: 'banner'
+          }
+        }
+      ]);
+    });
+
+    it('single video reponse', () => {
+      const bids = spec.interpretResponse(buildOpenRtbBidResponse(ADTYPE_VIDEO), request);
+
+      expect(bids).to.deep.equal([
+        {
+          requestId: '226416e6e6bf41',
+          cpm: 0.01,
+          width: 350,
+          height: 50,
+          vastXml: '',
+          ttl: 300,
+          creativeId: 'CR69381',
+          dealId: '12345',
+          netRevenue: true,
+          currency: 'USD',
+          meta: {
+            advertiserDomains: ['smaato.com'],
+            agencyId: 'CM6523',
+            networkName: 'smaato',
+            mediaType: 'video'
+          }
+        }
+      ]);
+    });
+
+    it('ignores bid response with invalid ad type', () => {
+      const resp = buildOpenRtbBidResponse(ADTYPE_IMG);
+      resp.headers.get = (header) => {
+        if (header === 'X-SMT-ADTYPE') {
+          return undefined;
+        }
+      }
+
+      const bids = spec.interpretResponse(resp, request);
+
+      expect(bids).to.be.empty
+    });
+
+    it('uses correct TTL when expire header exists', () => {
+      const clock = sinon.useFakeTimers();
+      clock.tick(2000);
+      const resp = buildOpenRtbBidResponse(ADTYPE_IMG);
+      resp.headers.get = (header) => {
+        if (header === 'X-SMT-ADTYPE') {
+          return ADTYPE_IMG;
+        }
+        if (header === 'X-SMT-Expires') {
+          return 2000 + (400 * 1000);
+        }
+      }
+
+      const bids = spec.interpretResponse(resp, request);
+
+      expect(bids[0].ttl).to.equal(400);
+
+      clock.restore();
+    });
+
+    it('uses net revenue flag send from server', () => {
+      const resp = buildOpenRtbBidResponse(ADTYPE_IMG);
+      resp.body.seatbid[0].bid[0].ext = {net: false};
+
+      const bids = spec.interpretResponse(resp, request);
+
+      expect(bids[0].netRevenue).to.equal(false);
+    })
+  });
+
+  describe('getUserSyncs', () => {
+    it('returns no pixels', () => {
+      expect(spec.getUserSyncs()).to.be.empty
+    })
+  })
+});
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
index 2faad47aca8..f9206740535 100644
--- a/test/spec/modules/smartadserverBidAdapter_spec.js
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -71,7 +71,7 @@ describe('Smart bid adapter tests', function () {
       britepoolid: '1111',
       criteoId: '1111',
       digitrustid: { data: { id: 'DTID', keyv: 4, privacy: { optout: false }, producer: 'ABC', version: 2 } },
-      id5id: '1111',
+      id5id: { uid: '1111' },
       idl_env: '1111',
       lipbid: '1111',
       parrableid: 'eidVersion.encryptionKeyReference.encryptedValue',
@@ -115,7 +115,41 @@ describe('Smart bid adapter tests', function () {
       ttl: 300,
       adUrl: 'http://awesome.fake.url',
       ad: '< --- awesome script --- >',
-      cSyncUrl: 'http://awesome.fake.csync.url'
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false
+    }
+  };
+
+  var BID_RESPONSE_IS_NO_AD = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: true
+    }
+  };
+
+  var BID_RESPONSE_IMAGE_SYNC = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >',
+      cSyncUrl: 'http://awesome.fake.csync.url',
+      isNoAd: false,
+      dspPixels: ['pixelOne', 'pixelTwo', 'pixelThree']
     }
   };
 
@@ -149,6 +183,18 @@ describe('Smart bid adapter tests', function () {
     expect(requestContent).to.have.property('ckid').and.to.equal(42);
   });
 
+  it('Verify parse response with no ad', function () {
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE_IS_NO_AD, request[0]);
+    expect(bids).to.have.lengthOf(0);
+
+    expect(function () {
+      spec.interpretResponse(BID_RESPONSE_IS_NO_AD, {
+        data: 'invalid Json'
+      })
+    }).to.not.throw();
+  });
+
   it('Verify parse response', function () {
     const request = spec.buildRequests(DEFAULT_PARAMS);
     const bids = spec.interpretResponse(BID_RESPONSE, request[0]);
@@ -258,6 +304,27 @@ describe('Smart bid adapter tests', function () {
     expect(syncs).to.have.lengthOf(0);
   });
 
+  it('Verifies user sync using dspPixels', function () {
+    var syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(3);
+    expect(syncs[0].type).to.equal('image');
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: false
+    }, [BID_RESPONSE_IMAGE_SYNC]);
+    expect(syncs).to.have.lengthOf(0);
+
+    syncs = spec.getUserSyncs({
+      iframeEnabled: false,
+      pixelEnabled: true
+    }, []);
+    expect(syncs).to.have.lengthOf(0);
+  });
+
   describe('gdpr tests', function () {
     afterEach(function () {
       config.resetConfig();
@@ -425,6 +492,7 @@ describe('Smart bid adapter tests', function () {
       expect(bid.mediaType).to.equal('video');
       expect(bid.vastUrl).to.equal('http://awesome.fake-vast.url');
       expect(bid.vastXml).to.equal('');
+      expect(bid.content).to.equal('');
       expect(bid.width).to.equal(640);
       expect(bid.height).to.equal(480);
       expect(bid.creativeId).to.equal('zioeufg');
@@ -471,6 +539,357 @@ describe('Smart bid adapter tests', function () {
       expect(request[0]).to.be.empty;
       expect(request[1]).to.not.be.empty;
     });
+
+    describe('Instream videoData meta & params tests', function () {
+      it('Verify videoData assigns values from meta', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+              protocols: [8, 2],
+              startdelay: 0
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(8);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(1);
+      });
+
+      it('Verify videoData default values assigned', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]] // It seems prebid.js transforms the player size array into an array of array...
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(null);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(2);
+      });
+
+      it('Verify videoData params override meta values', function () {
+        config.setConfig({
+          'currency': {
+            'adServerCurrency': 'EUR'
+          }
+        });
+        const request = spec.buildRequests([{
+          adUnitCode: 'sas_42',
+          bidId: 'abcd1234',
+          bidder: 'smartadserver',
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+              protocols: [8, 2],
+              startdelay: 0
+            }
+          },
+          params: {
+            siteId: '1234',
+            pageId: '5678',
+            formatId: '90',
+            target: 'test=prebid',
+            bidfloor: 0.420,
+            buId: '7569',
+            appName: 'Mozilla',
+            ckId: 42,
+            video: {
+              protocol: 6,
+              startDelay: 3
+            }
+          },
+          requestId: 'efgh5678',
+          transactionId: 'zsfgzzg'
+        }]);
+
+        expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+        expect(request[0]).to.have.property('method').and.to.equal('POST');
+        const requestContent = JSON.parse(request[0].data);
+        expect(requestContent).to.have.property('videoData');
+        expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
+        expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(3);
+      });
+    });
+  });
+
+  describe('Outstream video tests', function () {
+    afterEach(function () {
+      config.resetConfig();
+      $$PREBID_GLOBAL$$.requestBids.removeAll();
+    });
+
+    const OUTSTREAM_DEFAULT_PARAMS = [{
+      adUnitCode: 'sas_43',
+      bidId: 'abcd1234',
+      bidder: 'smartadserver',
+      mediaTypes: {
+        video: {
+          context: 'outstream',
+          playerSize: [[800, 600]] // It seems prebid.js transforms the player size array into an array of array...
+        }
+      },
+      params: {
+        siteId: '1234',
+        pageId: '5678',
+        formatId: '91',
+        target: 'test=prebid-outstream',
+        bidfloor: 0.430,
+        buId: '7579',
+        appName: 'Mozilla',
+        ckId: 43,
+        video: {
+          protocol: 7
+        }
+      },
+      requestId: 'efgh5679',
+      transactionId: 'zsfgzzga'
+    }];
+
+    var OUTSTREAM_BID_RESPONSE = {
+      body: {
+        cpm: 14,
+        width: 800,
+        height: 600,
+        creativeId: 'zioeufga',
+        currency: 'USD',
+        isNetCpm: true,
+        ttl: 300,
+        adUrl: 'http://awesome.fake-vast2.url',
+        ad: '',
+        cSyncUrl: 'http://awesome.fake2.csync.url'
+      }
+    };
+
+    it('Verify outstream video build request', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests(OUTSTREAM_DEFAULT_PARAMS);
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('siteid').and.to.equal('1234');
+      expect(requestContent).to.have.property('pageid').and.to.equal('5678');
+      expect(requestContent).to.have.property('formatid').and.to.equal('91');
+      expect(requestContent).to.have.property('currencyCode').and.to.equal('EUR');
+      expect(requestContent).to.have.property('bidfloor').and.to.equal(0.43);
+      expect(requestContent).to.have.property('targeting').and.to.equal('test=prebid-outstream');
+      expect(requestContent).to.have.property('tagId').and.to.equal('sas_43');
+      expect(requestContent).to.not.have.property('pageDomain');
+      expect(requestContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+      expect(requestContent).to.have.property('buid').and.to.equal('7579');
+      expect(requestContent).to.have.property('appname').and.to.equal('Mozilla');
+      expect(requestContent).to.have.property('ckid').and.to.equal(43);
+      expect(requestContent).to.have.property('isVideo').and.to.equal(false);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(7);
+      expect(requestContent.videoData).to.have.property('playerWidth').and.to.equal(800);
+      expect(requestContent.videoData).to.have.property('playerHeight').and.to.equal(600);
+    });
+
+    it('Verify outstream parse response', function () {
+      const request = spec.buildRequests(OUTSTREAM_DEFAULT_PARAMS);
+      const bids = spec.interpretResponse(OUTSTREAM_BID_RESPONSE, request[0]);
+      expect(bids).to.have.lengthOf(1);
+      const bid = bids[0];
+      expect(bid.cpm).to.equal(14);
+      expect(bid.mediaType).to.equal('video');
+      expect(bid.vastUrl).to.equal('http://awesome.fake-vast2.url');
+      expect(bid.vastXml).to.equal('');
+      expect(bid.content).to.equal('');
+      expect(bid.width).to.equal(800);
+      expect(bid.height).to.equal(600);
+      expect(bid.creativeId).to.equal('zioeufga');
+      expect(bid.currency).to.equal('USD');
+      expect(bid.netRevenue).to.equal(true);
+      expect(bid.ttl).to.equal(300);
+      expect(bid.requestId).to.equal(OUTSTREAM_DEFAULT_PARAMS[0].bidId);
+
+      expect(function () {
+        spec.interpretResponse(OUTSTREAM_BID_RESPONSE, {
+          data: 'invalid Json'
+        })
+      }).to.not.throw();
+    });
+  });
+
+  describe('Outstream videoData meta & params tests', function () {
+    it('Verify videoData assigns values from meta', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+            protocols: [8, 2],
+            startdelay: 0
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(8);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(1);
+    });
+
+    it('Verify videoData default values assigned', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]] // It seems prebid.js transforms the player size array into an array of array...
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(null);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(2);
+    });
+
+    it('Verify videoData params override meta values', function () {
+      config.setConfig({
+        'currency': {
+          'adServerCurrency': 'EUR'
+        }
+      });
+      const request = spec.buildRequests([{
+        adUnitCode: 'sas_42',
+        bidId: 'abcd1234',
+        bidder: 'smartadserver',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 480]], // It seems prebid.js transforms the player size array into an array of array...
+            protocols: [8, 2],
+            startdelay: 0
+          }
+        },
+        params: {
+          siteId: '1234',
+          pageId: '5678',
+          formatId: '90',
+          target: 'test=prebid-outstream',
+          bidfloor: 0.420,
+          buId: '7569',
+          appName: 'Mozilla',
+          ckId: 42,
+          video: {
+            protocol: 6,
+            startDelay: 3
+          }
+        },
+        requestId: 'efgh5678',
+        transactionId: 'zsfgzzg'
+      }]);
+
+      expect(request[0]).to.have.property('url').and.to.equal('https://prg.smartadserver.com/prebid/v1');
+      expect(request[0]).to.have.property('method').and.to.equal('POST');
+      const requestContent = JSON.parse(request[0].data);
+      expect(requestContent).to.have.property('videoData');
+      expect(requestContent.videoData).to.have.property('videoProtocol').and.to.equal(6);
+      expect(requestContent.videoData).to.have.property('adBreak').and.to.equal(3);
+    });
   });
 
   describe('External ids tests', function () {
diff --git a/test/spec/modules/smarticoBidAdapter_spec.js b/test/spec/modules/smarticoBidAdapter_spec.js
new file mode 100644
index 00000000000..e8ca5b0e127
--- /dev/null
+++ b/test/spec/modules/smarticoBidAdapter_spec.js
@@ -0,0 +1,118 @@
+import {expect} from 'chai';
+import {spec} from 'modules/smarticoBidAdapter.js';
+import {newBidder} from 'src/adapters/bidderFactory.js';
+
+describe('smarticoBidAdapter', function () {
+  const adapter = newBidder(spec);
+  let bid = {
+    adUnitCode: 'adunit-code',
+    auctionId: '5kaj89l8-3456-2s56-c455-4g6h78jsdfgf',
+    bidRequestsCount: 1,
+    bidder: 'smartico',
+    bidderRequestId: '24081afs940568',
+    bidderRequestsCount: 1,
+    bidderWinsCount: 0,
+    bidId: '22499d052045',
+    mediaTypes: {banner: {sizes: [[300, 250]]}},
+    params: {
+      token: 'FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya',
+      placementId: 'testPlacementId'
+    },
+    sizes: [
+      [300, 250]
+    ],
+    transactionId: '34562345-4dg7-46g7-4sg6-45gdsdj8fd56'
+  }
+  let bidderRequests = {
+    auctionId: 'b06c5141-fe8f-4cdf-9d7d-54415490a917',
+    auctionStart: 1579746300522,
+    bidderCode: 'myBidderCode',
+    bidderRequestId: '15246a574e859f',
+    bids: [bid],
+    refererInfo: {
+      canonicalUrl: '',
+      numIframes: 0,
+      reachedTop: true
+    }
+  }
+  describe('isBidRequestValid', function () {
+    it('should return true where required params found', function () {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  });
+  describe('buildRequests', function () {
+    let bidRequests = [ bid ];
+    let request = spec.buildRequests(bidRequests, bidderRequests);
+    it('sends bid request via POST', function () {
+      expect(request.method).to.equal('POST');
+    });
+    it('must contain token', function() {
+      expect(request.data.bidParams[0].token).to.equal('FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya');
+    });
+    it('must contain auctionId', function() {
+      expect(request.data.auctionId).to.exist.and.to.be.a('string')
+    });
+    it('must contain valid width and height', function() {
+      expect(request.data.bidParams[0]['banner-format-width']).to.exist.and.to.be.a('number')
+      expect(request.data.bidParams[0]['banner-format-height']).to.exist.and.to.be.a('number')
+    });
+  });
+
+  describe('interpretResponse', function () {
+    let bidRequest = {
+      method: 'POST',
+      url: 'https://trmads.eu/preBidRequest',
+      bids: [bid],
+      data: [{
+        token: 'FNVzUGZn9ebpIOoheh3kEJ2GQ6H6IyMH39sHXaya',
+        bidId: '22499d052045',
+        'banner-format-width': 300,
+        'banner-format-height': 250,
+        placementId: 'testPlacementId',
+      }]
+    };
+    let serverResponse = [{
+      bidId: '22499d052045',
+      id: 987654,
+      cpm: 10,
+      ttl: 30,
+      bannerFormatWidth: 300,
+      bannerFormatHeight: 250,
+      bannerFormatAlias: 'medium_rectangle'
+    }];
+    let expectedResponse = [{
+      requestId: bid.bidId,
+      cpm: 10,
+      width: 300,
+      height: 250,
+      creativeId: 987654,
+      netRevenue: false, // gross
+      ttl: 30,
+      ad: '',
-      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}'
+      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}',
+      w: 300,
+      h: 250
     };
     let bidResponse2 = {
       id: '10865933907263800~9999~0',
-      impid: 'b9876abcd-300x600',
+      impid: 'b9876abcd',
       price: 1.99,
       crid: '9993-013',
       adm: '',
-      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=${AUCTION_PRICE}'
+      nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=OTk5OX4wJkFVQ1RJT05fU0VBVF9JR&AUCTION_PRICE=${AUCTION_PRICE}',
+      w: 300,
+      h: 600
     };
 
+    let bidRequest = {
+      data: {
+        id: '',
+        imp: [
+          {
+            id: 'abc123',
+            banner: {
+              format: [
+                {
+                  w: 400,
+                  h: 350
+                }
+              ],
+              pos: 1
+            }
+          }
+        ],
+      },
+      method: 'POST',
+      options: {
+        contentType: 'application/json',
+        withCredentials: true
+      },
+      url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+    };
     let serverResponse;
-    beforeEach(function() {
+    beforeEach(function () {
       serverResponse = {
         body: {
           id: 'abc123',
@@ -697,6 +930,26 @@ describe('synacormediaBidAdapter ', function () {
     });
 
     it('should return 1 video bid when 1 bid is in the video response', function () {
+      bidRequest = {
+        data: {
+          id: 'abcd1234',
+          imp: [
+            {
+              video: {
+                w: 640,
+                h: 480
+              },
+              id: 'v2da7322b2df61f'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
       let serverRespVideo = {
         body: {
           id: 'abcd1234',
@@ -705,14 +958,16 @@ describe('synacormediaBidAdapter ', function () {
               bid: [
                 {
                   id: '11339128001692337~9999~0',
-                  impid: 'v2da7322b2df61f-640x480',
+                  impid: 'v2da7322b2df61f',
                   price: 0.45,
                   nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
                   adm: '\n\n\n\nSynacor Media Ad Server - 9999\nhttps://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}\n\n\n',
-                  adomain: [ 'psacentral.org' ],
+                  adomain: ['psacentral.org'],
                   cid: 'bidder-crid',
                   crid: 'bidder-cid',
-                  cat: []
+                  cat: [],
+                  w: 640,
+                  h: 480
                 }
               ],
               seat: '9999'
@@ -722,11 +977,10 @@ describe('synacormediaBidAdapter ', function () {
       };
 
       // serverResponse.body.seatbid[0].bid.push(bidResponse);
-      let resp = spec.interpretResponse(serverRespVideo);
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(1);
       expect(resp[0]).to.eql({
         requestId: '2da7322b2df61f',
-        adId: '11339128001692337-9999-0',
         cpm: 0.45,
         width: 640,
         height: 480,
@@ -736,6 +990,7 @@ describe('synacormediaBidAdapter ', function () {
         mediaType: 'video',
         ad: '\n\n\n\nSynacor Media Ad Server - 9999\nhttps://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45\n\n\n',
         ttl: 60,
+        meta: { advertiserDomains: ['psacentral.org'] },
         videoCacheKey: 'QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk',
         vastUrl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45'
       });
@@ -743,11 +998,10 @@ describe('synacormediaBidAdapter ', function () {
 
     it('should return 1 bid when 1 bid is in the response', function () {
       serverResponse.body.seatbid[0].bid.push(bidResponse);
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(1);
       expect(resp[0]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263896-9998-0',
         cpm: 0.13,
         width: 300,
         height: 250,
@@ -766,11 +1020,10 @@ describe('synacormediaBidAdapter ', function () {
         seat: '9999',
         bid: [bidResponse2],
       });
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').to.have.lengthOf(2);
       expect(resp[0]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263896-9998-0',
         cpm: 0.13,
         width: 300,
         height: 250,
@@ -784,7 +1037,6 @@ describe('synacormediaBidAdapter ', function () {
 
       expect(resp[1]).to.eql({
         requestId: '9876abcd',
-        adId: '10865933907263800-9999-0',
         cpm: 1.99,
         width: 300,
         height: 600,
@@ -798,7 +1050,7 @@ describe('synacormediaBidAdapter ', function () {
     });
 
     it('should not return a bid when no bid is in the response', function () {
-      let resp = spec.interpretResponse(serverResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
       expect(resp).to.be.an('array').that.is.empty;
     });
 
@@ -817,14 +1069,16 @@ describe('synacormediaBidAdapter ', function () {
               bid: [
                 {
                   id: '11339128001692337~9999~0',
-                  impid: 'v2da7322b2df61f-640x480',
+                  impid: 'v2da7322b2df61f',
                   price: 0.45,
                   nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
                   adm: '\n\n\n\nSynacor Media Ad Server - 9999\nhttps://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}\n\n\n',
-                  adomain: [ 'psacentral.org' ],
+                  adomain: ['psacentral.org'],
                   cid: 'bidder-crid',
                   crid: 'bidder-cid',
-                  cat: []
+                  cat: [],
+                  w: 640,
+                  h: 480
                 }
               ],
               seat: '9999'
@@ -840,9 +1094,123 @@ describe('synacormediaBidAdapter ', function () {
         return config[key];
       });
 
-      let resp = spec.interpretResponse(serverRespVideo);
-	  sandbox.restore();
-	  expect(resp[0].videoCacheKey).to.not.exist;
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
+      sandbox.restore();
+      expect(resp[0].videoCacheKey).to.not.exist;
+    });
+
+    it('should use video bid request height and width if not present in response', function () {
+      bidRequest = {
+        data: {
+          id: 'abcd1234',
+          imp: [
+            {
+              video: {
+                w: 300,
+                h: 250
+              },
+              id: 'v2da7322b2df61f'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
+
+      let serverRespVideo = {
+        body: {
+          id: 'abcd1234',
+          seatbid: [
+            {
+              bid: [
+                {
+                  id: '11339128001692337~9999~0',
+                  impid: 'v2da7322b2df61f',
+                  price: 0.45,
+                  nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}',
+                  adm: '\n\n\n\nSynacor Media Ad Server - 9999\nhttps://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=${AUCTION_PRICE}\n\n\n',
+                  adomain: ['psacentral.org'],
+                  cid: 'bidder-crid',
+                  crid: 'bidder-cid',
+                  cat: []
+                }
+              ],
+              seat: '9999'
+            }
+          ]
+        }
+      };
+      let resp = spec.interpretResponse(serverRespVideo, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.eql({
+        requestId: '2da7322b2df61f',
+        cpm: 0.45,
+        width: 300,
+        height: 250,
+        creativeId: '9999_bidder-cid',
+        currency: 'USD',
+        netRevenue: true,
+        mediaType: 'video',
+        ad: '\n\n\n\nSynacor Media Ad Server - 9999\nhttps://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45\n\n\n',
+        ttl: 60,
+        meta: { advertiserDomains: ['psacentral.org'] },
+        videoCacheKey: 'QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk',
+        vastUrl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=QVVDVElPTl9JRD1lOTBhYWU1My1hZDkwLTRkNDEtYTQxMC1lZDY1MjIxMDc0ZGMmQVVDVElPTl9CSURfSUQ9MTEzMzkxMjgwMDE2OTIzMzd-OTk5OX4wJkFVQ1RJT05fU0VBVF9JRD05OTk5JkFVQ1RJT05fSU1QX0lEPXYyZGE3MzIyYjJkZjYxZi02NDB4NDgwJkFDVE9SX1JFRj1ha2thLnRjcDovL2F3cy1lYXN0MUBhZHMxMy5jYXAtdXNlMS5zeW5hY29yLmNvbToyNTUxL3VzZXIvJGNMYmZiIy0xOTk4NTIzNTk3JlNFQVRfSUQ9cHJlYmlk&AUCTION_PRICE=0.45'
+      });
+    });
+
+    it('should use banner bid request height and width if not present in response', function () {
+      bidRequest = {
+        data: {
+          id: 'abc123',
+          imp: [
+            {
+              banner: {
+                format: [{
+                  w: 400,
+                  h: 350
+                }]
+              },
+              id: 'babc123'
+            }
+          ]
+        },
+        method: 'POST',
+        options: {
+          contentType: 'application/json',
+          withCredentials: true
+        },
+        url: 'https://prebid.technoratimedia.com/openrtb/bids/prebid?src=prebid_prebid_3.27.0-pre'
+      };
+
+      bidResponse = {
+        id: '10865933907263896~9998~0',
+        impid: 'babc123',
+        price: 0.13,
+        crid: '1022-250',
+        adm: '',
+        nurl: 'https://uat-net.technoratimedia.com/openrtb/tags?ID=k5JkFVQ1RJT05fSU1QX0lEPXYyZjczN&AUCTION_PRICE=${AUCTION_PRICE}',
+      };
+
+      serverResponse.body.seatbid[0].bid.push(bidResponse);
+      let resp = spec.interpretResponse(serverResponse, bidRequest);
+      expect(resp).to.be.an('array').to.have.lengthOf(1);
+      expect(resp[0]).to.eql({
+        requestId: 'abc123',
+        cpm: 0.13,
+        width: 400,
+        height: 350,
+        creativeId: '9998_1022-250',
+        currency: 'USD',
+        netRevenue: true,
+        mediaType: BANNER,
+        ad: '',
+        ttl: 60
+      });
     });
   });
   describe('getUserSyncs', function () {
diff --git a/test/spec/modules/tapadIdSystem_spec.js b/test/spec/modules/tapadIdSystem_spec.js
new file mode 100644
index 00000000000..bc31f1d37ba
--- /dev/null
+++ b/test/spec/modules/tapadIdSystem_spec.js
@@ -0,0 +1,65 @@
+import { tapadIdSubmodule, graphUrl } from 'modules/tapadIdSystem.js';
+import * as utils from 'src/utils.js';
+
+import { server } from 'test/mocks/xhr.js';
+
+describe('TapadIdSystem', function () {
+  describe('getId', function() {
+    const config = { params: { companyId: 12345 } };
+    it('should call to real time graph endpoint and handle valid response', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+      expect(request.url).to.eq(`${graphUrl}?company_id=12345&tapad_id_type=TAPAD_ID`);
+
+      request.respond(200, { 'Content-Type': 'application/json' }, JSON.stringify({ tapadId: 'your-tapad-id' }));
+      expect(callbackSpy.lastCall.lastArg).to.eq('your-tapad-id');
+    });
+
+    it('should remove stored tapadId if not found', function() {
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(404);
+      expect(callbackSpy.lastCall.lastArg).to.be.undefined;
+    });
+
+    it('should log message with invalid company id', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId(config).callback;
+      callback(callbackSpy);
+
+      const request = server.requests[0];
+
+      request.respond(403);
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Invalid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id not given', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({}).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+
+    it('should log message if company id is incorrect format', function() {
+      const logMessageSpy = sinon.spy(utils, 'logMessage');
+      const callbackSpy = sinon.spy();
+      const callback = tapadIdSubmodule.getId({ params: { companyId: 'notANumber' } }).callback;
+      callback(callbackSpy);
+
+      expect(logMessageSpy.lastCall.lastArg).to.eq('Please provide a valid Company Id. Contact prebid@tapad.com for assistance.');
+      logMessageSpy.restore();
+    });
+  });
+})
diff --git a/test/spec/modules/tappxBidAdapter_spec.js b/test/spec/modules/tappxBidAdapter_spec.js
new file mode 100644
index 00000000000..c4e0329de17
--- /dev/null
+++ b/test/spec/modules/tappxBidAdapter_spec.js
@@ -0,0 +1,417 @@
+import { assert } from 'chai';
+import { spec } from 'modules/tappxBidAdapter.js';
+import { _checkParamDataType, _getHostInfo } from '../../../modules/tappxBidAdapter.js';
+
+const c_BIDREQUEST = {
+  data: {
+  },
+  bids: [
+    {
+      bidder: 'tappx',
+      params: {
+        host: 'testing.ssp.tappx.com\/rtb\/v2\/',
+        tappxkey: 'pub-1234-android-1234',
+        endpoint: 'ZZ1234PBJS',
+        bidfloor: 0.05
+      },
+      crumbs: {
+        pubcid: 'df2144f7-673f-4440-83f5-cd4a73642d99'
+      },
+      fpd: {
+        context: {
+          adServer: {
+            name: 'gam',
+            adSlot: '/19968336/header-bid-tag-0'
+          },
+          pbAdSlot: '/19968336/header-bid-tag-0',
+        },
+      },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [
+              320,
+              480
+            ]
+          ]
+        }
+      },
+      adUnitCode: 'div-1',
+      transactionId: '47dd44e8-e7db-417c-a8f1-621a2e1a117d',
+      sizes: [
+        [
+          320,
+          480
+        ]
+      ],
+      bidId: '2170932097e505',
+      bidderRequestId: '140ba7a1ab7aeb',
+      auctionId: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+      src: 'client',
+      bidRequestsCount: 1,
+      bidderRequestsCount: 1,
+      bidderWinsCount: 0,
+    }
+  ]
+};
+const c_SERVERRESPONSE_B = {
+  body: {
+    id: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+    bidid: 'bid3811165568213389257',
+    seatbid: [
+      {
+        seat: '1',
+        group: 0,
+        bid: [
+          {
+            id: '3811165568213389257',
+            impid: 1,
+            price: 0.05,
+            adm: "\t",
+            w: 320,
+            h: 480,
+            lurl: 'http://testing.ssp.tappx.com/rtb/RTBv2Loss?id=3811165568213389257&ep=ZZ1234PBJS&au=test&bu=localhost&sz=320x480&pu=0.005&pt=0.01&cid=&crid=&adv=&aid=${AUCTION_ID}&bidid=${AUCTION_BID_ID}&impid=${AUCTION_IMP_ID}&sid=${AUCTION_SEAT_ID}&adid=${AUCTION_AD_ID}&ap=${AUCTION_PRICE}&cur=${AUCTION_CURRENCY}&mbr=${AUCTION_MBR}&l=${AUCTION_LOSS}',
+            cid: '01744fbb521e9fb10ffea926190effea',
+            crid: 'a13cf884e66e7c660afec059c89d98b6',
+            adomain: [
+            ],
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  },
+  headers: {}
+};
+
+const c_SERVERRESPONSE_V = {
+  body: {
+    id: '1c54b4f1-645f-44e6-b8ae-5d43c923ef1c',
+    bidid: 'bid3811165568213389257',
+    seatbid: [
+      {
+        seat: '1',
+        group: 0,
+        bid: [
+          {
+            id: '3811165568213389257',
+            impid: 1,
+            price: 0.05,
+            adm: "Tappx<\/AdSystem>Tappx<\/AdTitle><\/Impression><\/Error>00:00:22<\/Duration><\/Tracking><\/Tracking><\/Tracking><\/Tracking><\/Tracking><\/Tracking><\/Tracking><\/TrackingEvents><\/ClickThrough><\/ClickTracking><\/VideoClicks><\/MediaFile><\/MediaFiles><\/Linear><\/Creative><\/Creatives><\/InLine><\/Ad><\/VAST>",
+            'lurl': 'https:\/\/ssp.api.tappx.com\/rtb\/RTBv2Loss?id=5001829913749291152&ep=VZ12TESTCTV&au=test&bu=localhost&sz=6x6&pu=0.005&pt=0.01&cid=&crid=&adv=&aid=${AUCTION_ID}&bidid=${AUCTION_BID_ID}&impid=${AUCTION_IMP_ID}&sid=${AUCTION_SEAT_ID}&adid=${AUCTION_AD_ID}&ap=${AUCTION_PRICE}&cur=${AUCTION_CURRENCY}&mbr=${AUCTION_MBR}&l=${AUCTION_LOSS}',
+            cid: '01744fbb521e9fb10ffea926190effea',
+            crid: 'a13cf884e66e7c660afec059c89d98b6',
+            adomain: [
+            ],
+          },
+        ],
+      },
+    ],
+    cur: 'USD',
+  },
+  headers: {}
+};
+
+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': {'referer': '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}}
+
+describe('Tappx bid adapter', function () {
+  /**
+   * IS REQUEST VALID
+   */
+  describe('isBidRequestValid', function () {
+    it('should return true when required params found', function () {
+      assert.isTrue(spec.isBidRequestValid(c_BIDREQUEST.bids[0]), JSON.stringify(c_BIDREQUEST));
+    });
+
+    it('should return false when params are missing', function () {
+      let badBidRequestParam = JSON.parse(JSON.stringify(c_BIDREQUEST));
+      delete badBidRequestParam.bids[0].params;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestParam.bids[0]));
+    });
+
+    it('should return false when tappxkey is missing', function () {
+      let badBidRequestTpxkey = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestTpxkey.bids[0].params.tappxkey;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestTpxkey.bids[0]));
+    });
+
+    it('should return false when host is missing', function () {
+      let badBidRequestHost = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestHost.bids[0].params.host;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestHost.bids[0]));
+    });
+
+    it('should return false when classic endpoint is missing', function () {
+      let badBidRequestClEp = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestClEp.bids[0].params.endpoint;
+      assert.isFalse(spec.isBidRequestValid(badBidRequestClEp.bids[0]));
+    });
+
+    it('should return true when endpoint is not set for new endpoints', function () {
+      let badBidRequestNwEp = JSON.parse(JSON.stringify(c_BIDREQUEST)); ;
+      delete badBidRequestNwEp.bids[0].params.endpoint;
+      badBidRequestNwEp.bids[0].params.host = 'zztesting.ssp.tappx.com/rtb/v2/';
+      assert.isTrue(spec.isBidRequestValid(badBidRequestNwEp.bids[0]));
+    });
+
+    it('should return false mimes param is missing', function () {
+      let badBidRequest_mimes = c_BIDDERREQUEST_V;
+      delete badBidRequest_mimes.bids.mediaTypes.video;
+      badBidRequest_mimes.bids.mediaTypes.video = {};
+      badBidRequest_mimes.bids.mediaTypes.video.context = 'instream';
+      badBidRequest_mimes.bids.mediaTypes.video.playerSize = [320, 250];
+      assert.isFalse(spec.isBidRequestValid(badBidRequest_mimes.bids), badBidRequest_mimes);
+    });
+
+    it('should return false for not instream requests', function () {
+      let badBidRequest_v = c_BIDDERREQUEST_V;
+      delete badBidRequest_v.bids.mediaTypes.banner;
+      badBidRequest_v.bids.mediaTypes.video = {};
+      badBidRequest_v.bids.mediaTypes.video.context = 'outstream';
+      badBidRequest_v.bids.mediaTypes.video.mimes = [ 'video/mp4', 'application/javascript' ];
+      badBidRequest_v.bids.mediaTypes.video.playerSize = [320, 250];
+      assert.isFalse(spec.isBidRequestValid(badBidRequest_v.bids));
+    });
+  });
+
+  /**
+   * BUILD REQUEST TEST
+   */
+  describe('buildRequest', function () {
+    // Web Test
+    let validBidRequests = c_VALIDBIDREQUESTS;
+    let validBidRequests_V = c_VALIDBIDREQUESTS;
+    // App Test
+    let validAppBidRequests = c_VALIDBIDAPPREQUESTS;
+
+    let bidderRequest = c_BIDDERREQUEST_B;
+    let bidderRequest_V = c_BIDDERREQUEST_V;
+
+    it('should add gdpr/usp consent information to the request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      const payload = JSON.parse(request[0].data);
+
+      expect(payload.regs.gdpr).to.exist.and.to.be.true;
+      expect(payload.user.ext.consent).to.exist.and.to.equal(c_CONSENTSTRING);
+      expect(payload.regs.ext.us_privacy).to.exist;
+    });
+
+    it('should properly build a banner request', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should properly build a video request', function () {
+      const request = spec.buildRequests(validBidRequests_V, bidderRequest_V);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should set user eids array', function () {
+      const request = spec.buildRequests(validBidRequests, bidderRequest);
+
+      const data = JSON.parse(request[0].data);
+      expect(data.user.ext.eids, data).to.not.be.null;
+      expect(data.user.ext.eids[0]).to.have.keys(['source', 'uids']);
+    });
+
+    it('should properly build a banner request with app params', function () {
+      const request = spec.buildRequests(validAppBidRequests, bidderRequest);
+      expect(request[0].url).to.match(/^(http|https):\/\/(.*)\.tappx\.com\/.+/);
+      expect(request[0].method).to.equal('POST');
+
+      const data = JSON.parse(request[0].data);
+      expect(data.site).to.not.equal(null);
+      expect(data.imp).to.have.lengthOf(1);
+      expect(data.imp[0].bidfloor, data).to.not.be.null;
+      expect(data.imp[0].banner).to.not.equal(null);
+      expect(data.imp[0].banner.w).to.be.oneOf([320, 50, 250, 480]);
+      expect(data.imp[0].banner.h).to.be.oneOf([320, 50, 250, 480]);
+    });
+
+    it('should properly build a ext optional object', function() {
+      let extBidRequest = c_VALIDBIDREQUESTS;
+      extBidRequest[0].params.ext = {'optionalData': '1234'};
+      let extBidderRequest = c_BIDDERREQUEST_B;
+      extBidderRequest.bids[0].ext = {'optionalData': '1234'};
+
+      const request = spec.buildRequests(extBidRequest, extBidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.imp[0].ext.bidder.ext).to.be.an('object');
+      expect(data.imp[0].ext.bidder.ext.optionalData).to.be.equal('1234');
+    });
+
+    it('should ignore ext optional if is not a object', function() {
+      let badExtBidRequest = c_VALIDBIDREQUESTS;
+      badExtBidRequest[0].params.ext = 'stringValue';
+      let badExtBidderRequest = c_BIDDERREQUEST_B;
+      badExtBidderRequest.bids[0].ext = 'stringValue';
+
+      const request = spec.buildRequests(badExtBidRequest, badExtBidderRequest);
+      const data = JSON.parse(request[0].data);
+      expect(data.imp[0].ext.bidder.ext).not.to.be.an('string');
+      expect(data.imp[0].ext.bidder.ext).to.be.an('undefined');
+      expect(data.imp[0].ext.bidder).to.not.have.property('ext')
+    });
+  });
+
+  /**
+   * INTERPRET RESPONSE TESTS
+   */
+  describe('interpretResponse', function () {
+    it('receive banner reponse with single placement', 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(/^',
+          'ttl': 700,
+          'ad': ''
+        }
+      ];
+      let request = spec.buildRequests(bidRequests)[0];
+      let result = spec.interpretResponse({body: response}, request);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(result[0].cpm).to.not.equal(null);
+      expect(result[0].creativeId).to.not.equal(null);
+      expect(result[0].ad).to.not.equal(null);
+      expect(result[0].currency).to.equal('TRY');
+      expect(result[0].netRevenue).to.equal(false);
+    });
+  })
+})
diff --git a/test/spec/modules/trionBidAdapter_spec.js b/test/spec/modules/trionBidAdapter_spec.js
index 596e8a3e2d9..0fc03caa563 100644
--- a/test/spec/modules/trionBidAdapter_spec.js
+++ b/test/spec/modules/trionBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import {expect} from 'chai';
 import * as utils from 'src/utils.js';
 import {spec, acceptPostMessage, getStorageData, setStorageData} from 'modules/trionBidAdapter.js';
+import {deepClone} from 'src/utils.js';
 
 const CONSTANTS = require('src/constants.json');
 const adloader = require('src/adloader');
@@ -146,47 +147,47 @@ describe('Trion adapter tests', function () {
       expect(bidUrlParams).to.include(getPublisherUrl());
     });
 
-    describe('webdriver', function () {
-      let originalWD;
-
-      beforeEach(function () {
-        originalWD = window.navigator.webdriver;
-      });
-
-      afterEach(function () {
-        window.navigator['__defineGetter__']('webdriver', function () {
-          return originalWD;
-        });
-      });
-
-      describe('is present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 1;
-          });
-        });
-
-        it('when there is non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=1');
-        });
-      });
-
-      describe('is not present', function () {
-        beforeEach(function () {
-          window.navigator['__defineGetter__']('webdriver', function () {
-            return 0;
-          });
-        });
-
-        it('when there is not non human traffic', function () {
-          let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
-          let bidUrlParams = bidRequests[0].data;
-          expect(bidUrlParams).to.include('tr_wd=0');
-        });
-      });
-    });
+    // describe('webdriver', function () {
+    //   let originalWD;
+
+    //   beforeEach(function () {
+    //     originalWD = window.navigator.webdriver;
+    //   });
+
+    //   afterEach(function () {
+    //     window.navigator['__defineGetter__']('webdriver', function () {
+    //       return originalWD;
+    //     });
+    //   });
+
+    //   describe('is present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 1;
+    //       });
+    //     });
+
+    //     it('when there is non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=1');
+    //     });
+    //   });
+
+    //   describe('is not present', function () {
+    //     beforeEach(function () {
+    //       window.navigator['__defineGetter__']('webdriver', function () {
+    //         return 0;
+    //       });
+    //     });
+
+    //     it('when there is not non human traffic', function () {
+    //       let bidRequests = spec.buildRequests(TRION_BID_REQUEST);
+    //       let bidUrlParams = bidRequests[0].data;
+    //       expect(bidUrlParams).to.include('tr_wd=0');
+    //     });
+    //   });
+    // });
 
     describe('document', function () {
       let originalHD;
@@ -316,6 +317,14 @@ describe('Trion adapter tests', function () {
       expect(response[0].cpm).to.equal(bidCpm);
       TRION_BID_RESPONSE.result.cpm = 100;
     });
+
+    it('advertiserDomains is included when sent by server', function () {
+      TRION_BID_RESPONSE.result.adomain = ['test_adomain'];
+      let response = spec.interpretResponse({body: TRION_BID_RESPONSE}, {bidRequest: TRION_BID});
+      expect(Object.keys(response[0].meta)).to.include.members(['advertiserDomains']);
+      expect(response[0].meta.advertiserDomains).to.deep.equal(['test_adomain']);
+      delete TRION_BID_RESPONSE.result.adomain;
+    });
   });
 
   describe('getUserSyncs', function () {
diff --git a/test/spec/modules/tripleliftBidAdapter_spec.js b/test/spec/modules/tripleliftBidAdapter_spec.js
index 73373293114..30377ec0a5d 100644
--- a/test/spec/modules/tripleliftBidAdapter_spec.js
+++ b/test/spec/modules/tripleliftBidAdapter_spec.js
@@ -4,26 +4,31 @@ import { newBidder } from 'src/adapters/bidderFactory.js';
 import { deepClone } from 'src/utils.js';
 import { config } from 'src/config.js';
 import prebid from '../../../package.json';
+import * as utils from 'src/utils.js';
 
 const ENDPOINT = 'https://tlx.3lift.com/header/auction?';
 const GDPR_CONSENT_STR = 'BOONm0NOONm0NABABAENAa-AAAARh7______b9_3__7_9uz_Kv_K7Vf7nnG072lPVA9LTOQ6gEaY';
 
 describe('triplelift adapter', function () {
   const adapter = newBidder(tripleliftAdapterSpec);
+  let bid, instreamBid;
+  let sandbox;
 
-  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 = {
+  this.beforeEach(() => {
+    bid = {
       bidder: 'triplelift',
       params: {
         inventoryCode: '12345',
         floor: 1.0,
       },
+      mediaTypes: {
+        banner: {
+          sizes: [
+            [970, 250],
+            [1, 1]
+          ]
+        }
+      },
       'adUnitCode': 'adunit-code',
       'sizes': [[300, 250], [300, 600]],
       'bidId': '30b31c1838de1e',
@@ -31,28 +36,70 @@ describe('triplelift adapter', function () {
       'auctionId': '1d1a030790a475',
     };
 
+    instreamBid = {
+      bidder: 'triplelift',
+      params: {
+        inventoryCode: 'insteam_test',
+        floor: 1.0,
+        video: {
+          mimes: ['video/mp4'],
+          maxduration: 30,
+          minduration: 6,
+          w: 640,
+          h: 480
+        }
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 480]
+        }
+      },
+      'adUnitCode': 'adunit-code',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+  })
+
+  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 for valid bid request', function () {
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(true);
     });
 
     it('should return true when required params found', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        inventoryCode: 'another_inv_code',
-        floor: 0.05
-      };
+      bid.params.inventoryCode = 'another_inv_code';
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(true);
     });
 
+    it('should return true when required params found - instream', function () {
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(true);
+    });
+
+    it('should return true when required params found - instream - 2', function () {
+      delete instreamBid.mediaTypes.playerSize;
+      delete instreamBid.params.video.w;
+      delete instreamBid.params.video.h;
+      // the only required param is inventoryCode
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(true);
+    });
+
     it('should return false when required params are not passed', function () {
-      let bid = Object.assign({}, bid);
-      delete bid.params;
-      bid.params = {
-        floor: 1.0
-      };
+      delete bid.params.inventoryCode;
       expect(tripleliftAdapterSpec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('should return false when required params are not passed - instream', function () {
+      delete instreamBid.params.inventoryCode;
+      expect(tripleliftAdapterSpec.isBidRequestValid(instreamBid)).to.equal(false);
+    });
   });
 
   describe('buildRequests', function () {
@@ -81,6 +128,14 @@ describe('triplelift adapter', function () {
             inventoryCode: '12345',
             floor: 1.0,
           },
+          mediaTypes: {
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
           adUnitCode: 'adunit-code',
           sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
           bidId: '30b31c1838de1e',
@@ -88,6 +143,209 @@ describe('triplelift adapter', function () {
           auctionId: '1d1a030790a475',
           userId: {},
           schain,
+          ortb2Imp: {
+            ext: {
+              data: {
+                pbAdSlot: 'homepage-top-rect',
+                adUnitSpecificAttribute: 123
+              }
+            }
+          }
+        },
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'insteam_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [640, 480]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and outstream video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and incomplete video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // incomplete banner and incomplete video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+
+            },
+            banner: {
+
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and instream video
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'instream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
+        },
+        // banner and outream video and native
+        {
+          bidder: 'triplelift',
+          params: {
+            inventoryCode: 'outstream_test',
+            floor: 1.0,
+            video: {
+              mimes: ['video/mp4'],
+              maxduration: 30,
+              minduration: 6,
+              w: 640,
+              h: 480
+            }
+          },
+          mediaTypes: {
+            video: {
+              context: 'outstream',
+              playerSize: [640, 480]
+            },
+            banner: {
+              sizes: [
+                [970, 250],
+                [1, 1]
+              ]
+            },
+            native: {
+
+            }
+          },
+          adUnitCode: 'adunit-code-instream',
+          sizes: [[300, 250], [300, 600], [1, 1, 1], ['flex']],
+          bidId: '30b31c1838de1e',
+          bidderRequestId: '22edbae2733bf6',
+          auctionId: '1d1a030790a475',
+          userId: {},
+          schain,
         }
       ];
 
@@ -103,6 +361,13 @@ describe('triplelift adapter', function () {
             height: 250,
             ad: 'ad-markup',
             iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg'
+          },
+          {
+            imp_id: 1,
+            crid: '10092_76480_i2j6qm8u',
+            cpm: 0.01,
+            ad: 'The Trade Desk',
+            tlx_source: 'hdx'
           }
         ],
         refererInfo: {
@@ -113,6 +378,10 @@ describe('triplelift adapter', function () {
           gdprApplies: true
         },
       };
+      sandbox = sinon.sandbox.create();
+    });
+    afterEach(() => {
+      sandbox.restore();
     });
 
     it('exists and is an object', function () {
@@ -120,6 +389,11 @@ describe('triplelift adapter', function () {
       expect(request).to.exist.and.to.be.a('object');
     });
 
+    it('should be able find video object from the instream request', function () {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[1].video).to.exist.and.to.be.a('object');
+    });
+
     it('should only parse sizes that are of the proper length and format', function () {
       const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].banner.format).to.have.length(2);
@@ -133,6 +407,29 @@ describe('triplelift adapter', function () {
       expect(payload.imp[0].tagid).to.equal('12345');
       expect(payload.imp[0].floor).to.equal(1.0);
       expect(payload.imp[0].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      expect(payload.imp[1].tagid).to.equal('insteam_test');
+      expect(payload.imp[1].floor).to.equal(1.0);
+      expect(payload.imp[1].video).to.exist.and.to.be.a('object');
+      // banner and outstream video
+      expect(payload.imp[2]).to.not.have.property('video');
+      expect(payload.imp[2]).to.have.property('banner');
+      expect(payload.imp[2].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // banner and incomplete video
+      expect(payload.imp[3]).to.not.have.property('video');
+      expect(payload.imp[3]).to.have.property('banner');
+      expect(payload.imp[3].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // incomplete mediatypes.banner and incomplete video
+      expect(payload.imp[4]).to.not.have.property('video');
+      expect(payload.imp[4]).to.have.property('banner');
+      expect(payload.imp[4].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
+      // banner and instream video
+      expect(payload.imp[5]).to.not.have.property('banner');
+      expect(payload.imp[5]).to.have.property('video');
+      expect(payload.imp[5].video).to.exist.and.to.be.a('object');
+      // banner and outream video and native
+      expect(payload.imp[6]).to.not.have.property('video');
+      expect(payload.imp[6]).to.have.property('banner');
+      expect(payload.imp[6].banner.format).to.deep.equal([{w: 300, h: 250}, {w: 300, h: 600}]);
     });
 
     it('should add tdid to the payload if included', function () {
@@ -209,15 +506,16 @@ describe('triplelift adapter', function () {
       });
     });
 
-    it('should add user ids from multiple bid requests', function () {
+    it('should consolidate user ids from multiple bid requests', function () {
       const tdidId = '6bca7f6b-a98a-46c0-be05-6020f7604598';
       const idlEnvId = 'XY6104gr0njcH9UDIR7ysFFJcm2XNpqeJTYslleJ_cMlsFOfZI';
       const criteoId = '53e30ea700424f7bbdd793b02abc5d7';
+      const pubcid = '3261d8ad-435d-481d-abd1-9f1a9ec99f0e';
 
       const bidRequestsMultiple = [
-        { ...bidRequests[0], userId: { tdid: tdidId } },
-        { ...bidRequests[0], userId: { idl_env: idlEnvId } },
-        { ...bidRequests[0], userId: { criteoId: criteoId } }
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } },
+        { ...bidRequests[0], userId: { tdid: tdidId, idl_env: idlEnvId, criteoId, pubcid } }
       ];
 
       const request = tripleliftAdapterSpec.buildRequests(bidRequestsMultiple, bidderRequest);
@@ -252,10 +550,22 @@ describe('triplelift adapter', function () {
                   ext: { rtiPartner: 'criteoId' }
                 }
               ]
+            },
+            {
+              source: 'pubcid.org',
+              uids: [
+                {
+                  id: '3261d8ad-435d-481d-abd1-9f1a9ec99f0e',
+                  ext: { rtiPartner: 'pubcid' }
+                }
+              ]
             }
           ]
         }
       });
+
+      expect(payload.user.ext.eids).to.be.an('array');
+      expect(payload.user.ext.eids).to.have.lengthOf(4);
     });
 
     it('should return a query string for TL call', function () {
@@ -300,79 +610,97 @@ describe('triplelift adapter', function () {
       expect(payload.ext).to.deep.equal(undefined);
     });
     it('should get floor from floors module if available', function() {
-      const floorInfo = {
-        currency: 'USD',
-        floor: 1.99
-      };
+      let floorInfo;
       bidRequests[0].getFloor = () => floorInfo;
-      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // standard float response; expected functionality of floors module
+      floorInfo = { currency: 'USD', floor: 1.99 };
+      let request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].floor).to.equal(1.99);
+
+      // if string response, convert to float
+      floorInfo = { currency: 'USD', floor: '1.99' };
+      request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
       expect(request.data.imp[0].floor).to.equal(1.99);
     });
-  });
+    it('should call getFloor with the correct parameters based on mediaType', function() {
+      bidRequests.forEach(request => {
+        request.getFloor = () => {};
+        sinon.spy(request, 'getFloor')
+      });
 
-  describe('interpretResponse', function () {
-    let response = {
-      body: {
-        bids: [
-          {
-            imp_id: 0,
-            cpm: 1.062,
-            width: 300,
-            height: 250,
-            ad: 'ad-markup',
-            iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-            tl_source: 'tlx',
+      tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+
+      // banner
+      expect(bidRequests[0].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // instream
+      expect(bidRequests[1].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
+
+      // banner and incomplete video (POST will only include banner)
+      expect(bidRequests[3].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'banner',
+        size: '*'
+      })).to.be.true;
+
+      // banner and instream (POST will only include video)
+      expect(bidRequests[5].getFloor.calledWith({
+        currency: 'USD',
+        mediaType: 'video',
+        size: '*'
+      })).to.be.true;
+    });
+    it('should send global config fpd if kvps are available', function() {
+      const sens = null;
+      const category = ['news', 'weather', 'hurricane'];
+      const pmp_elig = 'true';
+      const ortb2 = {
+        site: {
+          pmp_elig: pmp_elig,
+          ext: {
+            data: {
+              category: category
+            }
           }
-        ]
-      }
-    };
-    let bidderRequest = {
-      bidderCode: 'triplelift',
-      auctionId: 'a7ebcd1d-66ff-4b5c-a82c-6a21a6ee5a18',
-      bidderRequestId: '5c55612f99bc11',
-      bids: [
-        {
-          imp_id: 0,
-          cpm: 1.062,
-          width: 300,
-          height: 250,
-          ad: 'ad-markup',
-          iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-          tl_source: 'tlx',
+        },
+        user: {
+          sens: sens,
         }
-      ],
-      refererInfo: {
-        referer: 'https://examplereferer.com'
-      },
-      gdprConsent: {
-        consentString: GDPR_CONSENT_STR,
-        gdprApplies: true
       }
-    };
-
-    it('should get correct bid response', function () {
-      let expectedResponse = [
-        {
-          requestId: '3db3773286ee59',
-          cpm: 1.062,
-          width: 300,
-          height: 250,
-          netRevenue: true,
-          ad: 'ad-markup',
-          creativeId: 29681110,
-          dealId: '',
-          currency: 'USD',
-          ttl: 33,
-          tl_source: 'tlx',
-        }
-      ];
-      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
-      expect(result).to.have.length(1);
-      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      sandbox.stub(config, 'getConfig').callsFake(key => {
+        const config = {
+          ortb2
+        };
+        return utils.deepAccess(config, key);
+      });
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      const { data: payload } = request;
+      expect(payload.ext.fpd.user).to.not.exist;
+      expect(payload.ext.fpd.context.data).to.haveOwnProperty('category');
+      expect(payload.ext.fpd.context).to.haveOwnProperty('pmp_elig');
+    });
+    it('should send ad unit fpd if kvps are available', function() {
+      const request = tripleliftAdapterSpec.buildRequests(bidRequests, bidderRequest);
+      expect(request.data.imp[0].fpd.context).to.haveOwnProperty('data');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('pbAdSlot');
+      expect(request.data.imp[0].fpd.context.data).to.haveOwnProperty('adUnitSpecificAttribute');
+      expect(request.data.imp[1].fpd).to.not.exist;
     });
+  });
 
-    it('should return multiple responses to support SRA', function () {
-      let response = {
+  describe('interpretResponse', function () {
+    let response, bidderRequest;
+    this.beforeEach(() => {
+      response = {
         body: {
           bids: [
             {
@@ -383,20 +711,20 @@ describe('triplelift adapter', function () {
               ad: 'ad-markup',
               iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
               tl_source: 'tlx',
+              advertiser_name: 'fake advertiser name',
+              adomain: ['basspro.com', 'internetalerts.org']
             },
             {
-              imp_id: 0,
-              cpm: 1.9,
-              width: 300,
-              height: 600,
-              ad: 'ad-markup-2',
-              iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-              tl_source: 'tlx',
+              imp_id: 1,
+              crid: '10092_76480_i2j6qm8u',
+              cpm: 9.99,
+              ad: 'The Trade Desk',
+              tlx_source: 'hdx'
             }
           ]
         }
       };
-      let bidderRequest = {
+      bidderRequest = {
         bidderCode: 'triplelift',
         auctionId: 'a7ebcd1d-66ff-4b5c-a82c-6a21a6ee5a18',
         bidderRequestId: '5c55612f99bc11',
@@ -405,19 +733,33 @@ describe('triplelift adapter', function () {
             imp_id: 0,
             cpm: 1.062,
             width: 300,
-            height: 600,
+            height: 250,
             ad: 'ad-markup',
             iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
             tl_source: 'tlx',
+            mediaTypes: {
+              banner: {
+                sizes: [
+                  [970, 250],
+                  [1, 1]
+                ]
+              }
+            },
+            bidId: '30b31c1838de1e',
           },
           {
-            imp_id: 0,
-            cpm: 1.9,
-            width: 300,
-            height: 250,
-            ad: 'ad-markup-2',
-            iurl: 'https://s.adroll.com/a/IYR/N36/IYRN366MFVDITBAGNNT5U6.jpg',
-            tl_source: 'tlx',
+            imp_id: 1,
+            crid: '10092_76480_i2j6qm8u',
+            cpm: 9.99,
+            ad: 'The Trade Desk',
+            tlx_source: 'hdx',
+            mediaTypes: {
+              video: {
+                context: 'instream',
+                playerSize: [640, 480]
+              }
+            },
+            bidId: '30b31c1838de1e',
           }
         ],
         refererInfo: {
@@ -428,8 +770,63 @@ describe('triplelift adapter', function () {
           gdprApplies: true
         }
       };
+    })
+
+    it('should get correct bid response', function () {
+      let expectedResponse = [
+        {
+          requestId: '30b31c1838de1e',
+          cpm: 1.062,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          ad: 'ad-markup',
+          creativeId: 29681110,
+          dealId: '',
+          currency: 'USD',
+          ttl: 33,
+          tl_source: 'tlx',
+          meta: {}
+        },
+        {
+          requestId: '30b31c1838de1e',
+          cpm: 1.062,
+          width: 300,
+          height: 250,
+          netRevenue: true,
+          ad: 'The Trade Desk',
+          creativeId: 29681110,
+          dealId: '',
+          currency: 'USD',
+          ttl: 33,
+          tl_source: 'hdx',
+          mediaType: 'video',
+          vastXml: 'The Trade Desk',
+          meta: {}
+        }
+      ];
       let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
       expect(result).to.have.length(2);
+      expect(Object.keys(result[0])).to.have.members(Object.keys(expectedResponse[0]));
+      expect(Object.keys(result[1])).to.have.members(Object.keys(expectedResponse[1]));
+    });
+
+    it('should return multiple responses to support SRA', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result).to.have.length(2);
+    });
+
+    it('should include the advertiser name in the meta field if available', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.advertiserName).to.equal('fake advertiser name');
+      expect(result[1].meta).to.not.have.key('advertiserName');
+    });
+
+    it('should include the advertiser domain array in the meta field if available', function () {
+      let result = tripleliftAdapterSpec.interpretResponse(response, {bidderRequest});
+      expect(result[0].meta.advertiserDomains[0]).to.equal('basspro.com');
+      expect(result[0].meta.advertiserDomains[1]).to.equal('internetalerts.org');
+      expect(result[1].meta).to.not.have.key('advertiserDomains');
     });
   });
 
diff --git a/test/spec/modules/truereachBidAdapter_spec.js b/test/spec/modules/truereachBidAdapter_spec.js
new file mode 100644
index 00000000000..36441722648
--- /dev/null
+++ b/test/spec/modules/truereachBidAdapter_spec.js
@@ -0,0 +1,105 @@
+import { expect } from 'chai';
+import { spec } from 'modules/truereachBidAdapter.js';
+
+describe('truereachBidAdapterTests', function () {
+  it('validate_pub_params', function () {
+    expect(spec.isBidRequestValid({
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bidder: 'truereach',
+      params: {
+        site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+        bidfloor: 0.1
+      }
+    })).to.equal(true);
+  });
+
+  it('validate_generated_params', function () {
+    let bidRequestData = [{
+      bidId: '34ce3f3b15190a',
+      mediaTypes: {
+        banner: {
+          sizes: [[300, 250]]
+        }
+      },
+      bidder: 'truereach',
+      params: {
+        site_id: '0142010a-8400-1b01-72cb-a553b9000009',
+        bidfloor: 0.1
+      },
+      sizes: [[300, 250]]
+    }];
+
+    let request = spec.buildRequests(bidRequestData, {});
+    let req_data = request.data;
+
+    expect(request.method).to.equal('POST');
+    expect(req_data.imp[0].id).to.equal('34ce3f3b15190a');
+    expect(req_data.imp[0].banner.w).to.equal(300);
+    expect(req_data.imp[0].banner.h).to.equal(250);
+    expect(req_data.imp[0].bidfloor).to.equal(0.1);
+  });
+
+  it('validate_response_params', function () {
+    let serverResponse = {
+      body: {
+        'id': '34ce3f3b15190a',
+        'seatbid': [{
+          'bid': [{
+            'id': '0142010a-8400-0801-72dc-04a99e6f7fc0:1ed',
+            'impid': '34ce3f3b15190a',
+            'price': 2.55,
+            'adm': '',
+            'adid': '493',
+            'adomain': ['https://www.momagic.com/'],
+            'iurl': '',
+            'cid': '260',
+            'crid': '0142010a-8400-1b01-72cb-afb296000012',
+            'w': 300,
+            'h': 250
+          }]
+        }],
+        'bidid': '0142010a-8400-0801-72dc-04a99e6f7fc1',
+        'cur': 'USD'
+      }
+    };
+
+    let bids = spec.interpretResponse(serverResponse, {});
+    expect(bids).to.have.lengthOf(1);
+    let bid = bids[0];
+    expect(bid.requestId).to.equal('34ce3f3b15190a');
+    expect(bid.cpm).to.equal(2.55);
+    expect(bid.currency).to.equal('USD');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.ad).to.equal('');
+    expect(bid.ttl).to.equal(180);
+    expect(bid.creativeId).to.equal('0142010a-8400-1b01-72cb-afb296000012');
+    expect(bid.netRevenue).to.equal(false);
+    expect(bid.meta.advertiserDomains[0]).to.equal('https://www.momagic.com/');
+  });
+
+  describe('user_sync', function() {
+    const user_sync_url = 'http://ads.momagic.com/jsp/usersync.jsp';
+    it('register_iframe_pixel_if_iframeEnabled_is_true', function() {
+      let syncs = spec.getUserSyncs(
+        {iframeEnabled: true}
+      );
+      expect(syncs).to.be.an('array');
+      expect(syncs.length).to.equal(1);
+      expect(syncs[0].type).to.equal('iframe');
+      expect(syncs[0].url).to.equal(user_sync_url);
+    });
+
+    it('if_pixelEnabled_is_true', function() {
+      let syncs = spec.getUserSyncs(
+        {pixelEnabled: true}
+      );
+      expect(syncs).to.be.an('array');
+      expect(syncs.length).to.equal(0);
+    });
+  });
+});
diff --git a/test/spec/modules/trustxBidAdapter_spec.js b/test/spec/modules/trustxBidAdapter_spec.js
index 9e0aad9b36f..f53116f60a4 100644
--- a/test/spec/modules/trustxBidAdapter_spec.js
+++ b/test/spec/modules/trustxBidAdapter_spec.js
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { spec } from 'modules/trustxBidAdapter.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import { config } from 'src/config.js';
 
 describe('TrustXAdapter', function () {
   const adapter = newBidder(spec);
@@ -92,7 +93,7 @@ describe('TrustXAdapter', function () {
     ];
 
     it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('u', referrer);
@@ -105,7 +106,7 @@ describe('TrustXAdapter', function () {
     });
 
     it('sizes must not be duplicated', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('u', referrer);
@@ -117,7 +118,7 @@ describe('TrustXAdapter', function () {
 
     it('pt parameter must be "gross" if params.priceType === "gross"', function () {
       bidRequests[1].params.priceType = 'gross';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('u', referrer);
@@ -130,7 +131,7 @@ describe('TrustXAdapter', function () {
 
     it('pt parameter must be "net" or "gross"', function () {
       bidRequests[1].params.priceType = 'some';
-      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('u', referrer);
@@ -143,7 +144,7 @@ describe('TrustXAdapter', function () {
 
     it('if gdprConsent is present payload must have gdpr params', function () {
       const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('gdpr_consent', 'AAA');
@@ -152,7 +153,7 @@ describe('TrustXAdapter', function () {
 
     it('if gdprApplies is false gdpr_applies must be 0', function () {
       const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: false}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('gdpr_consent', 'AAA');
@@ -161,7 +162,7 @@ describe('TrustXAdapter', function () {
 
     it('if gdprApplies is undefined gdpr_applies must be 1', function () {
       const bidderRequestWithGDPR = Object.assign({gdprConsent: {consentString: 'AAA'}}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithGDPR)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('gdpr_consent', 'AAA');
@@ -170,7 +171,7 @@ describe('TrustXAdapter', function () {
 
     it('if usPrivacy is present payload must have us_privacy param', function () {
       const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
-      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('us_privacy', '1YNN');
@@ -197,7 +198,7 @@ describe('TrustXAdapter', function () {
         }
       );
 
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest);
+      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest)[0];
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.keywords).to.be.an('string');
@@ -226,9 +227,441 @@ describe('TrustXAdapter', function () {
     });
   });
 
+  describe('buildRequests with new format', function () {
+    function parseRequest(data) {
+      return JSON.parse(data);
+    }
+    const bidderRequest = {
+      refererInfo: {referer: 'https://example.com'},
+      bidderRequestId: '22edbae2733bf6',
+      auctionId: '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      timeout: 3000
+    };
+    const referrer = encodeURIComponent(bidderRequest.refererInfo.referer);
+
+    let bidRequests = [
+      {
+        'bidder': 'trustx',
+        'params': {
+          'uid': '43',
+          'bidFloor': 1.25,
+          'useNewFormat': true
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'banner': {
+            'sizes': [[300, 250], [300, 600]]
+          }
+        },
+        'bidId': '42dbe3a7168a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      },
+      {
+        'bidder': 'trustx',
+        'params': {
+          'uid': '44',
+          'useNewFormat': true
+        },
+        'adUnitCode': 'adunit-code-1',
+        'sizes': [[300, 250], [300, 600]],
+        'bidId': '30b31c1838de1e',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      },
+      {
+        'bidder': 'trustx',
+        'params': {
+          'uid': '45',
+          'useNewFormat': true
+        },
+        'adUnitCode': 'adunit-code-2',
+        'sizes': [[728, 90]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[400, 600]],
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
+          }
+        },
+        'bidId': '3150ccb55da321',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      },
+      {
+        'bidder': 'trustx',
+        'params': {
+          'uid': '41',
+          'useNewFormat': true
+        },
+        'adUnitCode': 'adunit-code-2',
+        'sizes': [[728, 90]],
+        'mediaTypes': {
+          'video': {
+            'playerSize': [[400, 600]],
+            'protocols': [1, 2, 3]
+          },
+          'banner': {
+            'sizes': [[728, 90]]
+          }
+        },
+        'bidId': '3150ccb55da321',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '9e2dfbfe-00c7-4f5e-9850-4044df3229c7',
+      }
+    ];
+
+    it('should attach valid params to the tag', function () {
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
+    });
+
+    it('make possible to process request without mediaTypes', function () {
+      const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }]
+      });
+    });
+
+    it('should attach valid params to the video tag', function () {
+      const request = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg']
+          }
+        }]
+      });
+    });
+
+    it('should support mixed mediaTypes', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.deep.equal({
+        'id': bidderRequest.bidderRequestId,
+        'site': {
+          'page': referrer
+        },
+        'tmax': bidderRequest.timeout,
+        'source': {
+          'tid': bidderRequest.auctionId,
+          'ext': {'wrapper': 'Prebid_js', 'wrapper_version': '$prebid.version$'}
+        },
+        'imp': [{
+          'id': bidRequests[0].bidId,
+          'tagid': bidRequests[0].params.uid,
+          'ext': {'divid': bidRequests[0].adUnitCode},
+          'bidfloor': bidRequests[0].params.bidFloor,
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[1].bidId,
+          'tagid': bidRequests[1].params.uid,
+          'ext': {'divid': bidRequests[1].adUnitCode},
+          'banner': {
+            'w': 300,
+            'h': 250,
+            'format': [{'w': 300, 'h': 250}, {'w': 300, 'h': 600}]
+          }
+        }, {
+          'id': bidRequests[2].bidId,
+          'tagid': bidRequests[2].params.uid,
+          'ext': {'divid': bidRequests[2].adUnitCode},
+          'video': {
+            'w': 400,
+            'h': 600,
+            'mimes': ['video/mp4', 'video/webm', 'application/javascript', 'video/ogg'],
+          }
+        }, {
+          'id': bidRequests[3].bidId,
+          'tagid': bidRequests[3].params.uid,
+          'ext': {'divid': bidRequests[3].adUnitCode},
+          'banner': {
+            'w': 728,
+            'h': 90,
+            'format': [{'w': 728, 'h': 90}]
+          },
+          'video': {
+            'w': 400,
+            'h': 600,
+            'protocols': [1, 2, 3]
+          }
+        }]
+      });
+    });
+
+    it('if gdprConsent is present payload must have gdpr params', function () {
+      const gdprBidderRequest = Object.assign({gdprConsent: {consentString: 'AAA', gdprApplies: true}}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, gdprBidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext).to.have.property('consent', 'AAA');
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('gdpr', 1);
+    });
+
+    it('if usPrivacy is present payload must have us_privacy param', function () {
+      const bidderRequestWithUSP = Object.assign({uspConsent: '1YNN'}, bidderRequest);
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('regs');
+      expect(payload.regs).to.have.property('ext');
+      expect(payload.regs.ext).to.have.property('us_privacy', '1YNN');
+    });
+
+    it('if userId is present payload must have user.ext param with right keys', function () {
+      const eids = [
+        {
+          source: 'pubcid.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1
+          }]
+        },
+        {
+          source: 'adserver.org',
+          uids: [{
+            id: 'some-random-id-value',
+            atype: 1,
+            ext: {
+              rtiPartner: 'TDID'
+            }
+          }]
+        }
+      ];
+      const bidRequestsWithUserIds = bidRequests.map((bid) => {
+        return Object.assign({
+          userIdAsEids: eids
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user).to.have.property('ext');
+      expect(payload.user.ext.eids).to.deep.equal(eids);
+    });
+
+    it('if schain is present payload must have source.ext.schain param', function () {
+      const schain = {
+        complete: 1,
+        nodes: [
+          {
+            asi: 'indirectseller.com',
+            sid: '00001',
+            hp: 1
+          }
+        ]
+      };
+      const bidRequestsWithSChain = bidRequests.map((bid) => {
+        return Object.assign({
+          schain: schain
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithSChain, bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('source');
+      expect(payload.source).to.have.property('ext');
+      expect(payload.source.ext).to.have.property('schain');
+      expect(payload.source.ext.schain).to.deep.equal(schain);
+    });
+
+    it('if content and segment is present in jwTargeting, payload must have right params', function () {
+      const jsContent = {id: 'test_jw_content_id'};
+      const jsSegments = ['test_seg_1', 'test_seg_2'];
+      const bidRequestsWithJwTargeting = bidRequests.map((bid) => {
+        return Object.assign({
+          rtd: {
+            jwplayer: {
+              targeting: {
+                segments: jsSegments,
+                content: jsContent
+              }
+            }
+          }
+        }, bid);
+      });
+      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload).to.have.property('user');
+      expect(payload.user.data).to.deep.equal([{
+        name: 'iow_labs_pub_data',
+        segment: [
+          {name: 'jwpseg', value: jsSegments[0]},
+          {name: 'jwpseg', value: jsSegments[1]}
+        ]
+      }]);
+      expect(payload).to.have.property('site');
+      expect(payload.site.content).to.deep.equal(jsContent);
+    });
+
+    it('should contain the keyword values if it present in ortb2.(site/user)', function () {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'ortb2.user' ? {'keywords': 'foo'} : (arg === 'ortb2.site' ? {'keywords': 'bar'} : null));
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.ext.keywords).to.deep.equal([{'key': 'user', 'value': ['foo']}, {'key': 'context', 'value': ['bar']}]);
+      getConfigStub.restore();
+    });
+
+    it('shold be right tmax when timeout in config is less then timeout in bidderRequest', function() {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'bidderTimeout' ? 2000 : null);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.tmax).to.equal(2000);
+      getConfigStub.restore();
+    });
+    it('shold be right tmax when timeout in bidderRequest is less then timeout in config', function() {
+      const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
+        arg => arg === 'bidderTimeout' ? 5000 : null);
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      expect(request.data).to.be.an('string');
+      const payload = parseRequest(request.data);
+      expect(payload.tmax).to.equal(3000);
+      getConfigStub.restore();
+    });
+
+    describe('floorModule', function () {
+      const floorTestData = {
+        'currency': 'USD',
+        'floor': 1.50
+      };
+      const bidRequest = Object.assign({
+        getFloor: (_) => {
+          return floorTestData;
+        }
+      }, bidRequests[1]);
+      it('should return the value from getFloor if present', function () {
+        const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the getFloor.floor value if it is greater than bidfloor', function () {
+        const bidfloor = 0.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest)[0];
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(floorTestData.floor);
+      });
+      it('should return the bidfloor value if it is greater than getFloor.floor', function () {
+        const bidfloor = 1.80;
+        const bidRequestsWithFloor = { ...bidRequest };
+        bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
+        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest)[0];
+        expect(request.data).to.be.an('string');
+        const payload = parseRequest(request.data);
+        expect(payload.imp[0].bidfloor).to.equal(bidfloor);
+      });
+    });
+  });
+
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
+      {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 43, 'h': 250, 'w': 300, 'adomain': ['somedomain.com']}], 'seat': '1'},
       {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 44, 'h': 600, 'w': 300}], 'seat': '1'},
       {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 43, 'h': 90, 'w': 728}], 'seat': '1'},
       {'bid': [{'price': 0, 'auid': 45, 'h': 250, 'w': 300}], 'seat': '1'},
@@ -252,7 +685,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '1cbd2feafe5e8b',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidRequests)[0];
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -262,11 +695,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['somedomain.com']
+          },
         }
       ];
 
@@ -310,7 +745,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '1fa09aee5c8c99',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidRequests)[0];
       const expectedResponse = [
         {
           'requestId': '300bfeb0d71a5b',
@@ -320,11 +755,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['somedomain.com']
+          },
         },
         {
           'requestId': '4dff80cc4ee346',
@@ -334,11 +771,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 2
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         },
         {
           'requestId': '5703af74d0472a',
@@ -348,11 +787,13 @@ describe('TrustXAdapter', function () {
           'width': 728,
           'height': 90,
           'ad': '
test content 3
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         }
       ];
 
@@ -396,7 +837,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '1fa09aee5c84d34',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidRequests)[0];
       const result = spec.interpretResponse({'body': {'seatbid': responses.slice(3)}}, request);
       expect(result.length).to.equal(0);
     });
@@ -466,7 +907,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '32a1f276cb87cb8',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidRequests)[0];
       const expectedResponse = [
         {
           'requestId': '2164be6358b9',
@@ -476,11 +917,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         },
         {
           'requestId': '4e111f1b66e4',
@@ -490,11 +933,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 2
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         },
         {
           'requestId': '26d6f897b516',
@@ -504,11 +949,13 @@ describe('TrustXAdapter', function () {
           'width': 728,
           'height': 90,
           'ad': '
test content 3
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         },
         {
           'requestId': '326bde7fbf69',
@@ -518,11 +965,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 600,
           'ad': '
test content 4
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         }
       ];
 
@@ -570,7 +1019,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '35bcbc0f7e79c',
         }
       ];
-      const request = spec.buildRequests(bidRequests);
+      const request = spec.buildRequests(bidRequests)[0];
       const expectedResponse = [
         {
           'requestId': '5126e301f4be',
@@ -580,11 +1029,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 1
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         },
         {
           'requestId': '57b2ebe70e16',
@@ -594,11 +1045,13 @@ describe('TrustXAdapter', function () {
           'width': 300,
           'height': 250,
           'ad': '
test content 2
',
-          'bidderCode': 'trustx',
           'currency': 'USD',
           'mediaType': 'banner',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
         }
       ];
 
@@ -646,7 +1099,7 @@ describe('TrustXAdapter', function () {
       {'bid': [{'price': 1.15, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 50, content_type: 'video', w: 300, h: 600}], 'seat': '2'},
       {'bid': [{'price': 1.00, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 51, content_type: 'video'}], 'seat': '2'}
     ];
-    const request = spec.buildRequests(bidRequests);
+    const request = spec.buildRequests(bidRequests)[0];
     const expectedResponse = [
       {
         'requestId': '57dfefb80eca',
@@ -655,11 +1108,13 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 600,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
         'ttl': 360,
+        'meta': {
+          'advertiserDomains': []
+        },
         'vastXml': '\n<\/Ad>\n<\/VAST>',
         'adResponse': {
           'content': '\n<\/Ad>\n<\/VAST>'
@@ -726,7 +1181,7 @@ describe('TrustXAdapter', function () {
       {'bid': [{'price': 1.00, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 51, content_type: 'video', w: 300, h: 250}], 'seat': '2'},
       {'bid': [{'price': 1.20, 'adm': '\n<\/Ad>\n<\/VAST>', 'auid': 52, content_type: 'video', w: 300, h: 250}], 'seat': '2'}
     ];
-    const request = spec.buildRequests(bidRequests);
+    const request = spec.buildRequests(bidRequests)[0];
     const expectedResponse = [
       {
         'requestId': 'e6e65553fc8',
@@ -735,11 +1190,13 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 600,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
         'ttl': 360,
+        'meta': {
+          'advertiserDomains': []
+        },
         'vastXml': '\n<\/Ad>\n<\/VAST>',
         'adResponse': {
           'content': '\n<\/Ad>\n<\/VAST>'
@@ -753,11 +1210,13 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 250,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
         'ttl': 360,
+        'meta': {
+          'advertiserDomains': []
+        },
         'vastXml': '\n<\/Ad>\n<\/VAST>',
         'adResponse': {
           'content': '\n<\/Ad>\n<\/VAST>'
@@ -771,11 +1230,13 @@ describe('TrustXAdapter', function () {
         'dealId': undefined,
         'width': 300,
         'height': 250,
-        'bidderCode': 'trustx',
         'currency': 'USD',
         'mediaType': 'video',
         'netRevenue': true,
         'ttl': 360,
+        'meta': {
+          'advertiserDomains': []
+        },
         'vastXml': '\n<\/Ad>\n<\/VAST>',
         'adResponse': {
           'content': '\n<\/Ad>\n<\/VAST>'
diff --git a/test/spec/modules/ucfunnelBidAdapter_spec.js b/test/spec/modules/ucfunnelBidAdapter_spec.js
index b5f29287f81..5899554244b 100644
--- a/test/spec/modules/ucfunnelBidAdapter_spec.js
+++ b/test/spec/modules/ucfunnelBidAdapter_spec.js
@@ -1,7 +1,6 @@
 import { expect } from 'chai';
 import { spec } from 'modules/ucfunnelBidAdapter.js';
 import {BANNER, VIDEO, NATIVE} from 'src/mediaTypes.js';
-
 const URL = 'https://hb.aralego.com/header';
 const BIDDER_CODE = 'ucfunnel';
 
@@ -9,15 +8,29 @@ const bidderRequest = {
   uspConsent: '1YNN'
 };
 
+const userId = {
+  'criteoId': 'vYlICF9oREZlTHBGRVdrJTJCUUJnc3U2ckNVaXhrV1JWVUZVSUxzZmJlcnJZR0ZxbVhFRnU5bDAlMkJaUWwxWTlNcmdEeHFrJTJGajBWVlV4T3lFQ0FyRVcxNyUyQlIxa0lLSlFhcWJpTm9PSkdPVkx0JTJCbzlQRTQlM0Q',
+  'id5id': {'uid': 'ID5-8ekgswyBTQqnkEKy0ErmeQ1GN5wV4pSmA-RE4eRedA'},
+  'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
+  'parrableId': {'eid': '01.1608624401.fe44bca9b96873084a0d4e9d0ac5729f13790ba8f8e58fa4707b6b3c096df91c6b5f254992bdad4ab1dd4a89919081e9b877d7a039ac3183709277665bac124f28e277d109f0ff965058'},
+  'pubcid': 'd8aa10fa-d86c-451d-aad8-5f16162a9e64',
+  'sharedid': {'id': '01ESHXW4HD29KMF387T63JQ9H5', 'third': '01ESHXW4HD29KMF387T63JQ9H5'},
+  'tdid': 'D6885E90-2A7A-4E0F-87CB-7734ED1B99A3',
+  'haloId': {},
+  'uid2': {'id': 'eb33b0cb-8d35-4722-b9c0-1a31d4064888'},
+  'flocId': {'id': '12144', 'version': 'chrome.1.1'},
+  'connectid': '4567'
+}
+
 const validBannerBidReq = {
   bidder: BIDDER_CODE,
   params: {
-    adid: 'ad-34BBD2AA24B678BBFD4E7B9EE3B872D',
-    bidfloor: 1.0
+    adid: 'ad-34BBD2AA24B678BBFD4E7B9EE3B872D'
   },
   sizes: [[300, 250]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746',
+  userId: userId,
   'schain': {
     'ver': '1.0',
     'complete': 1,
@@ -50,7 +63,8 @@ const validBannerBidRes = {
   adm: '
',
   cpm: 1.01,
   height: 250,
-  width: 300
+  width: 300,
+  crid: 'test-crid'
 };
 
 const invalidBannerBidRes = '';
@@ -112,6 +126,13 @@ const validNativeBidRes = {
   width: 1
 };
 
+const gdprConsent = {
+  consentString: 'CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA',
+  vendorData: {},
+  gdprApplies: true,
+  apiVersion: 2
+};
+
 describe('ucfunnel Adapter', function () {
   describe('request', function () {
     it('should validate bid request', function () {
@@ -139,6 +160,8 @@ describe('ucfunnel Adapter', function () {
       expect(data.adid).to.equal('ad-34BBD2AA24B678BBFD4E7B9EE3B872D');
       expect(data.w).to.equal(width);
       expect(data.h).to.equal(height);
+      expect(data.eids).to.equal('uid2,eb33b0cb-8d35-4722-b9c0-1a31d4064888!verizonMediaId,4567');
+      expect(data.cid).to.equal('12144');
       expect(data.schain).to.equal('1.0,1!exchange1.com,1234,1,bid-request-1,publisher,publisher.com');
     });
 
@@ -151,6 +174,41 @@ describe('ucfunnel Adapter', function () {
       expect(data.w).to.equal(width);
       expect(data.h).to.equal(height);
     });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 2.02
+        }
+      };
+      const requests = spec.buildRequests([ bid ]);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.02);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.params.bidfloor = 2.01;
+      const requests = spec.buildRequests([ bid ]);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.01);
+    });
+
+    it('should set bidfloor if configured', function() {
+      let bid = Object.assign({}, validBannerBidReq);
+      bid.getFloor = function() {
+        return {
+          currency: 'USD',
+          floor: 2.02
+        }
+      };
+      bid.params.bidfloor = 2.01;
+      const requests = spec.buildRequests([ bid ]);
+      const data = requests[0].data;
+      expect(data.fp).to.equal(2.01);
+    });
   });
 
   describe('interpretResponse', function () {
@@ -253,18 +311,18 @@ describe('ucfunnel Adapter', function () {
 
   describe('cookie sync', function () {
     describe('cookie sync iframe', function () {
-      const result = spec.getUserSyncs({'iframeEnabled': true});
+      const result = spec.getUserSyncs({'iframeEnabled': true}, null, gdprConsent);
 
       it('should return cookie sync iframe info', function () {
         expect(result[0].type).to.equal('iframe');
-        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html');
+        expect(result[0].url).to.equal('https://cdn.aralego.net/ucfad/cookie/sync.html?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
     describe('cookie sync image', function () {
-      const result = spec.getUserSyncs({'pixelEnabled': true});
+      const result = spec.getUserSyncs({'pixelEnabled': true}, null, gdprConsent);
       it('should return cookie sync image info', function () {
         expect(result[0].type).to.equal('image');
-        expect(result[0].url).to.equal('https://sync.aralego.com/idSync');
+        expect(result[0].url).to.equal('https://sync.aralego.com/idSync?gdpr=1&euconsent-v2=CO9rhBTO9rhBTAcABBENBCCsAP_AAH_AACiQHItf_X_fb3_j-_59_9t0eY1f9_7_v20zjgeds-8Nyd_X_L8X42M7vB36pq4KuR4Eu3LBIQdlHOHcTUmw6IkVqTPsbk2Mr7NKJ7PEinMbe2dYGH9_n9XTuZKY79_s___z__-__v__7_f_r-3_3_vp9V---3YHIgEmGpfARZiWOBJNGlUKIEIVxIdACACihGFomsICVwU7K4CP0EDABAagIwIgQYgoxZBAAAAAElEQEgB4IBEARAIAAQAqQEIACNAEFgBIGAQACgGhYARQBCBIQZHBUcpgQESLRQTyVgCUXexhhCGUUANAg4AA.YAAAAAAAAAAA&');
       });
     });
   });
diff --git a/test/spec/modules/underdogmediaBidAdapter_spec.js b/test/spec/modules/underdogmediaBidAdapter_spec.js
index aeb9f56c851..70d09513f27 100644
--- a/test/spec/modules/underdogmediaBidAdapter_spec.js
+++ b/test/spec/modules/underdogmediaBidAdapter_spec.js
@@ -276,6 +276,7 @@ describe('UnderdogMedia adapter', function () {
             mids: [
               {
                 ad_code_html: 'ad_code_html',
+                advertiser_domains: ['domain1'],
                 cpm: 2.5,
                 height: '600',
                 mid: '32634',
@@ -300,6 +301,7 @@ describe('UnderdogMedia adapter', function () {
 
         expect(bids).to.be.lengthOf(2);
 
+        expect(bids[0].meta.advertiserDomains).to.deep.equal(['domain1'])
         expect(bids[0].bidderCode).to.equal('underdogmedia');
         expect(bids[0].cpm).to.equal(2.5);
         expect(bids[0].width).to.equal('160');
diff --git a/test/spec/modules/undertoneBidAdapter_spec.js b/test/spec/modules/undertoneBidAdapter_spec.js
index e4218019e0d..0faa321be5f 100644
--- a/test/spec/modules/undertoneBidAdapter_spec.js
+++ b/test/spec/modules/undertoneBidAdapter_spec.js
@@ -24,13 +24,49 @@ const invalidBidReq = {
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
 };
 
-const bidReq = [{
+const videoBidReq = [{
   adUnitCode: 'div-gpt-ad-1460505748561-0',
   bidder: BIDDER_CODE,
   params: {
     placementId: '10433394',
+    publisherId: 12345,
+    video: {
+      id: 123,
+      skippable: true,
+      playbackMethod: 2,
+      maxDuration: 30
+    }
+  },
+  mediaTypes: {video: {
+    context: 'outstream',
+    playerSize: [640, 480]
+  }},
+  sizes: [[300, 250], [300, 600]],
+  bidId: '263be71e91dd9d',
+  auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
+},
+{
+  adUnitCode: 'div-gpt-ad-1460505748561-1',
+  bidder: BIDDER_CODE,
+  params: {
+    placementId: '10433395',
     publisherId: 12345
   },
+  mediaTypes: {video: {
+    context: 'outstream',
+    playerSize: [640, 480]
+  }},
+  sizes: [[300, 250], [300, 600]],
+  bidId: '263be71e91dd9d',
+  auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
+}];
+const bidReq = [{
+  adUnitCode: 'div-gpt-ad-1460505748561-0',
+  bidder: BIDDER_CODE,
+  params: {
+    placementId: '10433394',
+    publisherId: 12345,
+  },
   sizes: [[300, 250], [300, 600]],
   bidId: '263be71e91dd9d',
   auctionId: '9ad1fa8d-2297-4660-a018-b39945054746'
@@ -58,7 +94,8 @@ const bidReqUserIds = [{
   userId: {
     idl_env: '1111',
     tdid: '123456',
-    digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
+    digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}},
+    id5id: { uid: '1111' }
   }
 },
 {
@@ -147,6 +184,20 @@ const bidResArray = [
     ttl: 360
   }
 ];
+const bidVideoResponse = [
+  {
+    ad: '',
+    bidRequestId: '263be71e91dd9d',
+    cpm: 100,
+    adId: '123abc',
+    currency: 'USD',
+    mediaType: 'video',
+    netRevenue: true,
+    width: 300,
+    height: 250,
+    ttl: 360
+  }
+];
 
 let element;
 let sandbox;
@@ -241,6 +292,23 @@ describe('Undertone Adapter', () => {
       expect(bid2.publisherId).to.equal(12345);
       expect(bid2.params).to.be.an('object');
     });
+    it('should send video fields correctly', function () {
+      const request = spec.buildRequests(videoBidReq, bidderReq);
+      const bidVideo = JSON.parse(request.data)['x-ut-hb-params'][0];
+      const bidVideo2 = JSON.parse(request.data)['x-ut-hb-params'][1];
+
+      expect(bidVideo.mediaType).to.equal('video');
+      expect(bidVideo.video).to.be.an('object');
+      expect(bidVideo.video.playerSize).to.be.an('array');
+      expect(bidVideo.video.streamType).to.equal('outstream');
+      expect(bidVideo.video.playbackMethod).to.equal(2);
+      expect(bidVideo.video.maxDuration).to.equal(30);
+      expect(bidVideo.video.skippable).to.equal(true);
+
+      expect(bidVideo2.video.skippable).to.equal(null);
+      expect(bidVideo2.video.maxDuration).to.equal(null);
+      expect(bidVideo2.video.playbackMethod).to.equal(null);
+    });
     it('should send all userIds data to server', function () {
       const request = spec.buildRequests(bidReqUserIds, bidderReq);
       const bidCommons = JSON.parse(request.data)['commons'];
@@ -249,6 +317,7 @@ describe('Undertone Adapter', () => {
       expect(bidCommons.uids.tdid).to.equal('123456');
       expect(bidCommons.uids.idl_env).to.equal('1111');
       expect(bidCommons.uids.digitrustid.data.id).to.equal('DTID');
+      expect(bidCommons.uids.id5id.uid).to.equal('1111');
     });
     it('should send page sizes sizes correctly', function () {
       const request = spec.buildRequests(bidReqUserIds, bidderReq);
@@ -289,6 +358,7 @@ describe('Undertone Adapter', () => {
       expect(bid.cpm).to.equal(100);
       expect(bid.width).to.equal(300);
       expect(bid.height).to.equal(250);
+      expect(bid.meta.advertiserDomains).to.deep.equal([]);
       expect(bid.creativeId).to.equal(15);
       expect(bid.currency).to.equal('USD');
       expect(bid.netRevenue).to.equal(true);
@@ -303,6 +373,13 @@ describe('Undertone Adapter', () => {
     it('should only use valid bid responses', () => {
       expect(spec.interpretResponse({ body: bidResArray }).length).to.equal(1);
     });
+
+    it('should detect video response', () => {
+      const videoResult = spec.interpretResponse({body: bidVideoResponse});
+      const vbid = videoResult[0];
+
+      expect(vbid.mediaType).to.equal('video');
+    });
   });
 
   describe('getUserSyncs', () => {
diff --git a/test/spec/modules/unicornBidAdapter_spec.js b/test/spec/modules/unicornBidAdapter_spec.js
index 4c56c37700b..dcd446b2bb0 100644
--- a/test/spec/modules/unicornBidAdapter_spec.js
+++ b/test/spec/modules/unicornBidAdapter_spec.js
@@ -11,12 +11,12 @@ const bidRequests = [
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[300, 250], [336, 280]]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'ea0aa332-a6e1-4474-8180-83720e6b87bc',
-    sizes: [[300, 250]],
+    sizes: [[300, 250], [336, 280]],
     bidId: '226416e6e6bf41',
     bidderRequestId: '1f41cbdcbe58d5',
     auctionId: '77987c3a-9be9-4e43-985a-26fc91d84724',
@@ -81,12 +81,12 @@ const validBidRequests = [
     },
     mediaTypes: {
       banner: {
-        sizes: [[300, 250]]
+        sizes: [[300, 250], [336, 280]]
       }
     },
     adUnitCode: '/19968336/header-bid-tag-0',
     transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-    sizes: [[300, 250]],
+    sizes: [[300, 250], [336, 280]],
     bidId: '2fb90842443e24',
     bidderRequestId: '123ae4cc3eeb7e',
     auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -156,12 +156,12 @@ const bidderRequest = {
       },
       mediaTypes: {
         banner: {
-          sizes: [[300, 250]]
+          sizes: [[300, 250], [336, 280]]
         }
       },
       adUnitCode: '/19968336/header-bid-tag-0',
       transactionId: 'fbf94ccf-f377-4201-a662-32c2feb8ab6d',
-      sizes: [[300, 250]],
+      sizes: [[300, 250], [336, 280]],
       bidId: '2fb90842443e24',
       bidderRequestId: '123ae4cc3eeb7e',
       auctionId: 'c594a888-6744-46c6-8b0e-d188e40e83ef',
@@ -234,8 +234,18 @@ const openRTBRequest = {
     {
       id: '216255f234b602',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          },
+          {
+            w: 336,
+            h: 280
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -244,8 +254,14 @@ const openRTBRequest = {
     {
       id: '31e2b28ced2475',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -254,8 +270,14 @@ const openRTBRequest = {
     {
       id: '40a333e047a9bd',
       banner: {
-        w: '300',
-        h: '250'
+        w: 300,
+        h: 250,
+        format: [
+          {
+            w: 300,
+            h: 250
+          }
+        ]
       },
       secure: 1,
       bidfloor: 0,
@@ -287,7 +309,8 @@ const openRTBRequest = {
   source: {
     ext: {
       stype: 'prebid_uncn',
-      bidder: 'unicorn'
+      bidder: 'unicorn',
+      prebid_version: '1.0'
     }
   }
 };
@@ -378,7 +401,7 @@ const request = {
   method: 'POST',
   url: 'https://ds.uncn.jp/pb/0/bid.json',
   data:
-    '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":"300","h":"250"},"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn"}}}'
+    '{"id":"5ebea288-f13a-4754-be6d-4ade66c68877","at":1,"imp":[{"id":"216255f234b602","banner":{"w":300,"h":250},"format":[{"w":300,"h":250},{"w":336,"h":280}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-0"},{"id":"31e2b28ced2475","banner":{"w":"300","h":"250"},"format":[{"w":"300","h":"250"}],"secure":1,"bidfloor":0"tagid":"/19968336/header-bid-tag-1"},{"id":"40a333e047a9bd","banner":{"w":300,"h":250},"format":[{"w":300,"h":250}],"secure":1,"bidfloor":0,"tagid":"/19968336/header-bid-tag-2"}],"cur":"JPY","site":{"id":"uni-corn.net","publisher":{"id":12345},"domain":"uni-corn.net","page":"https://uni-corn.net/","ref":"https://uni-corn.net/"},"device":{"language":"ja","ua":"Mozilla/5.0 (Linux; Android 8.0.0; ONEPLUS A5000) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36"},"user":{"id":"69d9e1c2-801e-4901-a665-fad467550fec"},"bcat":[],"source":{"ext":{"stype":"prebid_uncn","bidder":"unicorn","prebid_version":"1.0"}}}'
 };
 
 const interpretedBids = [
diff --git a/test/spec/modules/unrulyBidAdapter_spec.js b/test/spec/modules/unrulyBidAdapter_spec.js
index 9ece8927ef7..b087ba042a9 100644
--- a/test/spec/modules/unrulyBidAdapter_spec.js
+++ b/test/spec/modules/unrulyBidAdapter_spec.js
@@ -148,6 +148,7 @@ describe('UnrulyAdapter', function () {
           netRevenue: true,
           creativeId: 'mockBidId',
           ttl: 360,
+          meta: { advertiserDomains: [] },
           currency: 'USD',
           renderer: fakeRenderer,
           mediaType: 'video'
diff --git a/test/spec/modules/userId_spec.js b/test/spec/modules/userId_spec.js
index 651629e3e2b..ca46c3221d4 100644
--- a/test/spec/modules/userId_spec.js
+++ b/test/spec/modules/userId_spec.js
@@ -1,11 +1,15 @@
 import {
   attachIdSystem,
   auctionDelay,
+  coreStorage,
   init,
   requestBidsHook,
+  setStoredConsentData,
+  setStoredValue,
   setSubmoduleRegistry,
   syncDelay,
-  coreStorage
+  PBJS_USER_ID_OPTOUT_NAME,
+  findRootDomain,
 } from 'modules/userId/index.js';
 import {createEidsArray} from 'modules/userId/eids.js';
 import {config} from 'src/config.js';
@@ -13,34 +17,48 @@ import * as utils from 'src/utils.js';
 import events from 'src/events.js';
 import CONSTANTS from 'src/constants.json';
 import {getGlobal} from 'src/prebidGlobal.js';
+import {
+  requestBidsHook as consentManagementRequestBidsHook,
+  resetConsentData,
+  setConsentConfig
+} from 'modules/consentManagement.js';
+import {server} from 'test/mocks/xhr.js';
+import find from 'core-js-pure/features/array/find.js';
 import {unifiedIdSubmodule} from 'modules/unifiedIdSystem.js';
 import {pubCommonIdSubmodule} from 'modules/pubCommonIdSystem.js';
 import {britepoolIdSubmodule} from 'modules/britepoolIdSystem.js';
 import {id5IdSubmodule} from 'modules/id5IdSystem.js';
 import {identityLinkSubmodule} from 'modules/identityLinkIdSystem.js';
+import {dmdIdSubmodule} from 'modules/dmdIdSystem.js';
 import {liveIntentIdSubmodule} from 'modules/liveIntentIdSystem.js';
+import {merkleIdSubmodule} from 'modules/merkleIdSystem.js';
 import {netIdSubmodule} from 'modules/netIdSystem.js';
+import {nextrollIdSubmodule} from 'modules/nextrollIdSystem.js';
+import {intentIqIdSubmodule} from 'modules/intentIqIdSystem.js';
+import {zeotapIdPlusSubmodule} from 'modules/zeotapIdPlusIdSystem.js';
 import {sharedIdSubmodule} from 'modules/sharedIdSystem.js';
-import {server} from 'test/mocks/xhr.js';
+import {haloIdSubmodule} from 'modules/haloIdSystem.js';
+import {pubProvidedIdSubmodule} from 'modules/pubProvidedIdSystem.js';
+import {criteoIdSubmodule} from 'modules/criteoIdSystem.js';
+import {mwOpenLinkIdSubModule} from 'modules/mwOpenLinkIdSystem.js';
+import {tapadIdSubmodule} from 'modules/tapadIdSystem.js';
+import {getPrebidInternal} from 'src/utils.js';
+import {uid2IdSubmodule} from 'modules/uid2IdSystem.js';
+import {admixerIdSubmodule} from 'modules/admixerIdSystem.js';
+import {deepintentDpesSubmodule} from 'modules/deepintentDpesIdSystem.js';
+import {flocIdSubmodule} from 'modules/flocIdSystem.js'
 
 let assert = require('chai').assert;
 let expect = require('chai').expect;
 const EXPIRED_COOKIE_DATE = 'Thu, 01 Jan 1970 00:00:01 GMT';
+const CONSENT_LOCAL_STORAGE_NAME = '_pbjs_userid_consent_data';
 
-describe('User ID', function() {
-  function getConfigMock(configArr1, configArr2, configArr3, configArr4, configArr5, configArr6, configArr7) {
+describe('User ID', function () {
+  function getConfigMock(...configArrays) {
     return {
       userSync: {
         syncDelay: 0,
-        userIds: [
-          (configArr1 && configArr1.length >= 3) ? getStorageMock.apply(null, configArr1) : null,
-          (configArr2 && configArr2.length >= 3) ? getStorageMock.apply(null, configArr2) : null,
-          (configArr3 && configArr3.length >= 3) ? getStorageMock.apply(null, configArr3) : null,
-          (configArr4 && configArr4.length >= 3) ? getStorageMock.apply(null, configArr4) : null,
-          (configArr5 && configArr5.length >= 3) ? getStorageMock.apply(null, configArr5) : null,
-          (configArr6 && configArr6.length >= 3) ? getStorageMock.apply(null, configArr6) : null,
-          (configArr7 && configArr7.length >= 3) ? getStorageMock.apply(null, configArr7) : null
-        ].filter(i => i)
+        userIds: configArrays.map(configArray => (configArray && configArray.length >= 3) ? getStorageMock.apply(null, configArray) : null)
       }
     }
   }
@@ -60,7 +78,7 @@ describe('User ID', function() {
       code,
       mediaTypes: {banner: {}, native: {}},
       sizes: [[300, 200], [300, 600]],
-      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}]
+      bids: [{bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}, {bidder: 'anotherSampleBidder', params: {placementId: 'banner-only-bidder'}}]
     };
   }
 
@@ -78,31 +96,39 @@ describe('User ID', function() {
     return cfg;
   }
 
-  before(function() {
-    coreStorage.setCookie('_pubcid_optout', '', EXPIRED_COOKIE_DATE);
-    localStorage.removeItem('_pbjs_id_optout');
-    localStorage.removeItem('_pubcid_optout');
+  function findEid(eids, source) {
+    return find(eids, (eid) => {
+      if (eid.source === source) { return true; }
+    });
+  }
+
+  before(function () {
+    localStorage.removeItem(PBJS_USER_ID_OPTOUT_NAME);
+  });
+
+  beforeEach(function () {
+    coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
   });
 
-  describe('Decorate Ad Units', function() {
-    beforeEach(function() {
+  describe('Decorate Ad Units', function () {
+    beforeEach(function () {
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('pubcid_alt', 'altpubcid200000', (new Date(Date.now() + 5000).toUTCString()));
       sinon.spy(coreStorage, 'setCookie');
     });
 
-    afterEach(function() {
+    afterEach(function () {
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       config.resetConfig();
       coreStorage.setCookie.restore();
     });
 
-    after(function() {
+    after(function () {
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('pubcid_alt', '', EXPIRED_COOKIE_DATE);
     });
 
-    it('Check same cookie behavior', function() {
+    it('Check same cookie behavior', function () {
       let adUnits1 = [getAdUnitMock()];
       let adUnits2 = [getAdUnitMock()];
       let innerAdUnits1;
@@ -137,7 +163,7 @@ describe('User ID', function() {
       assert.deepEqual(innerAdUnits1, innerAdUnits2);
     });
 
-    it('Check different cookies', function() {
+    it('Check different cookies', function () {
       let adUnits1 = [getAdUnitMock()];
       let adUnits2 = [getAdUnitMock()];
       let innerAdUnits1;
@@ -188,7 +214,7 @@ describe('User ID', function() {
       expect(pubcid1).to.not.equal(pubcid2);
     });
 
-    it('Use existing cookie', function() {
+    it('Use existing cookie', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
 
@@ -208,11 +234,13 @@ describe('User ID', function() {
           });
         });
       });
-      // Because the cookie exists already, there should be no setCookie call by default
-      expect(coreStorage.setCookie.callCount).to.equal(0);
+      // Because the consent cookie doesn't exist yet, we'll have two setCookie calls:
+      // 1) for the consent cookie
+      // 2) from the getId() call that results in a new call to store the results
+      expect(coreStorage.setCookie.callCount).to.equal(2);
     });
 
-    it('Extend cookie', function() {
+    it('Extend cookie', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customConfig = getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']);
@@ -234,11 +262,12 @@ describe('User ID', function() {
           });
         });
       });
-      // Because extend is true, the cookie will be updated even if it exists already
-      expect(coreStorage.setCookie.callCount).to.equal(1);
+      // Because extend is true, the cookie will be updated even if it exists already. The second setCookie call
+      // is for storing consentData
+      expect(coreStorage.setCookie.callCount).to.equal(2);
     });
 
-    it('Disable auto create', function() {
+    it('Disable auto create', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customConfig = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
@@ -256,10 +285,11 @@ describe('User ID', function() {
           expect(bid).to.not.have.deep.nested.property('userIdAsEids');
         });
       });
-      expect(coreStorage.setCookie.callCount).to.equal(0);
+      // setCookie is called once in order to store consentData
+      expect(coreStorage.setCookie.callCount).to.equal(1);
     });
 
-    it('pbjs.getUserIds', function() {
+    it('pbjs.getUserIds', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig({
@@ -274,7 +304,7 @@ describe('User ID', function() {
       expect((getGlobal()).getUserIds()).to.deep.equal({pubcid: '11111'});
     });
 
-    it('pbjs.getUserIdsAsEids', function() {
+    it('pbjs.getUserIdsAsEids', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig({
@@ -288,72 +318,170 @@ describe('User ID', function() {
       expect(typeof (getGlobal()).getUserIdsAsEids).to.equal('function');
       expect((getGlobal()).getUserIdsAsEids()).to.deep.equal(createEidsArray((getGlobal()).getUserIds()));
     });
+
+    it('pbjs.refreshUserIds refreshes', function() {
+      let sandbox = sinon.createSandbox();
+
+      let mockIdCallback = sandbox.stub().returns({id: {'MOCKID': '1111'}});
+
+      let mockIdSystem = {
+        name: 'mockId',
+        decode: function(value) {
+          return {
+            'mid': value['MOCKID']
+          };
+        },
+        getId: mockIdCallback
+      };
+
+      setSubmoduleRegistry([mockIdSystem]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [{
+            name: 'mockId',
+            value: {id: {mockId: '1111'}}
+          }]
+        }
+      });
+      expect(typeof (getGlobal()).refreshUserIds).to.equal('function');
+
+      getGlobal().getUserIds(); // force initialization
+
+      // update config so that getId will be called
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [{
+            name: 'mockId',
+            storage: {name: 'mockid', type: 'cookie'},
+          }]
+        }
+      });
+
+      getGlobal().refreshUserIds();
+      expect(mockIdCallback.callCount).to.equal(1);
+    });
+
+    it('pbjs.refreshUserIds refreshes single', function() {
+      coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie('REFRESH', '', EXPIRED_COOKIE_DATE);
+
+      let sandbox = sinon.createSandbox();
+      let mockIdCallback = sandbox.stub().returns({id: {'MOCKID': '1111'}});
+      let refreshUserIdsCallback = sandbox.stub();
+
+      let mockIdSystem = {
+        name: 'mockId',
+        decode: function(value) {
+          return {
+            'mid': value['MOCKID']
+          };
+        },
+        getId: mockIdCallback
+      };
+
+      let refreshedIdCallback = sandbox.stub().returns({id: {'REFRESH': '1111'}});
+
+      let refreshedIdSystem = {
+        name: 'refreshedId',
+        decode: function(value) {
+          return {
+            'refresh': value['REFRESH']
+          };
+        },
+        getId: refreshedIdCallback
+      };
+
+      setSubmoduleRegistry([refreshedIdSystem, mockIdSystem]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'mockId',
+              storage: {name: 'MOCKID', type: 'cookie'},
+            },
+            {
+              name: 'refreshedId',
+              storage: {name: 'refreshedid', type: 'cookie'},
+            }
+          ]
+        }
+      });
+
+      getGlobal().getUserIds(); // force initialization
+
+      getGlobal().refreshUserIds({submoduleNames: 'refreshedId'}, refreshUserIdsCallback);
+
+      expect(refreshedIdCallback.callCount).to.equal(2);
+      expect(mockIdCallback.callCount).to.equal(1);
+      expect(refreshUserIdsCallback.callCount).to.equal(1);
+    });
   });
 
-  describe('Opt out', function() {
-    before(function() {
-      coreStorage.setCookie('_pbjs_id_optout', '1', (new Date(Date.now() + 5000).toUTCString()));
+  describe('Opt out', function () {
+    before(function () {
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '1', (new Date(Date.now() + 5000).toUTCString()));
     });
 
-    beforeEach(function() {
+    beforeEach(function () {
       sinon.stub(utils, 'logInfo');
     });
 
-    afterEach(function() {
+    afterEach(function () {
       // removed cookie
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie(PBJS_USER_ID_OPTOUT_NAME, '', EXPIRED_COOKIE_DATE);
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       utils.logInfo.restore();
       config.resetConfig();
     });
 
-    after(function() {
-      coreStorage.setCookie('_pbjs_id_optout', '', EXPIRED_COOKIE_DATE);
-    });
-
-    it('fails initialization if opt out cookie exists', function() {
+    it('fails initialization if opt out cookie exists', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
       expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - opt-out cookie found, exit module');
     });
 
-    it('initializes if no opt out cookie exists', function() {
+    it('initializes if no opt out cookie exists', function () {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
   });
 
-  describe('Handle variations of config values', function() {
-    beforeEach(function() {
+  describe('Handle variations of config values', function () {
+    beforeEach(function () {
       sinon.stub(utils, 'logInfo');
     });
 
-    afterEach(function() {
+    afterEach(function () {
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       utils.logInfo.restore();
       config.resetConfig();
     });
 
-    it('handles config with no usersync object', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with no usersync object', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({});
       // usersync is undefined, and no logInfo message for 'User ID - usersync config updated'
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('handles config with empty usersync object', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with empty usersync object', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({userSync: {}});
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('handles config with usersync and userIds that are empty objs', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with usersync and userIds that are empty objs', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -363,8 +491,8 @@ describe('User ID', function() {
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('handles config with usersync and userIds with empty names or that dont match a submodule.name', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, merkleIdSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -380,21 +508,37 @@ describe('User ID', function() {
       expect(typeof utils.logInfo.args[0]).to.equal('undefined');
     });
 
-    it('config with 1 configurations should create 1 submodules', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config with 1 configurations should create 1 submodules', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid', 'cookie']));
 
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 1 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
+    });
+
+    it('handles config with name in different case', function () {
+      setSubmoduleRegistry([criteoIdSubmodule]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          userIds: [{
+            name: 'Criteo'
+          }]
+        }
+      });
+
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 1 submodules');
     });
 
-    it('config with 8 configurations should result in 8 submodules add', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config with 21 configurations should result in 21 submodules add', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, liveIntentIdSubmodule, britepoolIdSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
           syncDelay: 0,
           userIds: [{
+            name: 'pubProvidedId'
+          }, {
             name: 'pubCommonId', value: {'pubcid': '11111'}
           }, {
             name: 'unifiedId',
@@ -414,17 +558,48 @@ describe('User ID', function() {
           }, {
             name: 'netId',
             storage: {name: 'netId', type: 'cookie'}
+          }, {
+            name: 'nextrollId'
           }, {
             name: 'sharedId',
             storage: {name: 'sharedid', type: 'cookie'}
+          }, {
+            name: 'intentIqId',
+            storage: {name: 'intentIqId', type: 'cookie'}
+          }, {
+            name: 'haloId',
+            storage: {name: 'haloId', type: 'cookie'}
+          }, {
+            name: 'zeotapIdPlus'
+          }, {
+            name: 'criteo'
+          }, {
+            name: 'mwOpenLinkId'
+          }, {
+            name: 'tapadId',
+            storage: {name: 'tapad_id', type: 'cookie'}
+          }, {
+            name: 'uid2'
+          }, {
+            name: 'admixerId',
+            storage: {name: 'admixerId', type: 'cookie'}
+          }, {
+            name: 'deepintentId',
+            storage: {name: 'deepintentId', type: 'cookie'}
+          }, {
+            name: 'flocId'
+          }, {
+            name: 'dmdId',
+            storage: {name: 'dmdId', type: 'cookie'}
           }]
         }
       });
-      expect(utils.logInfo.args[0][0]).to.exist.and.to.equal('User ID - usersync config updated for 8 submodules');
+      expect(utils.logInfo.args[0][0]).to.exist.and.to.contain('User ID - usersync config updated for 21 submodules');
     });
 
-    it('config syncDelay updates module correctly', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config syncDelay updates module correctly', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
+
       init(config);
       config.setConfig({
         userSync: {
@@ -438,8 +613,8 @@ describe('User ID', function() {
       expect(syncDelay).to.equal(99);
     });
 
-    it('config auctionDelay updates module correctly', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config auctionDelay updates module correctly', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -453,8 +628,8 @@ describe('User ID', function() {
       expect(auctionDelay).to.equal(100);
     });
 
-    it('config auctionDelay defaults to 0 if not a number', function() {
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, sharedIdSubmodule]);
+    it('config auctionDelay defaults to 0 if not a number', function () {
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, netIdSubmodule, nextrollIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, pubProvidedIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule, flocIdSubmodule]);
       init(config);
       config.setConfig({
         userSync: {
@@ -469,15 +644,16 @@ describe('User ID', function() {
     });
   });
 
-  describe('auction and user sync delays', function() {
+  describe('auction and user sync delays', function () {
     let sandbox;
     let adUnits;
     let mockIdCallback;
     let auctionSpy;
 
-    beforeEach(function() {
+    beforeEach(function () {
       sandbox = sinon.createSandbox();
       sandbox.stub(global, 'setTimeout').returns(2);
+      sandbox.stub(global, 'clearTimeout');
       sandbox.stub(events, 'on');
       sandbox.stub(coreStorage, 'getCookie');
 
@@ -490,12 +666,12 @@ describe('User ID', function() {
       mockIdCallback = sandbox.stub();
       const mockIdSystem = {
         name: 'mockId',
-        decode: function(value) {
+        decode: function (value) {
           return {
             'mid': value['MOCKID']
           };
         },
-        getId: function() {
+        getId: function () {
           const storedId = coreStorage.getCookie('MOCKID');
           if (storedId) {
             return {id: {'MOCKID': storedId}};
@@ -509,13 +685,13 @@ describe('User ID', function() {
       attachIdSystem(mockIdSystem, true);
     });
 
-    afterEach(function() {
+    afterEach(function () {
       $$PREBID_GLOBAL$$.requestBids.removeAll();
       config.resetConfig();
       sandbox.restore();
     });
 
-    it('delays auction if auctionDelay is set, timing out at auction delay', function() {
+    it('delays auction if auctionDelay is set, timing out at auction delay', function () {
       config.setConfig({
         userSync: {
           auctionDelay: 33,
@@ -529,6 +705,7 @@ describe('User ID', function() {
       requestBidsHook(auctionSpy, {adUnits});
 
       // check auction was delayed
+      global.clearTimeout.calledOnce.should.equal(false);
       global.setTimeout.calledOnce.should.equal(true);
       global.setTimeout.calledWith(sinon.match.func, 33);
       auctionSpy.calledOnce.should.equal(false);
@@ -548,7 +725,7 @@ describe('User ID', function() {
       events.on.called.should.equal(false);
     });
 
-    it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function(done) {
+    it('delays auction if auctionDelay is set, continuing auction if ids are fetched before timing out', function (done) {
       config.setConfig({
         userSync: {
           auctionDelay: 33,
@@ -563,6 +740,7 @@ describe('User ID', function() {
 
       // check auction was delayed
       // global.setTimeout.calledOnce.should.equal(true);
+      global.clearTimeout.calledOnce.should.equal(false);
       global.setTimeout.calledWith(sinon.match.func, 33);
       auctionSpy.calledOnce.should.equal(false);
 
@@ -587,7 +765,7 @@ describe('User ID', function() {
       events.on.called.should.equal(false);
     });
 
-    it('does not delay auction if not set, delays id fetch after auction ends with syncDelay', function() {
+    it('does not delay auction if not set, delays id fetch after auction ends with syncDelay', function () {
       config.setConfig({
         userSync: {
           syncDelay: 77,
@@ -623,7 +801,7 @@ describe('User ID', function() {
       mockIdCallback.calledOnce.should.equal(true);
     });
 
-    it('does not delay user id sync after auction ends if set to 0', function() {
+    it('does not delay user id sync after auction ends if set to 0', function () {
       config.setConfig({
         userSync: {
           syncDelay: 0,
@@ -652,10 +830,10 @@ describe('User ID', function() {
       mockIdCallback.calledOnce.should.equal(true);
     });
 
-    it('does not delay auction if there are no ids to fetch', function() {
+    it('does not delay auction if there are no ids to fetch', function () {
       coreStorage.getCookie.withArgs('MOCKID').returns('123456778');
       config.setConfig({
-        usersync: {
+        userSync: {
           auctionDelay: 33,
           syncDelay: 77,
           userIds: [{
@@ -675,21 +853,21 @@ describe('User ID', function() {
     });
   });
 
-  describe('Request bids hook appends userId to bid objs in adapters', function() {
+  describe('Request bids hook appends userId to bid objs in adapters', function () {
     let adUnits;
 
-    beforeEach(function() {
+    beforeEach(function () {
       adUnits = [getAdUnitMock()];
     });
 
-    it('test hook from pubcommonid cookie', function(done) {
+    it('test hook from pubcommonid cookie', function (done) {
       coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 100000).toUTCString()));
 
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.pubcid');
@@ -698,6 +876,10 @@ describe('User ID', function() {
               source: 'pubcid.org',
               uids: [{id: 'testpubcid', atype: 1}]
             });
+
+            // verify no sharedid was added
+            expect(bid.userId).to.not.have.property('sharedid');
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.be.undefined;
           });
         });
         coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
@@ -705,12 +887,42 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from pubcommonid config value object', function(done) {
+    it('test hook from pubcommonid html5', function (done) {
+      // simulate existing browser local storage values
+      localStorage.setItem('pubcid', 'testpubcid');
+      localStorage.setItem('pubcid_exp', new Date(Date.now() + 100000).toUTCString());
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'html5']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'pubcid.org',
+              uids: [{id: 'testpubcid', atype: 1}]
+            });
+
+            // verify no sharedid was added
+            expect(bid.userId).to.not.have.property('sharedid');
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.be.undefined;
+          });
+        });
+        localStorage.removeItem('pubcid');
+        localStorage.removeItem('pubcid_exp');
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from pubcommonid config value object', function (done) {
       setSubmoduleRegistry([pubCommonIdSubmodule]);
       init(config);
       config.setConfig(getConfigValueMock('pubCommonId', {'pubcidvalue': 'testpubcidvalue'}));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.pubcidvalue');
@@ -722,7 +934,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from pubcommonid html5', function(done) {
+    it('test hook from UnifiedId html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('unifiedid_alt', JSON.stringify({'TDID': 'testunifiedid_alt'}));
       localStorage.setItem('unifiedid_alt_exp', '');
@@ -731,7 +943,7 @@ describe('User ID', function() {
       init(config);
       config.setConfig(getConfigMock(['unifiedId', 'unifiedid_alt', 'html5']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.tdid');
@@ -748,7 +960,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from identityLink html5', function(done) {
+    it('test hook from identityLink html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('idl_env', 'AiGNC8Z5ONyZKSpIPf');
       localStorage.setItem('idl_env_exp', '');
@@ -756,14 +968,14 @@ describe('User ID', function() {
       setSubmoduleRegistry([identityLinkSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['identityLink', 'idl_env', 'html5']));
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.idl_env');
             expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveramp.com',
-              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 1}]
+              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 3}]
             });
           });
         });
@@ -773,21 +985,21 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from identityLink cookie', function(done) {
+    it('test hook from identityLink cookie', function (done) {
       coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 100000).toUTCString()));
 
       setSubmoduleRegistry([identityLinkSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['identityLink', 'idl_env', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.idl_env');
             expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveramp.com',
-              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 1}]
+              uids: [{id: 'AiGNC8Z5ONyZKSpIPf', atype: 3}]
             });
           });
         });
@@ -796,7 +1008,53 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from liveIntentId html5', function(done) {
+    it('test hook from criteoIdModule cookie', function (done) {
+      coreStorage.setCookie('storage_bidid', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 100000).toUTCString()));
+
+      setSubmoduleRegistry([criteoIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['criteo', 'storage_bidid', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.criteoId');
+            expect(bid.userId.criteoId).to.equal('test_bidid');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'criteo.com',
+              uids: [{id: 'test_bidid', atype: 1}]
+            });
+          });
+        });
+        coreStorage.setCookie('storage_bidid', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from tapadIdModule cookie', function (done) {
+      coreStorage.setCookie('tapad_id', 'test-tapad-id', (new Date(Date.now() + 100000).toUTCString()));
+
+      setSubmoduleRegistry([tapadIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['tapadId', 'tapad_id', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.tapadId');
+            expect(bid.userId.tapadId).to.equal('test-tapad-id');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'tapad.com',
+              uids: [{id: 'test-tapad-id', atype: 1}]
+            });
+          });
+        })
+        coreStorage.setCookie('tapad_id', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from liveIntentId html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier'}));
       localStorage.setItem('_li_pbid_exp', '');
@@ -804,14 +1062,14 @@ describe('User ID', function() {
       setSubmoduleRegistry([liveIntentIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.lipb');
             expect(bid.userId.lipb.lipbid).to.equal('random-ls-identifier');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveintent.com',
-              uids: [{id: 'random-ls-identifier', atype: 1}]
+              uids: [{id: 'random-ls-identifier', atype: 3}]
             });
           });
         });
@@ -821,21 +1079,21 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from liveIntentId cookie', function(done) {
+    it('test hook from liveIntentId cookie', function (done) {
       coreStorage.setCookie('_li_pbid', JSON.stringify({'unifiedId': 'random-cookie-identifier'}), (new Date(Date.now() + 100000).toUTCString()));
 
       setSubmoduleRegistry([liveIntentIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.lipb');
             expect(bid.userId.lipb.lipbid).to.equal('random-cookie-identifier');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveintent.com',
-              uids: [{id: 'random-cookie-identifier', atype: 1}]
+              uids: [{id: 'random-cookie-identifier', atype: 3}]
             });
           });
         });
@@ -844,7 +1102,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from sharedId html5', function(done) {
+    it('test hook from sharedId html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}));
       localStorage.setItem('sharedid_exp', '');
@@ -852,7 +1110,7 @@ describe('User ID', function() {
       setSubmoduleRegistry([sharedIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['sharedId', 'sharedid', 'html5']));
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.sharedid');
@@ -880,7 +1138,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from sharedId html5 (id not synced)', function(done) {
+    it('test hook from sharedId html5 (id not synced)', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('sharedid', JSON.stringify({'id': 'test_sharedId', 'ns': true, 'ts': 1590525289611}));
       localStorage.setItem('sharedid_exp', '');
@@ -888,7 +1146,7 @@ describe('User ID', function() {
       setSubmoduleRegistry([sharedIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['sharedId', 'sharedid', 'html5']));
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.sharedid');
@@ -910,14 +1168,17 @@ describe('User ID', function() {
         done();
       }, {adUnits});
     });
-    it('test hook from sharedId cookie', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 100000).toUTCString()));
+    it('test hook from sharedId cookie', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test_sharedId',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 100000).toUTCString()));
 
       setSubmoduleRegistry([sharedIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.sharedid');
@@ -943,14 +1204,18 @@ describe('User ID', function() {
         done();
       }, {adUnits});
     });
-    it('test hook from sharedId cookie (id not synced) ', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ns': true, 'ts': 1590525289611}), (new Date(Date.now() + 100000).toUTCString()));
+    it('test hook from sharedId cookie (id not synced) ', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test_sharedId',
+        'ns': true,
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 100000).toUTCString()));
 
       setSubmoduleRegistry([sharedIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.sharedid');
@@ -972,7 +1237,231 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from liveIntentId html5', function(done) {
+    it('eidPermissions fun with bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      let eidPermissions;
+      getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+        eidPermissions = newEidPermissions;
+      }
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              bidders: [
+                'sampleBidder'
+              ],
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        expect(eidPermissions).to.deep.equal(
+          [
+            {
+              bidders: [
+                'sampleBidder'
+              ],
+              source: 'sharedid.org'
+            }
+          ]
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            if (bid.bidder === 'sampleBidder') {
+              expect(bid).to.have.deep.nested.property('userId.sharedid');
+              expect(bid.userId.sharedid.id).to.equal('test222');
+              expect(bid.userIdAsEids[0]).to.deep.equal({
+                source: 'sharedid.org',
+                uids: [
+                  {
+                    id: 'test222',
+                    atype: 1,
+                    ext: {
+                      third: 'test222'
+                    }
+                  }
+                ]
+              });
+            }
+            if (bid.bidder === 'anotherSampleBidder') {
+              expect(bid).to.not.have.deep.nested.property('userId.sharedid');
+              expect(bid).to.not.have.property('userIdAsEids');
+            }
+          });
+        });
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        getPrebidInternal().setEidPermissions = undefined;
+        done();
+      }, {adUnits});
+    });
+
+    it('eidPermissions fun without bidders', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([sharedIdSubmodule]);
+      let eidPermissions;
+      getPrebidInternal().setEidPermissions = function (newEidPermissions) {
+        eidPermissions = newEidPermissions;
+      }
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [
+            {
+              name: 'sharedId',
+              storage: {
+                type: 'cookie',
+                name: 'sharedid',
+                expires: 28
+              }
+            }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        expect(eidPermissions).to.deep.equal(
+          []
+        );
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid.id).to.equal('test222');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'sharedid.org',
+              uids: [
+                {
+                  id: 'test222',
+                  atype: 1,
+                  ext: {
+                    third: 'test222'
+                  }
+                }]
+            });
+          });
+        });
+        getPrebidInternal().setEidPermissions = undefined;
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from pubProvidedId config params', function (done) {
+      setSubmoduleRegistry([pubProvidedIdSubmodule]);
+      init(config);
+      config.setConfig({
+        userSync: {
+          syncDelay: 0,
+          userIds: [{
+            name: 'pubProvidedId',
+            params: {
+              eids: [{
+                source: 'example.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'ppuid'
+                  }
+                }]
+              }, {
+                source: 'id-partner.com',
+                uids: [{
+                  id: 'value read from cookie or local storage',
+                  ext: {
+                    stype: 'dmp'
+                  }
+                }]
+              }],
+              eidsFunction: function () {
+                return [{
+                  source: 'provider.com',
+                  uids: [{
+                    id: 'value read from cookie or local storage',
+                    ext: {
+                      stype: 'sha256email'
+                    }
+                  }]
+                }]
+              }
+            }
+          }
+          ]
+        }
+      });
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.pubProvidedId');
+            expect(bid.userId.pubProvidedId).to.deep.equal([{
+              source: 'example.com',
+              uids: [{
+                id: 'value read from cookie or local storage',
+                ext: {
+                  stype: 'ppuid'
+                }
+              }]
+            }, {
+              source: 'id-partner.com',
+              uids: [{
+                id: 'value read from cookie or local storage',
+                ext: {
+                  stype: 'dmp'
+                }
+              }]
+            }, {
+              source: 'provider.com',
+              uids: [{
+                id: 'value read from cookie or local storage',
+                ext: {
+                  stype: 'sha256email'
+                }
+              }]
+            }]);
+
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'example.com',
+              uids: [{
+                id: 'value read from cookie or local storage',
+                ext: {
+                  stype: 'ppuid'
+                }
+              }]
+            });
+            expect(bid.userIdAsEids[2]).to.deep.equal({
+              source: 'provider.com',
+              uids: [{
+                id: 'value read from cookie or local storage',
+                ext: {
+                  stype: 'sha256email'
+                }
+              }]
+            });
+          });
+        });
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from liveIntentId html5', function (done) {
       // simulate existing browser local storage values
       localStorage.setItem('_li_pbid', JSON.stringify({'unifiedId': 'random-ls-identifier', 'segments': ['123']}));
       localStorage.setItem('_li_pbid_exp', '');
@@ -980,7 +1469,7 @@ describe('User ID', function() {
       setSubmoduleRegistry([liveIntentIdSubmodule]);
       init(config);
       config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'html5']));
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.lipb');
@@ -988,7 +1477,7 @@ describe('User ID', function() {
             expect(bid.userId.lipb.segments).to.include('123');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveintent.com',
-              uids: [{id: 'random-ls-identifier', atype: 1}],
+              uids: [{id: 'random-ls-identifier', atype: 3}],
               ext: {segments: ['123']}
             });
           });
@@ -999,7 +1488,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from liveIntentId cookie', function(done) {
+    it('test hook from liveIntentId cookie', function (done) {
       coreStorage.setCookie('_li_pbid', JSON.stringify({
         'unifiedId': 'random-cookie-identifier',
         'segments': ['123']
@@ -1009,7 +1498,7 @@ describe('User ID', function() {
       init(config);
       config.setConfig(getConfigMock(['liveIntentId', '_li_pbid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.lipb');
@@ -1017,7 +1506,7 @@ describe('User ID', function() {
             expect(bid.userId.lipb.segments).to.include('123');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'liveintent.com',
-              uids: [{id: 'random-cookie-identifier', atype: 1}],
+              uids: [{id: 'random-cookie-identifier', atype: 3}],
               ext: {segments: ['123']}
             });
           });
@@ -1027,7 +1516,7 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from britepoolid cookies', function(done) {
+    it('test hook from britepoolid cookies', function (done) {
       // simulate existing browser local storage values
       coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': '279c0161-5152-487f-809e-05d7f7e653fd'}), (new Date(Date.now() + 5000).toUTCString()));
 
@@ -1035,14 +1524,14 @@ describe('User ID', function() {
       init(config);
       config.setConfig(getConfigMock(['britepoolId', 'britepoolid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.britepoolid');
             expect(bid.userId.britepoolid).to.equal('279c0161-5152-487f-809e-05d7f7e653fd');
             expect(bid.userIdAsEids[0]).to.deep.equal({
               source: 'britepool.com',
-              uids: [{id: '279c0161-5152-487f-809e-05d7f7e653fd', atype: 1}]
+              uids: [{id: '279c0161-5152-487f-809e-05d7f7e653fd', atype: 3}]
             });
           });
         });
@@ -1051,7 +1540,31 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook from netId cookies', function(done) {
+    it('test hook from dmdId cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([dmdIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['dmdId', 'dmdId', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.dmdId');
+            expect(bid.userId.dmdId).to.equal('testdmdId');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'hcn.health',
+              uids: [{id: 'testdmdId', atype: 3}]
+            });
+          });
+        });
+        coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from netId cookies', function (done) {
       // simulate existing browser local storage values
       coreStorage.setCookie('netId', JSON.stringify({'netId': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg'}), (new Date(Date.now() + 5000).toUTCString()));
 
@@ -1059,7 +1572,7 @@ describe('User ID', function() {
       init(config);
       config.setConfig(getConfigMock(['netId', 'netId', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid).to.have.deep.nested.property('userId.netId');
@@ -1075,26 +1588,260 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('test hook when pubCommonId, unifiedId, id5Id, identityLink, britepoolId, netId and sharedId have data to pass', function(done) {
-      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'testunifiedid'}), (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('id5id', JSON.stringify({'universal_uid': 'testid5id'}), (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': 'testbritepoolid'}), (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('netId', JSON.stringify({'netId': 'testnetId'}), (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+    it('test hook from intentIqId cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('intentIqId', 'abcdefghijk', (new Date(Date.now() + 5000).toUTCString()));
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
+      setSubmoduleRegistry([intentIqIdSubmodule]);
       init(config);
-      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
-        ['unifiedId', 'unifiedid', 'cookie'],
-        ['id5Id', 'id5id', 'cookie'],
-        ['identityLink', 'idl_env', 'cookie'],
-        ['britepoolId', 'britepoolid', 'cookie'],
-        ['netId', 'netId', 'cookie'],
-        ['sharedId', 'sharedid', 'cookie']));
+      config.setConfig(getConfigMock(['intentIqId', 'intentIqId', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.intentIqId');
+            expect(bid.userId.intentIqId).to.equal('abcdefghijk');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'intentiq.com',
+              uids: [{id: 'abcdefghijk', atype: 1}]
+            });
+          });
+        });
+        coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from haloId html5', function (done) {
+      // simulate existing browser local storage values
+      localStorage.setItem('haloId', JSON.stringify({'haloId': 'random-ls-identifier'}));
+      localStorage.setItem('haloId_exp', '');
+
+      setSubmoduleRegistry([haloIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['haloId', 'haloId', 'html5']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.haloId');
+            expect(bid.userId.haloId).to.equal('random-ls-identifier');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'audigent.com',
+              uids: [{id: 'random-ls-identifier', atype: 1}]
+            });
+          });
+        });
+        localStorage.removeItem('haloId');
+        localStorage.removeItem('haloId_exp', '');
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from merkleId cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('merkleId', JSON.stringify({'pam_id': {'id': 'testmerkleId', 'keyID': 1}}), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([merkleIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['merkleId', 'merkleId', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.merkleId');
+            expect(bid.userId.merkleId).to.deep.equal({'id': 'testmerkleId', 'keyID': 1});
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'merkleinc.com',
+              uids: [{id: 'testmerkleId', atype: 3, ext: {keyID: 1}}]
+            });
+          });
+        });
+        coreStorage.setCookie('merkleId', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from zeotapIdPlus cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('IDP', btoa(JSON.stringify('abcdefghijk')), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([zeotapIdPlusSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['zeotapIdPlus', 'IDP', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.IDP');
+            expect(bid.userId.IDP).to.equal('abcdefghijk');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'zeotap.com',
+              uids: [{id: 'abcdefghijk', atype: 1}]
+            });
+          });
+        });
+        coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from mwOpenLinkId cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([mwOpenLinkIdSubModule]);
+      init(config);
+      config.setConfig(getConfigMock(['mwOpenLinkId', 'mwol', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.mwOpenLinkId');
+            expect(bid.userId.mwOpenLinkId).to.equal('XX-YY-ZZ-123');
+          });
+        });
+        coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from admixerId html5', function (done) {
+      // simulate existing browser local storage values
+      localStorage.setItem('admixerId', 'testadmixerId');
+      localStorage.setItem('admixerId_exp', '');
+
+      setSubmoduleRegistry([admixerIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['admixerId', 'admixerId', 'html5']));
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.admixerId');
+            expect(bid.userId.admixerId).to.equal('testadmixerId');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'admixer.net',
+              uids: [{id: 'testadmixerId', atype: 3}]
+            });
+          });
+        });
+        localStorage.removeItem('admixerId');
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from admixerId cookie', function (done) {
+      coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 100000).toUTCString()));
+
+      setSubmoduleRegistry([admixerIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['admixerId', 'admixerId', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.admixerId');
+            expect(bid.userId.admixerId).to.equal('testadmixerId');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'admixer.net',
+              uids: [{id: 'testadmixerId', atype: 3}]
+            });
+          });
+        });
+        coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from deepintentId cookies', function (done) {
+      // simulate existing browser local storage values
+      coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([deepintentDpesSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.deepintentId');
+            expect(bid.userId.deepintentId).to.deep.equal('testdeepintentId');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'deepintent.com',
+              uids: [{id: 'testdeepintentId', atype: 3}]
+            });
+          });
+        });
+        coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from deepintentId html5', function (done) {
+      // simulate existing browser local storage values
+      localStorage.setItem('deepintentId', 'testdeepintentId');
+      localStorage.setItem('deepintentId_exp', '');
+
+      setSubmoduleRegistry([deepintentDpesSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['deepintentId', 'deepintentId', 'html5']));
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.deepintentId');
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'deepintent.com',
+              uids: [{id: 'testdeepintentId', atype: 3}]
+            });
+          });
+        });
+        localStorage.removeItem('deepintentId');
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook when pubCommonId, unifiedId, id5Id, identityLink, britepoolId, intentIqId, zeotapIdPlus, sharedId, netId, haloId, Criteo, UID 2.0, admixerId, dmdId and mwOpenLinkId have data to pass', function (done) {
+      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'testunifiedid'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('id5id', JSON.stringify({'universal_uid': 'testid5id'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': 'testbritepoolid'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('netId', JSON.stringify({'netId': 'testnetId'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('intentIqId', 'testintentIqId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('IDP', btoa(JSON.stringify('zeotapId')), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test_sharedId',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('haloId', JSON.stringify({'haloId': 'testHaloId'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('storage_criteo', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, criteoIdSubmodule, mwOpenLinkIdSubModule, tapadIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
+        ['unifiedId', 'unifiedid', 'cookie'],
+        ['id5Id', 'id5id', 'cookie'],
+        ['identityLink', 'idl_env', 'cookie'],
+        ['britepoolId', 'britepoolid', 'cookie'],
+        ['dmdId', 'dmdId', 'cookie'],
+        ['netId', 'netId', 'cookie'],
+        ['sharedId', 'sharedid', 'cookie'],
+        ['intentIqId', 'intentIqId', 'cookie'],
+        ['zeotapIdPlus', 'IDP', 'cookie'],
+        ['haloId', 'haloId', 'cookie'],
+        ['criteo', 'storage_criteo', 'cookie'],
+        ['mwOpenLinkId', 'mwol', 'cookie'],
+        ['tapadId', 'tapad_id', 'cookie'],
+        ['uid2', 'uid2id', 'cookie'],
+        ['admixerId', 'admixerId', 'cookie'],
+        ['deepintentId', 'deepintentId', 'cookie']));
+
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             // verify that the PubCommonId id data was copied to bid
@@ -1104,14 +1851,17 @@ describe('User ID', function() {
             expect(bid).to.have.deep.nested.property('userId.tdid');
             expect(bid.userId.tdid).to.equal('testunifiedid');
             // also check that Id5Id id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.id5id');
-            expect(bid.userId.id5id).to.equal('testid5id');
+            expect(bid).to.have.deep.nested.property('userId.id5id.uid');
+            expect(bid.userId.id5id.uid).to.equal('testid5id');
             // check that identityLink id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.idl_env');
             expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
             // also check that britepoolId id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.britepoolid');
             expect(bid.userId.britepoolid).to.equal('testbritepoolid');
+            // also check that dmdID id was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.dmdId');
+            expect(bid.userId.dmdId).to.equal('testdmdId');
             // also check that netId id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.netId');
             expect(bid.userId.netId).to.equal('testnetId');
@@ -1120,7 +1870,33 @@ describe('User ID', function() {
               id: 'test_sharedId',
               third: 'test_sharedId'
             });
-            expect(bid.userIdAsEids.length).to.equal(7);
+            // also check that intentIqId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.intentIqId');
+            expect(bid.userId.intentIqId).to.equal('testintentIqId');
+            // also check that zeotapIdPlus id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.IDP');
+            expect(bid.userId.IDP).to.equal('zeotapId');
+            // also check that haloId id was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.haloId');
+            expect(bid.userId.haloId).to.equal('testHaloId');
+            // also check that criteo id was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.criteoId');
+            expect(bid.userId.criteoId).to.equal('test_bidid');
+            // also check that mwOpenLink id was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.mwOpenLinkId');
+            expect(bid.userId.mwOpenLinkId).to.equal('XX-YY-ZZ-123');
+            expect(bid.userId.uid2).to.deep.equal({
+              id: 'Sample_AD_Token'
+            });
+            // also check that criteo id was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.admixerId');
+            expect(bid.userId.admixerId).to.equal('testadmixerId');
+
+            // also check that deepintentId was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.deepintentId');
+            expect(bid.userId.deepintentId).to.equal('testdeepintentId');
+
+            expect(bid.userIdAsEids.length).to.equal(16);
           });
         });
         coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
@@ -1128,38 +1904,41 @@ describe('User ID', function() {
         coreStorage.setCookie('id5id', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('idl_env', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('haloId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('storage_criteo', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('uid2id', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('deepintentId', EXPIRED_COOKIE_DATE);
         done();
       }, {adUnits});
     });
 
-    it('test hook when sharedId (opted out) have data to pass', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': '00000000000000000000000000', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
-
-      setSubmoduleRegistry([sharedIdSubmodule]);
-      init(config);
-      config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
-
-      requestBidsHook(function() {
-        adUnits.forEach(unit => {
-          unit.bids.forEach(bid => {
-            expect(bid.userIdAsEids).to.be.undefined;
-          });
-        });
-        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
-        done();
-      }, {adUnits});
-    });
-
-    it('test hook when pubCommonId, unifiedId, id5Id, britepoolId, netId and sharedId have their modules added before and after init', function(done) {
+    it('test hook when pubCommonId, unifiedId, id5Id, britepoolId, dmdId, intentIqId, zeotapIdPlus, sharedId, criteo, netId, haloId, UID 2.0, admixerId and mwOpenLinkId have their modules added before and after init', function (done) {
       coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'cookie-value-add-module-variations'}), new Date(Date.now() + 5000).toUTCString());
       coreStorage.setCookie('id5id', JSON.stringify({'universal_uid': 'testid5id'}), (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', new Date(Date.now() + 5000).toUTCString());
       coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': 'testbritepoolid'}), (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('netId', JSON.stringify({'netId': 'testnetId'}), (new Date(Date.now() + 5000).toUTCString()));
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test_sharedId',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('intentIqId', 'testintentIqId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('IDP', btoa(JSON.stringify('zeotapId')), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('haloId', JSON.stringify({'haloId': 'testHaloId'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('storage_criteo', JSON.stringify({'criteoId': 'test_bidid'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('mwol', JSON.stringify({eid: 'XX-YY-ZZ-123'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('admixerId', 'testadmixerId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('deepintentId', 'testdeepintentId', (new Date(Date.now() + 5000).toUTCString()));
 
       setSubmoduleRegistry([]);
 
@@ -1175,6 +1954,16 @@ describe('User ID', function() {
       attachIdSystem(britepoolIdSubmodule);
       attachIdSystem(netIdSubmodule);
       attachIdSystem(sharedIdSubmodule);
+      attachIdSystem(intentIqIdSubmodule);
+      attachIdSystem(zeotapIdPlusSubmodule);
+      attachIdSystem(haloIdSubmodule);
+      attachIdSystem(dmdIdSubmodule);
+      attachIdSystem(criteoIdSubmodule);
+      attachIdSystem(mwOpenLinkIdSubModule);
+      attachIdSystem(tapadIdSubmodule);
+      attachIdSystem(uid2IdSubmodule);
+      attachIdSystem(admixerIdSubmodule);
+      attachIdSystem(deepintentDpesSubmodule);
 
       config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
         ['unifiedId', 'unifiedid', 'cookie'],
@@ -1182,9 +1971,19 @@ describe('User ID', function() {
         ['identityLink', 'idl_env', 'cookie'],
         ['britepoolId', 'britepoolid', 'cookie'],
         ['netId', 'netId', 'cookie'],
-        ['sharedId', 'sharedid', 'cookie']));
-
-      requestBidsHook(function() {
+        ['sharedId', 'sharedid', 'cookie'],
+        ['intentIqId', 'intentIqId', 'cookie'],
+        ['zeotapIdPlus', 'IDP', 'cookie'],
+        ['haloId', 'haloId', 'cookie'],
+        ['dmdId', 'dmdId', 'cookie'],
+        ['criteo', 'storage_criteo', 'cookie'],
+        ['mwOpenLinkId', 'mwol', 'cookie'],
+        ['tapadId', 'tapad_id', 'cookie'],
+        ['uid2', 'uid2id', 'cookie'],
+        ['admixerId', 'admixerId', 'cookie'],
+        ['deepintentId', 'deepintentId', 'cookie']));
+
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             // verify that the PubCommonId id data was copied to bid
@@ -1194,8 +1993,8 @@ describe('User ID', function() {
             expect(bid).to.have.deep.nested.property('userId.tdid');
             expect(bid.userId.tdid).to.equal('cookie-value-add-module-variations');
             // also check that Id5Id id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.id5id');
-            expect(bid.userId.id5id).to.equal('testid5id');
+            expect(bid).to.have.deep.nested.property('userId.id5id.uid');
+            expect(bid.userId.id5id.uid).to.equal('testid5id');
             // also check that identityLink id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.idl_env');
             expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
@@ -1210,7 +2009,39 @@ describe('User ID', function() {
               id: 'test_sharedId',
               third: 'test_sharedId'
             });
-            expect(bid.userIdAsEids.length).to.equal(7);
+            // also check that intentIqId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.intentIqId');
+            expect(bid.userId.intentIqId).to.equal('testintentIqId');
+
+            // also check that zeotapIdPlus id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.IDP');
+            expect(bid.userId.IDP).to.equal('zeotapId');
+            // also check that haloId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.haloId');
+            expect(bid.userId.haloId).to.equal('testHaloId');
+            // also check that dmdId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.dmdId');
+            expect(bid.userId.dmdId).to.equal('testdmdId');
+
+            // also check that criteo id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.criteoId');
+            expect(bid.userId.criteoId).to.equal('test_bidid');
+
+            // also check that mwOpenLink id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.mwOpenLinkId');
+            expect(bid.userId.mwOpenLinkId).to.equal('XX-YY-ZZ-123')
+            expect(bid.userId.uid2).to.deep.equal({
+              id: 'Sample_AD_Token'
+            });
+
+            // also check that admixerId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.admixerId');
+            expect(bid.userId.admixerId).to.equal('testadmixerId');
+            // also check that deepintentId was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.deepintentId');
+            expect(bid.userId.deepintentId).to.equal('testdeepintentId');
+
+            expect(bid.userIdAsEids.length).to.equal(16);
           });
         });
         coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
@@ -1220,12 +2051,24 @@ describe('User ID', function() {
         coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('haloId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('storage_criteo', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('uid2id', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
         done();
       }, {adUnits});
     });
 
-    it('test hook when sharedId(opted out) have their modules added before and after init', function(done) {
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': '00000000000000000000000000', 'ts': 1590525289611}), (new Date(Date.now() + 5000).toUTCString()));
+    it('test hook when sharedId(opted out) have their modules added before and after init', function (done) {
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': '00000000000000000000000000',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
 
       setSubmoduleRegistry([]);
       init(config);
@@ -1234,7 +2077,7 @@ describe('User ID', function() {
 
       config.setConfig(getConfigMock(['sharedId', 'sharedid', 'cookie']));
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             expect(bid.userIdAsEids).to.be.undefined;
@@ -1245,17 +2088,241 @@ describe('User ID', function() {
       }, {adUnits});
     });
 
-    it('should add new id system ', function(done) {
+    it('test sharedid enabled via pubcid cookie', function (done) {
+      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('pubcid_sharedid', 'testsharedid', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+
+      const customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      addConfig(customCfg, 'params', {enableSharedId: true});
+      config.setConfig(customCfg);
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            // verify that the PubCommonId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(findEid(bid.userIdAsEids, 'pubcid.org')).to.deep.equal(
+              {'source': 'pubcid.org', 'uids': [{'id': 'testpubcid', 'atype': 1}]}
+            );
+            // verify that the sharedid was also copied to bid
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid).to.deep.equal({id: 'testsharedid'});
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.deep.equal(
+              {'source': 'sharedid.org', 'uids': [{'id': 'testsharedid', 'atype': 1}]}
+            );
+          });
+        });
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
+
+        done();
+      }, {adUnits});
+    });
+
+    it('test sharedid disabled via pubcid cookie', function (done) {
+      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('pubcid_sharedid', 'testsharedid', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+
+      // pubCommonId's support for sharedId is off by default
+      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            // verify that the PubCommonId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(findEid(bid.userIdAsEids, 'pubcid.org')).to.deep.equal(
+              {'source': 'pubcid.org', 'uids': [{'id': 'testpubcid', 'atype': 1}]}
+            );
+            // verify that the sharedid was not added to bid
+            expect(bid.userId).to.not.have.property('sharedid');
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.be.undefined;
+          });
+        });
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
+
+        done();
+      }, {adUnits});
+    });
+
+    it('test sharedid enabled via pubcid html5', function (done) {
+      coreStorage.setDataInLocalStorage('pubcid', 'testpubcid');
+      coreStorage.setDataInLocalStorage('pubcid_exp', new Date(Date.now() + 5000).toUTCString());
+      coreStorage.setDataInLocalStorage('pubcid_sharedid', 'testsharedid');
+      coreStorage.setDataInLocalStorage('pubcid_sharedid_exp', new Date(Date.now() + 5000).toUTCString());
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+
+      const customCfg = getConfigMock(['pubCommonId', 'pubcid', 'html5']);
+      addConfig(customCfg, 'params', {enableSharedId: true});
+      config.setConfig(customCfg);
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            // verify that the PubCommonId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(findEid(bid.userIdAsEids, 'pubcid.org')).to.deep.equal(
+              {'source': 'pubcid.org', 'uids': [{'id': 'testpubcid', 'atype': 1}]}
+            );
+            // verify that the sharedid was also copied to bid
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid).to.deep.equal({id: 'testsharedid'});
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.deep.equal(
+              {'source': 'sharedid.org', 'uids': [{'id': 'testsharedid', 'atype': 1}]}
+            );
+          });
+        });
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
+
+        coreStorage.removeDataFromLocalStorage('pubcid');
+        coreStorage.removeDataFromLocalStorage('pubcid_exp');
+        coreStorage.removeDataFromLocalStorage('pubcid_sharedid');
+        coreStorage.removeDataFromLocalStorage('pubcid_sharedid_exp');
+        done();
+      }, {adUnits});
+    });
+
+    it('test expired sharedid via pubcid html5', function (done) {
+      coreStorage.setDataInLocalStorage('pubcid', 'testpubcid');
+      coreStorage.setDataInLocalStorage('pubcid_exp', new Date(Date.now() + 5000).toUTCString());
+
+      // set sharedid to expired already
+      coreStorage.setDataInLocalStorage('pubcid_sharedid', 'testsharedid');
+      coreStorage.setDataInLocalStorage('pubcid_sharedid_exp', new Date(Date.now() - 100).toUTCString());
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+
+      const customCfg = getConfigMock(['pubCommonId', 'pubcid', 'html5']);
+      addConfig(customCfg, 'params', {enableSharedId: true});
+      config.setConfig(customCfg);
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            // verify that the PubCommonId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(findEid(bid.userIdAsEids, 'pubcid.org')).to.deep.equal(
+              {'source': 'pubcid.org', 'uids': [{'id': 'testpubcid', 'atype': 1}]}
+            );
+            // verify that the sharedid was not added
+            expect(bid.userId).to.not.have.property('sharedid');
+            expect(findEid(bid.userIdAsEids, 'sharedid.org')).to.be.undefined;
+          });
+        });
+
+        coreStorage.removeDataFromLocalStorage('pubcid');
+        coreStorage.removeDataFromLocalStorage('pubcid_exp');
+        coreStorage.removeDataFromLocalStorage('pubcid_sharedid');
+        coreStorage.removeDataFromLocalStorage('pubcid_sharedid_exp');
+        done();
+      }, {adUnits});
+    });
+
+    it('test pubcid coexisting with sharedid', function (done) {
+      coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('pubcid_sharedid', 'test111', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test222',
+        'ts': 1590525289611
+      }), (new Date(Date.now() + 5000).toUTCString()));
+
+      // When both pubcommon and sharedid are configured, pubcommon are invoked first due to
+      // module loading order.  This mean the output from the primary sharedid module will overwrite
+      // the one in pubcommon.
+
+      setSubmoduleRegistry([pubCommonIdSubmodule, sharedIdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['pubCommonId', 'pubcid', 'cookie'],
+        ['sharedId', 'sharedid', 'cookie'],
+      ));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            // verify that the PubCommonId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.pubcid');
+            expect(bid.userId.pubcid).to.equal('testpubcid');
+            expect(findEid(bid.userIdAsEids, 'pubcid.org')).to.deep.equal(
+              {'source': 'pubcid.org', 'uids': [{'id': 'testpubcid', 'atype': 1}]}
+            );
+            // verify that the sharedid was also copied to bid
+            expect(bid).to.have.deep.nested.property('userId.sharedid');
+            expect(bid.userId.sharedid.id).to.equal('test222');
+            expect(findEid(bid.userIdAsEids, 'sharedid.org').uids[0].id).to.equal('test222');
+          });
+        });
+        coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+
+        done();
+      }, {adUnits});
+    });
+
+    it('test hook from UID2 cookie', function (done) {
+      coreStorage.setCookie('uid2id', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
+
+      setSubmoduleRegistry([uid2IdSubmodule]);
+      init(config);
+      config.setConfig(getConfigMock(['uid2', 'uid2id', 'cookie']));
+
+      requestBidsHook(function () {
+        adUnits.forEach(unit => {
+          unit.bids.forEach(bid => {
+            expect(bid).to.have.deep.nested.property('userId.uid2');
+            expect(bid.userId.uid2).to.have.deep.nested.property('id');
+            expect(bid.userId.uid2).to.deep.equal({
+              id: 'Sample_AD_Token'
+            });
+            expect(bid.userIdAsEids[0]).to.deep.equal({
+              source: 'uidapi.com',
+              uids: [{
+                id: 'Sample_AD_Token',
+                atype: 3,
+              }]
+            });
+          });
+        });
+        coreStorage.setCookie('uid2id', '', EXPIRED_COOKIE_DATE);
+        done();
+      }, {adUnits});
+    });
+    it('should add new id system ', function (done) {
       coreStorage.setCookie('pubcid', 'testpubcid', (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('unifiedid', JSON.stringify({'TDID': 'cookie-value-add-module-variations'}), new Date(Date.now() + 5000).toUTCString());
       coreStorage.setCookie('id5id', JSON.stringify({'universal_uid': 'testid5id'}), (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('idl_env', 'AiGNC8Z5ONyZKSpIPf', new Date(Date.now() + 5000).toUTCString());
       coreStorage.setCookie('britepoolid', JSON.stringify({'primaryBPID': 'testbritepoolid'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('dmdId', 'testdmdId', (new Date(Date.now() + 5000).toUTCString()));
       coreStorage.setCookie('netId', JSON.stringify({'netId': 'testnetId'}), new Date(Date.now() + 5000).toUTCString());
-      coreStorage.setCookie('sharedid', JSON.stringify({'id': 'test_sharedId', 'ts': 1590525289611}), new Date(Date.now() + 5000).toUTCString());
+      coreStorage.setCookie('sharedid', JSON.stringify({
+        'id': 'test_sharedId',
+        'ts': 1590525289611
+      }), new Date(Date.now() + 5000).toUTCString());
+      coreStorage.setCookie('intentIqId', 'testintentIqId', (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('IDP', btoa(JSON.stringify('zeotapId')), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('haloId', JSON.stringify({'haloId': 'testHaloId'}), (new Date(Date.now() + 5000).toUTCString()));
+      coreStorage.setCookie('admixerId', 'testadmixerId', new Date(Date.now() + 5000).toUTCString());
+      coreStorage.setCookie('deepintentId', 'testdeepintentId', new Date(Date.now() + 5000).toUTCString());
       coreStorage.setCookie('MOCKID', JSON.stringify({'MOCKID': '123456778'}), new Date(Date.now() + 5000).toUTCString());
+      coreStorage.setCookie('__uid2_advertising_token', 'Sample_AD_Token', (new Date(Date.now() + 5000).toUTCString()));
 
-      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule]);
+      setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule, id5IdSubmodule, identityLinkSubmodule, britepoolIdSubmodule, netIdSubmodule, sharedIdSubmodule, intentIqIdSubmodule, zeotapIdPlusSubmodule, haloIdSubmodule, uid2IdSubmodule, admixerIdSubmodule, deepintentDpesSubmodule, dmdIdSubmodule]);
       init(config);
 
       config.setConfig({
@@ -1271,12 +2338,26 @@ describe('User ID', function() {
             name: 'identityLink', storage: {name: 'idl_env', type: 'cookie'}
           }, {
             name: 'britepoolId', storage: {name: 'britepoolid', type: 'cookie'}
+          }, {
+            name: 'dmdId', storage: {name: 'dmdId', type: 'cookie'}
           }, {
             name: 'netId', storage: {name: 'netId', type: 'cookie'}
           }, {
             name: 'sharedId', storage: {name: 'sharedid', type: 'cookie'}
+          }, {
+            name: 'intentIqId', storage: {name: 'intentIqId', type: 'cookie'}
+          }, {
+            name: 'zeotapIdPlus'
+          }, {
+            name: 'haloId', storage: {name: 'haloId', type: 'cookie'}
+          }, {
+            name: 'admixerId', storage: {name: 'admixerId', type: 'cookie'}
           }, {
             name: 'mockId', storage: {name: 'MOCKID', type: 'cookie'}
+          }, {
+            name: 'uid2'
+          }, {
+            name: 'deepintentId', storage: {name: 'deepintentId', type: 'cookie'}
           }]
         }
       });
@@ -1284,18 +2365,18 @@ describe('User ID', function() {
       // Add new submodule named 'mockId'
       attachIdSystem({
         name: 'mockId',
-        decode: function(value) {
+        decode: function (value) {
           return {
             'mid': value['MOCKID']
           };
         },
-        getId: function(params, storedId) {
+        getId: function (config, storedId) {
           if (storedId) return {};
           return {id: {'MOCKID': '1234'}};
         }
       });
 
-      requestBidsHook(function() {
+      requestBidsHook(function () {
         adUnits.forEach(unit => {
           unit.bids.forEach(bid => {
             // check PubCommonId id data was copied to bid
@@ -1305,14 +2386,17 @@ describe('User ID', function() {
             expect(bid).to.have.deep.nested.property('userId.tdid');
             expect(bid.userId.tdid).to.equal('cookie-value-add-module-variations');
             // also check that Id5Id id data was copied to bid
-            expect(bid).to.have.deep.nested.property('userId.id5id');
-            expect(bid.userId.id5id).to.equal('testid5id');
+            expect(bid).to.have.deep.nested.property('userId.id5id.uid');
+            expect(bid.userId.id5id.uid).to.equal('testid5id');
             // also check that identityLink id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.idl_env');
             expect(bid.userId.idl_env).to.equal('AiGNC8Z5ONyZKSpIPf');
             // also check that britepoolId id data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.britepoolid');
             expect(bid.userId.britepoolid).to.equal('testbritepoolid');
+            // also check that dmdId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.dmdId');
+            expect(bid.userId.dmdId).to.equal('testdmdId');
             // check MockId data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.netId');
             expect(bid.userId.netId).to.equal('testnetId');
@@ -1324,8 +2408,29 @@ describe('User ID', function() {
             });
             // check MockId data was copied to bid
             expect(bid).to.have.deep.nested.property('userId.mid');
-            expect(bid.userId.mid).to.equal('123456778');
-            expect(bid.userIdAsEids.length).to.equal(7);// mid is unknown for eids.js
+            expect(bid.userId.mid).to.equal('1234');
+            // also check that intentIqId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.intentIqId');
+            expect(bid.userId.intentIqId).to.equal('testintentIqId');
+            // also check that zeotapIdPlus id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.IDP');
+            expect(bid.userId.IDP).to.equal('zeotapId');
+            // also check that haloId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.haloId');
+            expect(bid.userId.haloId).to.equal('testHaloId');
+            expect(bid.userId.uid2).to.deep.equal({
+              id: 'Sample_AD_Token'
+            });
+
+            // also check that admixerId id data was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.admixerId');
+            expect(bid.userId.admixerId).to.equal('testadmixerId');
+
+            // also check that deepintentId was copied to bid
+            expect(bid).to.have.deep.nested.property('userId.deepintentId');
+            expect(bid.userId.deepintentId).to.equal('testdeepintentId');
+
+            expect(bid.userIdAsEids.length).to.equal(14);
           });
         });
         coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
@@ -1335,33 +2440,44 @@ describe('User ID', function() {
         coreStorage.setCookie('britepoolid', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('netId', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('sharedid', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('intentIqId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('IDP', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('haloId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('dmdId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('admixerId', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('deepintentId', '', EXPIRED_COOKIE_DATE);
         coreStorage.setCookie('MOCKID', '', EXPIRED_COOKIE_DATE);
+        coreStorage.setCookie('mwol', '', EXPIRED_COOKIE_DATE);
         done();
       }, {adUnits});
     });
   });
 
-  describe('callbacks at the end of auction', function() {
-    beforeEach(function() {
+  describe('callbacks at the end of auction', function () {
+    beforeEach(function () {
       sinon.stub(events, 'getEvents').returns([]);
       sinon.stub(utils, 'triggerPixel');
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
     });
 
-    afterEach(function() {
+    afterEach(function () {
       events.getEvents.restore();
       utils.triggerPixel.restore();
       coreStorage.setCookie('pubcid', '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie('pubcid_sharedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('unifiedid', '', EXPIRED_COOKIE_DATE);
       coreStorage.setCookie('_parrable_eid', '', EXPIRED_COOKIE_DATE);
+      resetConsentData();
+      delete window.__tcfapi;
     });
 
-    it('pubcid callback with url', function() {
+    it('pubcid callback with url', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
-      let customCfg = getConfigMock(['pubCommonId', 'pubcid_alt', 'cookie']);
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
       customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url'});
 
       setSubmoduleRegistry([pubCommonIdSubmodule, unifiedIdSubmodule]);
@@ -1376,7 +2492,7 @@ describe('User ID', function() {
       expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
     });
 
-    it('unifiedid callback with url', function() {
+    it('unifiedid callback with url', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
@@ -1394,7 +2510,7 @@ describe('User ID', function() {
       expect(server.requests[0].url).to.equal('/any/unifiedid/url');
     });
 
-    it('unifiedid callback with partner', function() {
+    it('unifiedid callback with partner', function () {
       let adUnits = [getAdUnitMock()];
       let innerAdUnits;
       let customCfg = getConfigMock(['unifiedId', 'unifiedid', 'cookie']);
@@ -1411,5 +2527,436 @@ describe('User ID', function() {
       events.emit(CONSTANTS.EVENTS.REQUEST_BIDS, {});
       expect(server.requests[0].url).to.equal('https://match.adsrvr.org/track/rid?ttd_pid=rubicon&fmt=json');
     });
+
+    it('verify sharedid callback via pubcid when enabled', function () {
+      let adUnits = [getAdUnitMock()];
+      let innerAdUnits;
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url', enableSharedId: true});
+
+      server.respondWith('https://id.sharedid.org/id', function(xhr) {
+        xhr.respond(200, {}, '{"sharedId":"testsharedid"}');
+      });
+      server.respondImmediately = true;
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(customCfg);
+      requestBidsHook((config) => {
+        innerAdUnits = config.adUnits
+      }, {adUnits});
+
+      expect(utils.triggerPixel.called).to.be.false;
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+
+      expect(server.requests[0].url).to.equal('https://id.sharedid.org/id');
+      expect(coreStorage.getCookie('pubcid_sharedid')).to.equal('testsharedid');
+    });
+
+    it('verify no sharedid callback via pubcid when disabled', function () {
+      let adUnits = [getAdUnitMock()];
+      let innerAdUnits;
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url'});
+
+      server.respondWith('https://id.sharedid.org/id', function(xhr) {
+        xhr.respond(200, {}, '{"sharedId":"testsharedid"}');
+      });
+      server.respondImmediately = true;
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(customCfg);
+      requestBidsHook((config) => {
+        innerAdUnits = config.adUnits
+      }, {adUnits});
+
+      expect(utils.triggerPixel.called).to.be.false;
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+
+      expect(server.requests).to.have.lengthOf(0);
+      expect(coreStorage.getCookie('pubcid_sharedid')).to.be.null;
+    });
+
+    it('verify sharedid optout via pubcid when enabled', function () {
+      let adUnits = [getAdUnitMock()];
+      let innerAdUnits;
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url', enableSharedId: true});
+      coreStorage.setCookie('pubcid_sharedid', 'testsharedid', (new Date(Date.now() + 5000).toUTCString()));
+
+      server.respondWith('https://id.sharedid.org/id', function(xhr) {
+        xhr.respond(200, {}, '{"sharedId":"00000000000000000000000000"}');
+      });
+      server.respondImmediately = true;
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(customCfg);
+      requestBidsHook((config) => {
+        innerAdUnits = config.adUnits
+      }, {adUnits});
+
+      expect(utils.triggerPixel.called).to.be.false;
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+
+      expect(server.requests[0].url).to.equal('https://id.sharedid.org/id');
+      expect(coreStorage.getCookie('pubcid_sharedid')).to.be.null;
+    });
+
+    it('verify sharedid called with consent data when gdpr applies', function () {
+      let adUnits = [getAdUnitMock()];
+      let customCfg = getConfigMock(['pubCommonId', 'pubcid', 'cookie']);
+      let consentConfig = {
+        cmpApi: 'iab',
+        timeout: 7500,
+        allowAuctionWithoutConsent: false
+      };
+      customCfg = addConfig(customCfg, 'params', {pixelUrl: '/any/pubcid/url', enableSharedId: true});
+
+      server.respondWith('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234', function(xhr) {
+        xhr.respond(200, {}, '{"sharedId":"testsharedid"}');
+      });
+      server.respondImmediately = true;
+
+      let testConsentData = {
+        tcString: 'abc12345234',
+        gdprApplies: true,
+        purposeOneTreatment: false,
+        eventStatus: 'tcloaded',
+        vendor: {consents: {887: true}},
+        purpose: {
+          consents: {
+            1: true
+          }
+        }
+      };
+
+      window.__tcfapi = function () { };
+      sinon.stub(window, '__tcfapi').callsFake((...args) => {
+        args[2](testConsentData, true);
+      });
+
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+      config.setConfig(customCfg);
+      setConsentConfig(consentConfig);
+
+      consentManagementRequestBidsHook(() => {
+      }, {});
+      requestBidsHook((config) => {
+      }, {adUnits});
+
+      expect(utils.triggerPixel.called).to.be.false;
+      events.emit(CONSTANTS.EVENTS.AUCTION_END, {});
+      expect(utils.triggerPixel.getCall(0).args[0]).to.include('/any/pubcid/url');
+
+      expect(server.requests[0].url).to.equal('https://id.sharedid.org/id?gdpr=1&gdpr_consent=abc12345234');
+      expect(coreStorage.getCookie('pubcid_sharedid')).to.equal('testsharedid');
+    });
+  });
+
+  describe('Set cookie behavior', function () {
+    let coreStorageSpy;
+    beforeEach(function () {
+      coreStorageSpy = sinon.spy(coreStorage, 'setCookie');
+      setSubmoduleRegistry([pubCommonIdSubmodule]);
+      init(config);
+    });
+    afterEach(function () {
+      coreStorageSpy.restore();
+    });
+    it('should allow submodules to override the domain', function () {
+      const submodule = {
+        submodule: {
+          domainOverride: function () {
+            return 'foo.com'
+          }
+        },
+        config: {
+          storage: {
+            type: 'cookie'
+          }
+        }
+      }
+      setStoredValue(submodule, 'bar');
+      expect(coreStorage.setCookie.getCall(0).args[4]).to.equal('foo.com');
+    });
+
+    it('should pass null for domain if submodule does not override the domain', function () {
+      const submodule = {
+        submodule: {},
+        config: {
+          storage: {
+            type: 'cookie'
+          }
+        }
+      }
+      setStoredValue(submodule, 'bar');
+      expect(coreStorage.setCookie.getCall(0).args[4]).to.equal(null);
+    });
+  });
+
+  describe('Consent changes determine getId refreshes', function () {
+    let expStr;
+    let adUnits;
+
+    const mockIdCookieName = 'MOCKID';
+    let mockGetId = sinon.stub();
+    let mockDecode = sinon.stub();
+    let mockExtendId = sinon.stub();
+    const mockIdSystem = {
+      name: 'mockId',
+      getId: mockGetId,
+      decode: mockDecode,
+      extendId: mockExtendId
+    };
+    const userIdConfig = {
+      userSync: {
+        userIds: [{
+          name: 'mockId',
+          storage: {
+            name: 'MOCKID',
+            type: 'cookie',
+            refreshInSeconds: 30
+          }
+        }],
+        auctionDelay: 5
+      }
+    };
+
+    let cmpStub;
+    let testConsentData;
+    const consentConfig = {
+      cmpApi: 'iab',
+      timeout: 7500,
+      allowAuctionWithoutConsent: false
+    };
+
+    const sharedBeforeFunction = function () {
+      // clear cookies
+      expStr = (new Date(Date.now() + 25000).toUTCString());
+      coreStorage.setCookie(mockIdCookieName, '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie(`${mockIdCookieName}_last`, '', EXPIRED_COOKIE_DATE);
+      coreStorage.setCookie(CONSENT_LOCAL_STORAGE_NAME, '', EXPIRED_COOKIE_DATE);
+
+      // init
+      adUnits = [getAdUnitMock()];
+      init(config);
+
+      // init id system
+      attachIdSystem(mockIdSystem);
+      config.setConfig(userIdConfig);
+    }
+    const sharedAfterFunction = function () {
+      config.resetConfig();
+      mockGetId.reset();
+      mockDecode.reset();
+      mockExtendId.reset();
+      cmpStub.restore();
+      resetConsentData();
+      delete window.__cmp;
+      delete window.__tcfapi;
+    };
+
+    describe('TCF v1', function () {
+      testConsentData = {
+        gdprApplies: true,
+        consentData: 'xyz',
+        apiVersion: 1
+      };
+
+      beforeEach(function () {
+        sharedBeforeFunction();
+
+        // init v1 consent management
+        window.__cmp = function () {
+        };
+        delete window.__tcfapi;
+        cmpStub = sinon.stub(window, '__cmp').callsFake((...args) => {
+          args[2](testConsentData);
+        });
+        setConsentConfig(consentConfig);
+      });
+
+      afterEach(function () {
+        sharedAfterFunction();
+      });
+
+      it('calls getId if no stored consent data and refresh is not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+
+        let innerAdUnits;
+        consentManagementRequestBidsHook(() => {
+        }, {});
+        requestBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits});
+
+        sinon.assert.calledOnce(mockGetId);
+        sinon.assert.calledOnce(mockDecode);
+        sinon.assert.notCalled(mockExtendId);
+      });
+
+      it('calls getId if no stored consent data but refresh is needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 60 * 1000).toUTCString()), expStr);
+
+        let innerAdUnits;
+        consentManagementRequestBidsHook(() => {
+        }, {});
+        requestBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits});
+
+        sinon.assert.calledOnce(mockGetId);
+        sinon.assert.calledOnce(mockDecode);
+        sinon.assert.notCalled(mockExtendId);
+      });
+
+      it('calls getId if empty stored consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+
+        setStoredConsentData();
+
+        let innerAdUnits;
+        consentManagementRequestBidsHook(() => {
+        }, {});
+        requestBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits});
+
+        sinon.assert.calledOnce(mockGetId);
+        sinon.assert.calledOnce(mockDecode);
+        sinon.assert.notCalled(mockExtendId);
+      });
+
+      it('calls getId if stored consent does not match current consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+
+        setStoredConsentData({
+          gdprApplies: testConsentData.gdprApplies,
+          consentString: 'abc',
+          apiVersion: testConsentData.apiVersion
+        });
+
+        let innerAdUnits;
+        consentManagementRequestBidsHook(() => {
+        }, {});
+        requestBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits});
+
+        sinon.assert.calledOnce(mockGetId);
+        sinon.assert.calledOnce(mockDecode);
+        sinon.assert.notCalled(mockExtendId);
+      });
+
+      it('does not call getId if stored consent matches current consent and refresh not needed', function () {
+        coreStorage.setCookie(mockIdCookieName, JSON.stringify({id: '1234'}), expStr);
+        coreStorage.setCookie(`${mockIdCookieName}_last`, (new Date(Date.now() - 1 * 1000).toUTCString()), expStr);
+
+        setStoredConsentData({
+          gdprApplies: testConsentData.gdprApplies,
+          consentString: testConsentData.consentData,
+          apiVersion: testConsentData.apiVersion
+        });
+
+        let innerAdUnits;
+        consentManagementRequestBidsHook(() => {
+        }, {});
+        requestBidsHook((config) => {
+          innerAdUnits = config.adUnits
+        }, {adUnits});
+
+        sinon.assert.notCalled(mockGetId);
+        sinon.assert.calledOnce(mockDecode);
+        sinon.assert.calledOnce(mockExtendId);
+      });
+    });
+
+    describe('findRootDomain', function () {
+      let sandbox;
+
+      beforeEach(function () {
+        setSubmoduleRegistry([pubCommonIdSubmodule]);
+        init(config);
+        config.setConfig({
+          userSync: {
+            syncDelay: 0,
+            userIds: [
+              {
+                name: 'pubCommonId',
+                value: { pubcid: '11111' },
+              },
+            ],
+          },
+        });
+        sandbox = sinon.createSandbox();
+        sandbox
+          .stub(coreStorage, 'getCookie')
+          .onFirstCall()
+          .returns(null) // .co.uk
+          .onSecondCall()
+          .returns('writeable'); // realdomain.co.uk;
+      });
+
+      afterEach(function () {
+        sandbox.restore();
+      });
+
+      it('should just find the root domain', function () {
+        var domain = findRootDomain('sub.realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
+      });
+
+      it('should find the full domain when no subdomain is present', function () {
+        var domain = findRootDomain('realdomain.co.uk');
+        expect(domain).to.be.eq('realdomain.co.uk');
+      });
+    });
+  });
+
+  describe('Handle SSO Login', function() {
+    beforeEach(function () {
+      (getGlobal()).setUserIdentities({});
+    });
+
+    xit('Email hashes are stored in userIdentities Object on SSO login if ssoEnabled is true', function () {
+      function getEmail() {
+        return 'abc@def.com';
+      }
+      function getBasicProfile() {
+        return { 'getEmail': getEmail }
+      }
+      var dummyGoogleUserObject = { 'getBasicProfile': getBasicProfile }
+      console.log('***************** window.PWT = ', window.PWT);
+      window.PWT = window.PWT || {};
+      window.PWT.ssoEnabled = true;
+      expect(typeof (getGlobal()).onSSOLogin).to.equal('function');
+      getGlobal().onSSOLogin({'provider': 'google', 'googleUserObject': dummyGoogleUserObject});
+      expect((getGlobal()).getUserIdentities().emailHash).to.exist;
+    });
+
+    xit('Email hashes are not stored in userIdentities Object on SSO login if ssoEnabled is false', function () {
+      function getEmail() {
+        return 'abc@def.com';
+      }
+      function getBasicProfile() {
+        return { 'getEmail': getEmail }
+      }
+      var dummyGoogleUserObject = { 'getBasicProfile': getBasicProfile }
+      window.PWT.ssoEnabled = false;
+
+      expect(typeof (getGlobal()).onSSOLogin).to.equal('function');
+      getGlobal().onSSOLogin({'provider': 'google', 'googleUserObject': dummyGoogleUserObject});
+      expect((getGlobal()).getUserIdentities().emailHash).to.not.exist;
+    });
   });
 });
diff --git a/test/spec/modules/validationFpdModule_spec.js b/test/spec/modules/validationFpdModule_spec.js
new file mode 100644
index 00000000000..9e8072cb9ed
--- /dev/null
+++ b/test/spec/modules/validationFpdModule_spec.js
@@ -0,0 +1,313 @@
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {
+  filterArrayData,
+  validateFpd
+} from 'modules/validationFpdModule/index.js';
+
+describe('the first party data validation module', function () {
+  let ortb2 = {
+    device: {
+      h: 911,
+      w: 1733
+    },
+    user: {
+      data: [{
+        segment: [{
+          id: 'foo'
+        }],
+        name: 'bar',
+        ext: 'string'
+      }]
+    },
+    site: {
+      content: {
+        data: [{
+          segment: [{
+            id: 'test'
+          }],
+          name: 'content',
+          ext: {
+            foo: 'bar'
+          }
+        }]
+      }
+    }
+  };
+
+  let conf = {
+    device: {
+      h: 500,
+      w: 750
+    },
+    user: {
+      keywords: 'test1, test2',
+      gender: 'f',
+      data: [{
+        segment: [{
+          id: 'test'
+        }],
+        name: 'alt'
+      }]
+    },
+    site: {
+      ref: 'domain.com',
+      page: 'www.domain.com/test',
+      ext: {
+        data: {
+          inventory: ['first']
+        }
+      }
+    }
+  };
+
+  describe('filtering first party array data', function () {
+    it('returns empty array if no valid data', function () {
+      let arr = [{}];
+      let path = 'site.children.cat';
+      let child = {type: 'string'};
+      let parent = 'site';
+      let key = 'cat';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('filters invalid type of array data', function () {
+      let arr = ['foo', {test: 1}];
+      let path = 'site.children.cat';
+      let child = {type: 'string'};
+      let parent = 'site';
+      let key = 'cat';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal(['foo']);
+    });
+
+    it('filters all data for missing required children', function () {
+      let arr = [{test: 1}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('filters all data for invalid required children types', function () {
+      let arr = [{name: 'foo', segment: 1}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([]);
+    });
+
+    it('returns only data with valid required nested children types', function () {
+      let arr = [{name: 'foo', segment: [{id: '1'}, {id: 2}, 'foobar']}];
+      let path = 'site.children.content.children.data';
+      let child = {type: 'object'};
+      let parent = 'site';
+      let key = 'data';
+      let validated = filterArrayData(arr, child, path, parent, key);
+      expect(validated).to.deep.equal([{name: 'foo', segment: [{id: '1'}]}]);
+    });
+  });
+
+  describe('validating first party data', function () {
+    it('filters user.data[0].ext for incorrect type', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user and site for empty data', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        }
+      };
+
+      duplicate.user.data = [];
+      duplicate.site.content.data = [];
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user for empty valid segment values', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.user.data[0].segment.push({test: 3});
+      duplicate.user.data[0].segment[0] = {foo: 'bar'};
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters user.data[0].ext and site.content.data[0].segement[1] for invalid data', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters device for invalid data types', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      duplicate.device = {
+        h: '1',
+        w: '1'
+      }
+
+      let expected = {
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+
+    it('filters cur for invalid data type', function () {
+      let validated;
+      let duplicate = utils.deepClone(ortb2);
+      duplicate.cur = 8;
+
+      let expected = {
+        device: {
+          h: 911,
+          w: 1733
+        },
+        user: {
+          data: [{
+            segment: [{
+              id: 'foo'
+            }],
+            name: 'bar'
+          }]
+        },
+        site: {
+          content: {
+            data: [{
+              segment: [{
+                id: 'test'
+              }],
+              name: 'content',
+              ext: {
+                foo: 'bar'
+              }
+            }]
+          }
+        }
+      };
+
+      duplicate.site.content.data[0].segment.push({test: 3});
+
+      validated = validateFpd(duplicate);
+      expect(validated).to.deep.equal(expected);
+    });
+  });
+});
diff --git a/test/spec/modules/vdoaiBidAdapter_spec.js b/test/spec/modules/vdoaiBidAdapter_spec.js
index c9d826d8dc8..d78a5ce04f6 100644
--- a/test/spec/modules/vdoaiBidAdapter_spec.js
+++ b/test/spec/modules/vdoaiBidAdapter_spec.js
@@ -8,7 +8,7 @@ describe('vdoaiBidAdapter', function () {
   const adapter = newBidder(spec);
   describe('isBidRequestValid', function () {
     let bid = {
-      'bidder': 'vdo.ai',
+      'bidder': 'vdoai',
       'params': {
         placementId: 'testPlacementId'
       },
@@ -27,7 +27,7 @@ describe('vdoaiBidAdapter', function () {
   describe('buildRequests', function () {
     let bidRequests = [
       {
-        'bidder': 'vdo.ai',
+        'bidder': 'vdoai',
         'params': {
           placementId: 'testPlacementId'
         },
@@ -37,6 +37,7 @@ describe('vdoaiBidAdapter', function () {
         'bidId': '23beaa6af6cdde',
         'bidderRequestId': '19c0c1efdf37e7',
         'auctionId': '61466567-d482-4a16-96f0-fe5f25ffbdf1',
+        'mediaTypes': 'banner'
       }
     ];
 
@@ -101,5 +102,40 @@ describe('vdoaiBidAdapter', function () {
       let result = spec.interpretResponse(serverResponse, bidRequest[0]);
       expect(Object.keys(result)).to.deep.equal(Object.keys(expectedResponse));
     });
+
+    it('handles instream video responses', function () {
+      let serverResponse = {
+        body: {
+          'vdoCreative': '',
+          'price': 4.2,
+          'adid': '12345asdfg',
+          'currency': 'EUR',
+          'statusMessage': 'Bid available',
+          'requestId': 'bidId123',
+          'width': 300,
+          'height': 250,
+          'netRevenue': true,
+          'mediaType': 'video'
+        }
+      };
+      let bidRequest = [
+        {
+          'method': 'POST',
+          'url': ENDPOINT_URL,
+          'data': {
+            'placementId': 'testPlacementId',
+            'width': '300',
+            'height': '200',
+            'bidId': 'bidId123',
+            'referer': 'www.example.com',
+            'mediaType': 'video'
+          }
+        }
+      ];
+
+      let result = spec.interpretResponse(serverResponse, bidRequest[0]);
+      expect(result[0]).to.have.property('vastXml');
+      expect(result[0]).to.have.property('mediaType', 'video');
+    });
   });
 });
diff --git a/test/spec/modules/verizonMediaIdSystem_spec.js b/test/spec/modules/verizonMediaIdSystem_spec.js
new file mode 100644
index 00000000000..10054b5674c
--- /dev/null
+++ b/test/spec/modules/verizonMediaIdSystem_spec.js
@@ -0,0 +1,204 @@
+import {expect} from 'chai';
+import * as utils from 'src/utils.js';
+import {verizonMediaIdSubmodule} from 'modules/verizonMediaIdSystem.js';
+
+describe('Verizon Media ID Submodule', () => {
+  const HASHED_EMAIL = '6bda6f2fa268bf0438b5423a9861a2cedaa5dec163c03f743cfe05c08a8397b2';
+  const PIXEL_ID = '1234';
+  const PROD_ENDPOINT = `https://ups.analytics.yahoo.com/ups/${PIXEL_ID}/fed`;
+  const OVERRIDE_ENDPOINT = 'https://foo/bar';
+
+  it('should have the correct module name declared', () => {
+    expect(verizonMediaIdSubmodule.name).to.equal('verizonMediaId');
+  });
+
+  it('should have the correct TCFv2 Vendor ID declared', () => {
+    expect(verizonMediaIdSubmodule.gvlid).to.equal(25);
+  });
+
+  describe('getId()', () => {
+    let ajaxStub;
+    let getAjaxFnStub;
+    let consentData;
+    beforeEach(() => {
+      ajaxStub = sinon.stub();
+      getAjaxFnStub = sinon.stub(verizonMediaIdSubmodule, 'getAjaxFn');
+      getAjaxFnStub.returns(ajaxStub);
+
+      consentData = {
+        gdpr: {
+          gdprApplies: 1,
+          consentString: 'GDPR_CONSENT_STRING'
+        },
+        uspConsent: 'USP_CONSENT_STRING'
+      };
+    });
+
+    afterEach(() => {
+      getAjaxFnStub.restore();
+    });
+
+    function invokeGetIdAPI(configParams, consentData) {
+      let result = verizonMediaIdSubmodule.getId({
+        params: configParams
+      }, consentData);
+      if (typeof result === 'object') {
+        result.callback(sinon.stub());
+      }
+      return result;
+    }
+
+    it('returns undefined if he and pixelId params are not passed', () => {
+      expect(invokeGetIdAPI({}, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the pixelId param is not passed', () => {
+      expect(invokeGetIdAPI({
+        he: HASHED_EMAIL
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns undefined if the he param is not passed', () => {
+      expect(invokeGetIdAPI({
+        pixelId: PIXEL_ID
+      }, consentData)).to.be.undefined;
+      expect(ajaxStub.callCount).to.equal(0);
+    });
+
+    it('returns an object with the callback function if the correct params are passed', () => {
+      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');
+    });
+
+    it('Makes an ajax GET request to the production API endpoint with query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${PROD_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('Makes an ajax GET request to the specified override API endpoint with query params', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        endpoint: OVERRIDE_ENDPOINT
+      }, consentData);
+
+      const expectedParams = {
+        he: HASHED_EMAIL,
+        '1p': '0',
+        gdpr: '1',
+        gdpr_consent: consentData.gdpr.consentString,
+        us_privacy: consentData.uspConsent
+      };
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+
+      expect(ajaxStub.firstCall.args[0].indexOf(`${OVERRIDE_ENDPOINT}?`)).to.equal(0);
+      expect(requestQueryParams).to.deep.equal(expectedParams);
+      expect(ajaxStub.firstCall.args[3]).to.deep.equal({method: 'GET', withCredentials: true});
+    });
+
+    it('sets the callbacks param of the ajax function call correctly', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      expect(ajaxStub.firstCall.args[1]).to.be.an('object').that.has.all.keys(['success', 'error']);
+    });
+
+    it('sets GDPR consent data flag correctly when call is under GDPR jurisdiction.', () => {
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('1');
+      expect(requestQueryParams.gdpr_consent).to.equal(consentData.gdpr.consentString);
+    });
+
+    it('sets GDPR consent data flag correctly when call is NOT under GDPR jurisdiction.', () => {
+      consentData.gdpr.gdprApplies = false;
+
+      invokeGetIdAPI({
+        he: HASHED_EMAIL,
+        pixelId: PIXEL_ID,
+      }, consentData);
+
+      const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+      expect(requestQueryParams.gdpr).to.equal('0');
+      expect(requestQueryParams.gdpr_consent).to.equal('');
+    });
+
+    [1, '1', true].forEach(firstPartyParamValue => {
+      it(`sets 1p payload property to '1' for a config value of ${firstPartyParamValue}`, () => {
+        invokeGetIdAPI({
+          '1p': firstPartyParamValue,
+          he: HASHED_EMAIL,
+          pixelId: PIXEL_ID,
+        }, consentData);
+
+        const requestQueryParams = utils.parseQS(ajaxStub.firstCall.args[0].split('?')[1]);
+        expect(requestQueryParams['1p']).to.equal('1');
+      });
+    });
+  });
+
+  describe('decode()', () => {
+    const VALID_API_RESPONSES = [{
+      key: 'vmiud',
+      expected: '1234',
+      payload: {
+        vmuid: '1234'
+      }
+    },
+    {
+      key: 'connectid',
+      expected: '4567',
+      payload: {
+        connectid: '4567'
+      }
+    },
+    {
+      key: 'both',
+      expected: '4567',
+      payload: {
+        vmuid: '1234',
+        connectid: '4567'
+      }
+    }];
+    VALID_API_RESPONSES.forEach(responseData => {
+      it('should return a newly constructed object with the connectid for a payload with ${responseData.key} key(s)', () => {
+        expect(verizonMediaIdSubmodule.decode(responseData.payload)).to.deep.equal(
+          {connectid: responseData.expected}
+        );
+      });
+    });
+
+    [{}, '', {foo: 'bar'}].forEach((response) => {
+      it(`should return undefined for an invalid response "${JSON.stringify(response)}"`, () => {
+        expect(verizonMediaIdSubmodule.decode(response)).to.be.undefined;
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/vidazooBidAdapter_spec.js b/test/spec/modules/vidazooBidAdapter_spec.js
index b8ab83a95ae..d7f20c434ca 100644
--- a/test/spec/modules/vidazooBidAdapter_spec.js
+++ b/test/spec/modules/vidazooBidAdapter_spec.js
@@ -1,7 +1,22 @@
 import { expect } from 'chai';
-import { spec as adapter, SUPPORTED_ID_SYSTEMS, createDomain } from 'modules/vidazooBidAdapter.js';
+import {
+  spec as adapter,
+  SUPPORTED_ID_SYSTEMS,
+  createDomain,
+  hashCode,
+  extractPID,
+  extractCID,
+  extractSubDomain,
+  getStorageItem,
+  setStorageItem,
+  tryParseJSON,
+  getUniqueDealId,
+  getNextDealId,
+  getVidazooSessionId,
+} from 'modules/vidazooBidAdapter.js';
 import * as utils from 'src/utils.js';
 import { version } from 'package.json';
+import { useFakeTimers } from 'sinon';
 
 const SUB_DOMAIN = 'openrtb';
 
@@ -64,10 +79,6 @@ const REQUEST = {
   }
 };
 
-const SYNC_OPTIONS = {
-  'pixelEnabled': true
-};
-
 describe('VidazooBidAdapter', function () {
   describe('validtae spec', function () {
     it('exists and is a function', function () {
@@ -129,6 +140,7 @@ describe('VidazooBidAdapter', function () {
     });
 
     it('should build request for each size', function () {
+      const hashUrl = hashCode(BIDDER_REQUEST.refererInfo.referer);
       const requests = adapter.buildRequests([BID], BIDDER_REQUEST);
       expect(requests).to.have.length(1);
       expect(requests[0]).to.deep.equal({
@@ -146,6 +158,8 @@ describe('VidazooBidAdapter', function () {
           adUnitCode: 'div-gpt-ad-12345-0',
           publisherId: '59ac17c192832d0011283fe3',
           dealId: 1,
+          sessionId: '',
+          uniqueDealId: `${hashUrl}_${Date.now().toString()}`,
           bidderVersion: adapter.version,
           prebidVersion: version,
           res: `${window.top.screen.width}x${window.top.screen.height}`,
@@ -165,7 +179,7 @@ describe('VidazooBidAdapter', function () {
 
       expect(result).to.deep.equal([{
         type: 'iframe',
-        url: 'https://static.cootlogix.com/basev/sync/user_sync.html'
+        url: 'https://prebid.cootlogix.com/api/sync/iframe/?gdpr=0&gdpr_consent=&us_privacy='
       }]);
     });
 
@@ -173,7 +187,7 @@ describe('VidazooBidAdapter', function () {
       const result = adapter.getUserSyncs({ pixelEnabled: true }, [SERVER_RESPONSE]);
 
       expect(result).to.deep.equal([{
-        'url': 'https://sync.com',
+        'url': 'https://prebid.cootlogix.com/api/sync/image/?gdpr=0&gdpr_consent=&us_privacy=',
         'type': 'image'
       }]);
     })
@@ -220,7 +234,7 @@ describe('VidazooBidAdapter', function () {
     });
   });
 
-  describe(`user id system`, function () {
+  describe('user id system', function () {
     Object.keys(SUPPORTED_ID_SYSTEMS).forEach((idSystemProvider) => {
       const id = Date.now().toString();
       const bid = utils.deepClone(BID);
@@ -229,6 +243,8 @@ describe('VidazooBidAdapter', function () {
         switch (idSystemProvider) {
           case 'digitrustid': return { data: { id: id } };
           case 'lipb': return { lipbid: id };
+          case 'parrableId': return { eid: id };
+          case 'id5id': return { uid: id };
           default: return id;
         }
       })();
@@ -243,4 +259,114 @@ describe('VidazooBidAdapter', function () {
       });
     });
   });
+
+  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('vidazoo session id', function () {
+    it('should get undefined vidazoo session id', function () {
+      const sessionId = getVidazooSessionId();
+      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();
+      expect(sessionId).to.be.equal(vidSid);
+    });
+  });
+
+  describe('deal id', function () {
+    const key = 'myDealKey';
+
+    it('should get the next deal id', function () {
+      const dealId = getNextDealId(key);
+      const nextDealId = getNextDealId(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);
+        expect(dealId).to.be.equal(1);
+        done();
+      }, 200);
+    });
+  });
+
+  describe('unique deal id', function () {
+    const key = 'myKey';
+    let uniqueDealId;
+    uniqueDealId = getUniqueDealId(key);
+
+    it('should get current unique deal id', function (done) {
+      // waiting some time so `now` will become past
+      setTimeout(() => {
+        const current = getUniqueDealId(key);
+        expect(current).to.be.equal(uniqueDealId);
+        done();
+      }, 200);
+    });
+
+    it('should get new unique deal id on expiration', function () {
+      const current = getUniqueDealId(key, 100);
+      expect(current).to.not.be.equal(uniqueDealId);
+    });
+  });
+
+  describe('storage utils', function () {
+    it('should get value from storage with create param', function () {
+      const now = Date.now();
+      const clock = useFakeTimers({
+        shouldAdvanceTime: true,
+        now
+      });
+      setStorageItem('myKey', 2020);
+      const { value, created } = getStorageItem('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('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/viewdeosDXBidAdapter_spec.js b/test/spec/modules/viewdeosDXBidAdapter_spec.js
index f9bee1b0efe..31df9244ada 100644
--- a/test/spec/modules/viewdeosDXBidAdapter_spec.js
+++ b/test/spec/modules/viewdeosDXBidAdapter_spec.js
@@ -39,9 +39,9 @@ const SERVER_VIDEO_RESPONSE = {
     'height': 480,
     'cur': 'USD',
     'width': 640,
-    'cpm': 0.9
-  }
-  ]
+    'cpm': 0.9,
+    'adomain': ['a.com']
+  }]
 };
 const SERVER_OUSTREAM_VIDEO_RESPONSE = SERVER_VIDEO_RESPONSE;
 
@@ -123,7 +123,10 @@ const videoEqResponse = [{
   height: 480,
   width: 640,
   ttl: 3600,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: ['a.com']
+  }
 }];
 
 const displayEqResponse = [{
@@ -136,7 +139,10 @@ const displayEqResponse = [{
   height: 250,
   width: 300,
   ttl: 3600,
-  cpm: 0.9
+  cpm: 0.9,
+  meta: {
+    advertiserDomains: []
+  }
 }];
 
 describe('viewdeosDXBidAdapter', function () {
diff --git a/test/spec/modules/visxBidAdapter_spec.js b/test/spec/modules/visxBidAdapter_spec.js
index 2a4f8e4c7b5..62049e212f7 100755
--- a/test/spec/modules/visxBidAdapter_spec.js
+++ b/test/spec/modules/visxBidAdapter_spec.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { spec } from 'modules/visxBidAdapter.js';
 import { config } from 'src/config.js';
 import { newBidder } from 'src/adapters/bidderFactory.js';
+import * as utils from 'src/utils.js';
 
 describe('VisxAdapter', function () {
   const adapter = newBidder(spec);
@@ -37,6 +38,30 @@ describe('VisxAdapter', function () {
       };
       expect(spec.isBidRequestValid(bid)).to.equal(false);
     });
+
+    it('it should fail on invalid video bid', function () {
+      let videoBid = Object.assign({}, bid);
+      videoBid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [400, 300]
+        }
+      };
+      expect(spec.isBidRequestValid(videoBid)).to.equal(false);
+    });
+
+    it('it should pass on valid video bid', function () {
+      let videoBid = Object.assign({}, bid);
+      videoBid.mediaTypes = {
+        video: {
+          context: 'instream',
+          playerSize: [400, 300],
+          mimes: ['video/mp4'],
+          protocols: [3, 6]
+        }
+      };
+      expect(spec.isBidRequestValid(videoBid)).to.equal(true);
+    })
   });
 
   describe('buildRequests', function () {
@@ -87,6 +112,26 @@ describe('VisxAdapter', function () {
         'bidId': '42dbe3a7168a6a',
         'bidderRequestId': '22edbae2733bf6',
         'auctionId': '1d1a030790a475',
+      },
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': '903537'
+        },
+        'adUnitCode': 'adunit-code-video-3',
+        'mediaTypes': {
+          'video': {
+            'context': 'instream',
+            'playerSize': [400, 300],
+            'mimes': ['video/mp4', 'video/mpeg'],
+            'protocols': [3, 6],
+            'minduration': 5,
+            'maxduration': 30
+          }
+        },
+        'bidId': '39a4e3a7168a6a',
+        'bidderRequestId': '22edbae2733bf6',
+        'auctionId': '1d1a030790a475',
       }
     ];
 
@@ -108,7 +153,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'EUR');
@@ -121,7 +166,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'EUR');
@@ -134,7 +179,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'EUR');
@@ -148,7 +193,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'EUR');
@@ -163,7 +208,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'GBP');
@@ -178,7 +223,7 @@ describe('VisxAdapter', function () {
       expect(payload).to.be.an('object');
       expect(payload).to.have.property('u', referrer);
       expect(payload).to.have.property('pt', 'net');
-      expect(payload).to.have.property('auids', '903535,903535,903536');
+      expect(payload).to.have.property('auids', '903535,903535,903536,903537');
       expect(payload).to.have.property('sizes', '300x250,300x600,728x90');
       expect(payload).to.have.property('r', '22edbae2733bf6');
       expect(payload).to.have.property('cur', 'USD');
@@ -231,7 +276,7 @@ describe('VisxAdapter', function () {
       const schainBidRequests = [
         Object.assign({userId: {
           tdid: '111',
-          id5id: '222',
+          id5id: { uid: '222' },
           digitrustid: {data: {id: 'DTID', keyv: 4, privacy: {optout: false}, producer: 'ABC', version: 2}}
         }}, bidRequests[0]),
         bidRequests[1],
@@ -244,13 +289,63 @@ describe('VisxAdapter', function () {
       expect(payload).to.have.property('id5', '222');
       expect(payload).to.have.property('dtid', 'DTID');
     });
+
+    it('should pass grouped video bid\'s params in payload', function () {
+      const request = spec.buildRequests(bidRequests, bidderRequest);
+      const payload = request.data;
+      expect(payload).to.have.property('protocols', ',,,3|6');
+      expect(payload).to.have.property('mimes', ',,,video/mp4|video/mpeg');
+      expect(payload).to.have.property('playerSize', ',,,400x300');
+      expect(payload).to.have.property('minduration', ',,,5');
+      expect(payload).to.have.property('maxduration', ',,,30');
+      expect(payload).to.not.have.property('skip');
+    });
+  });
+
+  describe('buildRequests (multiple media types w/ unsupported video+outstream)', function () {
+    const bidderRequest = {
+      refererInfo: {
+        referer: 'https://example.com'
+      }
+    };
+    const referrer = bidderRequest.refererInfo.referer;
+    const bidRequests = [
+      {
+        'bidder': 'visx',
+        'params': {
+          'uid': '903538'
+        },
+        'adUnitCode': 'misconfigured-video',
+        'sizes': [[300, 250], [300, 600]],
+        'mediaTypes': {
+          'video': {
+            'context': 'outstream',
+            'playerSize': [400, 300]
+          }
+        },
+        'bidId': '39aff3a7169a6a',
+        'bidderRequestId': '22edffe2733bf6',
+        'auctionId': '1d1a030790a476',
+      }
+    ];
+
+    it('should send requst for banner bid', function () {
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
+      const payload = request.data;
+      expect(payload).to.be.an('object');
+      expect(payload).to.have.property('u', referrer);
+      expect(payload).to.have.property('pt', 'net');
+      expect(payload).to.have.property('auids', '903538');
+      expect(payload).to.have.property('sizes', '300x250,300x600');
+      expect(payload).to.not.have.property('playerSize');
+    });
   });
 
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-      {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-      {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
+      {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner', 'advertiserDomains': ['some_domain.com']}], 'seat': '1'},
+      {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+      {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
       {'bid': [{'price': 0, 'auid': 903537, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
       {'bid': [{'price': 0, 'adm': '
test content 5
', 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
       undefined,
@@ -285,6 +380,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
         }
       ];
 
@@ -341,6 +440,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '4dff80cc4ee346',
@@ -353,6 +456,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '5703af74d0472a',
@@ -365,6 +472,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
@@ -400,11 +511,15 @@ describe('VisxAdapter', function () {
           'currency': 'PLN',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
         }
       ];
 
       const response = Object.assign({}, responses[0]);
-      Object.assign(response.bid[0], {'cur': 'PLN'});
+      response.bid = [Object.assign({}, response.bid[0], {'cur': 'PLN'})];
       const result = spec.interpretResponse({'body': {'seatbid': [response]}}, request);
       expect(result).to.deep.equal(expectedResponse);
       getConfigStub.restore();
@@ -453,11 +568,11 @@ describe('VisxAdapter', function () {
 
     it('complicated case', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.15, 'adm': '
test content 4
', 'auid': 903535, 'h': 600, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 5
', 'auid': 903536, 'h': 600, 'w': 350, 'cur': 'EUR'}], 'seat': '1'},
+        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner', 'advertiserDomains': ['some_domain.com']}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903536, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.15, 'adm': '
test content 3
', 'auid': 903535, 'h': 90, 'w': 728, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.15, 'adm': '
test content 4
', 'auid': 903535, 'h': 600, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'adm': '
test content 5
', 'auid': 903536, 'h': 600, 'w': 350, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -529,6 +644,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '4e111f1b66e4',
@@ -541,6 +660,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '26d6f897b516',
@@ -553,6 +676,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '326bde7fbf69',
@@ -565,6 +692,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '1751cd90161',
@@ -577,6 +708,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
@@ -586,8 +721,8 @@ describe('VisxAdapter', function () {
 
     it('dublicate uids and sizes in one slot', function () {
       const fullResponse = [
-        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
-        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR'}], 'seat': '1'},
+        {'bid': [{'price': 1.15, 'adm': '
test content 1
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
+        {'bid': [{'price': 0.5, 'adm': '
test content 2
', 'auid': 903535, 'h': 250, 'w': 300, 'cur': 'EUR', 'mediaType': 'banner'}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -637,6 +772,10 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         },
         {
           'requestId': '57b2ebe70e16',
@@ -649,11 +788,147 @@ describe('VisxAdapter', function () {
           'currency': 'EUR',
           'netRevenue': true,
           'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'banner',
+          },
         }
       ];
 
       const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
       expect(result).to.deep.equal(expectedResponse);
     });
+
+    it('handles video bid', function () {
+      const fullResponse = [
+        {'bid': [{'price': 0.5, 'adm': '', 'auid': 903537, 'w': 400, 'h': 300, 'cur': 'EUR', 'mediaType': 'video'}], 'seat': '1'},
+      ];
+      const bidRequests = [
+        {
+          'bidder': 'visx',
+          'params': {
+            'uid': '903537'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'mediaTypes': {
+            'video': {
+              'context': 'instream',
+              'playerSize': [400, 300],
+              'mimes': ['video/mp4'],
+              'protocols': [3, 6]
+            }
+          },
+          'sizes': [[400, 300]],
+          'bidId': '2164be6358b9',
+          'bidderRequestId': '106efe3247',
+          'auctionId': '32a1f276cb87cb8',
+        }
+      ];
+      const request = spec.buildRequests(bidRequests);
+      const expectedResponse = [
+        {
+          'mediaType': 'video',
+          'requestId': '2164be6358b9',
+          'cpm': 0.5,
+          'creativeId': 903537,
+          'dealId': undefined,
+          'width': 400,
+          'height': 300,
+          'vastXml': '',
+          'currency': 'EUR',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': [],
+            'mediaType': 'video',
+          },
+        }
+      ];
+      const result = spec.interpretResponse({'body': {'seatbid': fullResponse}}, request);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+
+    it('should get right ext data in bid response', function () {
+      const bidRequests = [
+        {
+          'bidder': 'visx',
+          'params': {
+            'uid': '903535'
+          },
+          'adUnitCode': 'adunit-code-1',
+          'sizes': [[300, 250], [300, 600]],
+          'bidId': '659423fff799cb',
+          'bidderRequestId': '5f2009617a7c0a',
+          '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 expectedResponse = [
+        {
+          'requestId': '659423fff799cb',
+          'cpm': 1.15,
+          'creativeId': 903535,
+          'dealId': undefined,
+          'width': 300,
+          'height': 250,
+          'ad': '
test content 1
',
+          'currency': 'EUR',
+          'netRevenue': true,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': ['some_domain.com'],
+            'mediaType': 'banner',
+          },
+          'ext': {
+            'events': {
+              'pending': pendingUrl,
+              'win': winUrl
+            }
+          }
+        }
+      ];
+      const serverResponse = Object.assign({}, responses[0]);
+      serverResponse.bid = [Object.assign({}, {ext: {
+        prebid: {
+          events: {
+            'pending': pendingUrl,
+            'win': winUrl
+          }
+        }
+      }}, serverResponse.bid[0])];
+      const result = spec.interpretResponse({'body': {'seatbid': [serverResponse]}}, request);
+      expect(result).to.deep.equal(expectedResponse);
+    });
+  });
+  describe('check trackers', function () {
+    beforeEach(function () {
+      sinon.stub(utils, 'triggerPixel');
+    });
+
+    afterEach(function () {
+      utils.triggerPixel.restore();
+    });
+
+    it('onSetTargeting', function () {
+      const trackUrl = 'https://t.visx.net/track/pending/123123123';
+      const bid = { ext: { events: { pending: trackUrl } } };
+      spec.onSetTargeting(bid);
+      expect(utils.triggerPixel.calledOnceWith(trackUrl)).to.equal(true);
+    });
+
+    it('onBidWon', function () {
+      const trackUrl = 'https://t.visx.net/track/win/123123123';
+      const bid = { ext: { events: { win: trackUrl } } };
+      spec.onBidWon(bid);
+      expect(utils.triggerPixel.calledOnceWith(trackUrl)).to.equal(true);
+    });
+
+    it('onTimeout', function () {
+      const data = { timeout: 3000, bidId: '23423', params: { uid: 1 } };
+      spec.onTimeout(data);
+      expect(utils.triggerPixel.calledOnceWith('https://t.visx.net/track/bid_timeout?data=' + JSON.stringify(data))).to.equal(true);
+    });
   });
 });
diff --git a/test/spec/modules/voxBidAdapter_spec.js b/test/spec/modules/voxBidAdapter_spec.js
new file mode 100644
index 00000000000..6906c7dbba4
--- /dev/null
+++ b/test/spec/modules/voxBidAdapter_spec.js
@@ -0,0 +1,322 @@
+import { expect } from 'chai'
+import { spec } from 'modules/voxBidAdapter.js'
+
+function getSlotConfigs(mediaTypes, params) {
+  return {
+    params: params,
+    sizes: [],
+    bidId: '2df8c0733f284e',
+    bidder: 'vox',
+    mediaTypes: mediaTypes,
+    transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+  }
+}
+
+describe('VOX Adapter', function() {
+  const PLACE_ID = '5af45ad34d506ee7acad0c26';
+  const bidderRequest = {
+    refererInfo: { referer: 'referer' }
+  }
+  const bannerMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'banner'
+  }
+  const videoMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'video'
+  }
+  const inImageMandatoryParams = {
+    placementId: PLACE_ID,
+    placement: 'inImage',
+    imageUrl: 'https://hybrid.ai/images/image.jpg'
+  }
+  const validBidRequests = [
+    getSlotConfigs({ banner: {} }, bannerMandatoryParams),
+    getSlotConfigs({ video: {playerSize: [[640, 480]], context: 'outstream'} }, videoMandatoryParams),
+    getSlotConfigs({ banner: {sizes: [0, 0]} }, inImageMandatoryParams)
+  ]
+  describe('isBidRequestValid method', function() {
+    describe('returns true', function() {
+      describe('when banner slot config has all mandatory params', () => {
+        describe('and banner placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {banner: {}},
+            {
+              placementId: PLACE_ID,
+              placement: 'banner'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('and In-Image placement has the correct value', function() {
+          const slotConfig = getSlotConfigs(
+            {
+              banner: {
+                sizes: [[0, 0]]
+              }
+            },
+            {
+              placementId: PLACE_ID,
+              placement: 'inImage',
+              imageUrl: 'imageUrl'
+            }
+          )
+          const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+          expect(isBidRequestValid).to.equal(true)
+        })
+        describe('when video slot has all mandatory params.', function() {
+          it('should return true, when video mediatype object are correct.', function() {
+            const slotConfig = getSlotConfigs(
+              {
+                video: {
+                  context: 'instream',
+                  playerSize: [[640, 480]]
+                }
+              },
+              {
+                placementId: PLACE_ID,
+                placement: 'video'
+              }
+            )
+            const isBidRequestValid = spec.isBidRequestValid(slotConfig)
+            expect(isBidRequestValid).to.equal(true)
+          })
+        })
+      })
+    })
+    describe('returns false', function() {
+      describe('when params are not correct', function() {
+        function createSlotconfig(params) {
+          return getSlotConfigs({ banner: {} }, params)
+        }
+        it('does not have the placementId.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placement: 'banner'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have the imageUrl.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'inImage'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have a the correct placement.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createSlotconfig({
+              placementId: PLACE_ID,
+              placement: 'something'
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+      describe('when video mediaType object is not correct.', function() {
+        function createVideoSlotconfig(mediaType) {
+          return getSlotConfigs(mediaType, {
+            placementId: PLACE_ID,
+            placement: 'video'
+          })
+        }
+        it('is a void object', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: {} })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have playerSize.', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({ video: { context: 'instream' } })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+        it('does not have context', function() {
+          const isBidRequestValid = spec.isBidRequestValid(
+            createVideoSlotconfig({
+              video: {
+                playerSize: [[640, 480]]
+              }
+            })
+          )
+          expect(isBidRequestValid).to.equal(false)
+        })
+      })
+    })
+  })
+  it('Url params should be correct ', function() {
+    const request = spec.buildRequests(validBidRequests, bidderRequest)
+    expect(request.method).to.equal('POST')
+    expect(request.url).to.equal('https://ssp.hybrid.ai/auction/prebid')
+  })
+
+  describe('buildRequests method', function() {
+    it('Common data request should be correct', function() {
+      const request = spec.buildRequests(validBidRequests, bidderRequest)
+      const data = JSON.parse(request.data)
+      expect(Array.isArray(data.bidRequests)).to.equal(true)
+      expect(data.url).to.equal('referer')
+      data.bidRequests.forEach(bid => {
+        expect(bid.bidId).to.equal('2df8c0733f284e')
+        expect(bid.placeId).to.equal(PLACE_ID)
+        expect(bid.transactionId).to.equal('31a58515-3634-4e90-9c96-f86196db1459')
+      })
+    })
+
+    describe('GDPR params', function() {
+      describe('when there are not consent management platform', function() {
+        it('cmp should be false', function() {
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(false)
+        })
+      })
+      describe('when there are consent management platform', function() {
+        it('cmps should be true and ga should not sended, when gdprApplies is undefined', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: undefined,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(Object.keys(data).indexOf('data')).to.equal(-1)
+          expect(data.cs).to.equal('consentString')
+        })
+        it('cmps should be true and all gdpr parameters should be sended, when there are gdprApplies', function() {
+          bidderRequest['gdprConsent'] = {
+            gdprApplies: true,
+            consentString: 'consentString'
+          }
+          const request = spec.buildRequests(validBidRequests, bidderRequest)
+          const data = JSON.parse(request.data)
+          expect(data.cmp).to.equal(true)
+          expect(data.ga).to.equal(true)
+          expect(data.cs).to.equal('consentString')
+        })
+      })
+    })
+  })
+
+  describe('interpret response method', function() {
+    it('should return a void array, when the server response are not correct.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = {
+        body: {}
+      }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    it('should return a void array, when the server response have not got bids.', function() {
+      const request = { data: JSON.stringify({}) }
+      const serverResponse = { body: { bids: [] } }
+      const bids = spec.interpretResponse(serverResponse, request)
+      expect(typeof bids).to.equal('object')
+      expect(bids.length).to.equal(0)
+    })
+    describe('when the server response return a bid', function() {
+      describe('the bid is a banner', function() {
+        it('should return a banner bid', function() {
+          const request = spec.buildRequests([validBidRequests[0]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  },
+                  advertiserDomains: ['voxexchange.io']
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[0])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(bids[0].meta.advertiserDomains).to.deep.equal(['voxexchange.io'])
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+        it('should return a In-Image bid', function() {
+          const request = spec.buildRequests([validBidRequests[2]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: {
+                    content: 'html',
+                    width: 100,
+                    height: 100
+                  },
+                  ttl: 360
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].width).to.equal(100)
+          expect(bids[0].height).to.equal(100)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].ad).to.equal('string')
+        })
+      })
+      describe('the bid is a video', function() {
+        it('should return a video bid', function() {
+          const request = spec.buildRequests([validBidRequests[1]], bidderRequest)
+          const serverResponse = {
+            body: {
+              bids: [
+                {
+                  bidId: '2df8c0733f284e',
+                  price: 0.5,
+                  currency: 'USD',
+                  content: 'html',
+                  transactionId: '31a58515-3634-4e90-9c96-f86196db1459'
+                }
+              ]
+            }
+          }
+          const bids = spec.interpretResponse(serverResponse, request)
+          expect(bids.length).to.equal(1)
+          expect(bids[0].requestId).to.equal('2df8c0733f284e')
+          expect(bids[0].mediaType).to.equal(spec.supportedMediaTypes[1])
+          expect(bids[0].cpm).to.equal(0.5)
+          expect(bids[0].currency).to.equal('USD')
+          expect(bids[0].netRevenue).to.equal(true)
+          expect(typeof bids[0].vastXml).to.equal('string')
+        })
+      })
+    })
+  })
+})
diff --git a/test/spec/modules/vuukleBidAdapter_spec.js b/test/spec/modules/vuukleBidAdapter_spec.js
new file mode 100644
index 00000000000..17353a40b85
--- /dev/null
+++ b/test/spec/modules/vuukleBidAdapter_spec.js
@@ -0,0 +1,61 @@
+import { expect } from 'chai';
+import { spec } from 'modules/vuukleBidAdapter.js';
+
+describe('vuukleBidAdapterTests', function() {
+  let bidRequestData = {
+    bids: [
+      {
+        bidId: 'testbid',
+        bidder: 'vuukle',
+        params: {
+          test: 1
+        },
+        sizes: [[300, 250]]
+      }
+    ]
+  };
+  let request = [];
+
+  it('validate_pub_params', function() {
+    expect(
+      spec.isBidRequestValid({
+        bidder: 'vuukle',
+        params: {
+          test: 1
+        }
+      })
+    ).to.equal(true);
+  });
+
+  it('validate_generated_params', function() {
+    request = spec.buildRequests(bidRequestData.bids);
+    let req_data = request[0].data;
+
+    expect(req_data.bidId).to.equal('testbid');
+  });
+
+  it('validate_response_params', function() {
+    let serverResponse = {
+      body: {
+        'cpm': 0.01,
+        'width': 300,
+        'height': 250,
+        'creative_id': '12345',
+        'ad': 'test ad',
+        'adomain': ['example.com']
+      }
+    };
+
+    request = spec.buildRequests(bidRequestData.bids);
+    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(0.01);
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('12345');
+    expect(bid.meta.advertiserDomains).to.deep.equal(['example.com']);
+  });
+});
diff --git a/test/spec/modules/waardexBidAdapter_spec.js b/test/spec/modules/waardexBidAdapter_spec.js
index fae70335d3c..73094dd72a0 100644
--- a/test/spec/modules/waardexBidAdapter_spec.js
+++ b/test/spec/modules/waardexBidAdapter_spec.js
@@ -1,57 +1,201 @@
 import {expect} from 'chai';
 import {spec} from '../../../modules/waardexBidAdapter.js';
-import { auctionManager } from 'src/auctionManager.js';
-import { deepClone } from 'src/utils.js';
+import {auctionManager} from 'src/auctionManager.js';
+import {deepClone} from 'src/utils.js';
 
 describe('waardexBidAdapter', () => {
-  const validBid = {
-    bidId: '112435ry',
-    bidder: 'waardex',
-    params: {
-      placementId: 1,
-      traffic: 'banner',
-      pubId: 1,
-    }
-  };
-
   describe('isBidRequestValid', () => {
-    it('Should return true. bidId and params such as placementId and pubId are present', () => {
-      expect(spec.isBidRequestValid(validBid)).to.be.true;
+    it('should return true. bidId and params such as placementId and zoneId are present', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
+    });
+
+    it('should return false. bidId is not present in bid object', () => {
+      const result = spec.isBidRequestValid({
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false. zoneId is not present in bid.params object', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return true when mediaTypes field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        }
+      });
+
+      expect(result).to.be.true;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is empty', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {}
+        }
+      });
+
+      expect(result).to.be.false;
+    });
+
+    it('should return false when mediaTypes.video.playerSize field is not an array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: 'not-array'
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. bidId is not present in bid object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.bidId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is an empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. placementId is not present in bid.params object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.params.placementId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return false when mediaTypes.video.playerSize field is empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: []
+          }
+        }
+      });
+
+      expect(result).to.be.false;
     });
-    it('Should return false. pubId is not present in bid.params object', () => {
-      const invalidBid = deepClone(validBid);
-      delete invalidBid.params.pubId;
-      expect(spec.isBidRequestValid(invalidBid)).to.be.false;
+
+    it('should return true when mediaTypes.video.playerSize field is non-empty array', () => {
+      const result = spec.isBidRequestValid({
+        bidId: '112435ry',
+        bidder: 'waardex',
+        params: {
+          placementId: 1,
+          traffic: 'banner',
+          zoneId: 1,
+        },
+        mediaTypes: {
+          video: {
+            playerSize: [[640, 400]]
+          }
+        }
+      });
+
+      expect(result).to.be.true;
     });
   });
 
   describe('buildRequests', () => {
     let getAdUnitsStub;
-    const validBidRequests = [{
-      bidId: 'fergr675ujgh',
-      mediaTypes: {
-        banner: {
-          sizes: [[300, 600], [300, 250]]
-        }
-      },
-      params: {
-        placementId: 1,
-        bidfloor: 1.5,
-        position: 1,
-        instl: 1,
-        pubId: 100
+    const validBidRequests = [
+      {
+        bidId: 'fergr675ujgh',
+        mediaTypes: {
+          banner: {
+            sizes: [[300, 600], [300, 250]]
+          }
+        },
+        params: {
+          bidfloor: 1.5,
+          position: 1,
+          instl: 1,
+          zoneId: 100
+        },
       },
-    }];
+      {
+        bidId: 'unique-bid-id-2',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            playerSize: [[640, 400]]
+          }
+        },
+        params: {
+          mimes: ['video/x-ms-wmv', 'video/mp4'],
+          minduration: 2,
+          maxduration: 10,
+          protocols: ['VAST 1.0', 'VAST 2.0'],
+          startdelay: -1,
+          placement: 1,
+          skip: 1,
+          skipafter: 2,
+          minbitrate: 0,
+          maxbitrate: 0,
+          delivery: [1, 2, 3],
+          playbackmethod: [1, 2],
+          api: [1, 2, 3, 4, 5, 6],
+          linearity: 1,
+        }
+      }
+    ];
 
     const bidderRequest = {
       refererInfo: {
@@ -63,16 +207,16 @@ describe('waardexBidAdapter', () => {
     afterEach(() => getAdUnitsStub.restore());
 
     it('should return valid build request object', () => {
-      const request = spec.buildRequests(validBidRequests, bidderRequest);
       const {
         data: payload,
         url,
         method,
-      } = request;
+      } = spec.buildRequests(validBidRequests, bidderRequest);
+
+      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.zoneId}`;
 
       expect(payload.bidRequests[0]).deep.equal({
         bidId: validBidRequests[0].bidId,
-        placementId: validBidRequests[0].params.placementId,
         bidfloor: validBidRequests[0].params.bidfloor,
         position: validBidRequests[0].params.position,
         instl: validBidRequests[0].params.instl,
@@ -89,7 +233,6 @@ describe('waardexBidAdapter', () => {
           ],
         }
       });
-      const ENDPOINT = `https://hb.justbidit.xyz:8843/prebid?pubId=${validBidRequests[0].params.pubId}`;
       expect(url).to.equal(ENDPOINT);
       expect(method).to.equal('POST');
     });
@@ -98,44 +241,88 @@ describe('waardexBidAdapter', () => {
   describe('interpretResponse', () => {
     const serverResponse = {
       body: {
-        seatbid: [{
-          bid: [{
-            id: 'someId',
-            price: 3.3,
-            w: 250,
-            h: 300,
-            crid: 'dspCreativeIdHere',
-            adm: 'html markup here',
-            dealId: '123456789',
-            cid: 'dsp campaign id',
-            adomain: 'advertisers domain',
-            ext: {
-              mediaType: 'banner',
-            },
-          }],
-        }],
+        seatbid: [
+          {
+            bid: [
+              {
+                'id': 'ec90d4ee25433c0875c56f59acc12109',
+                'adm': 'banner should be here',
+                'w': 300,
+                'h': 250,
+                'price': 0.15827000000000002,
+                'nurl': 'http://n63.justbidit.xyz?w=n&p=${AUCTION_PRICE}&t=b&uq=eb31018b3da8965dde414c0006b1fb31',
+                'impid': 'unique-bid-id-1',
+                'adomain': [
+                  'www.kraeuterhaus.de'
+                ],
+                'cat': [
+                  'IAB24'
+                ],
+                'attr': [
+                  4
+                ],
+                'iurl': 'https://rtb.bsmartdata.com/preview.php?id=13',
+                'cid': '286557fda4585dc1c7f98b773de92509',
+                'crid': 'dd2b5a1f3f1fc5e63b042ebf4b00ca80'
+              },
+            ],
+          }
+        ],
       },
     };
 
+    const request = {
+      'ua': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/86.0.4240.198 Safari/537.36',
+      'language': 'en',
+      'referer': 'https%3A%2F%2Fwww.google.com%2F%3Fsome_param%3Dsome_value',
+      'coppa': false,
+      'data': {
+        'bidRequests': [
+          {
+            'bidId': 'unique-bid-id-1',
+            'bidfloor': 0.1,
+            'position': 1,
+            'instl': 1,
+            'banner': {
+              'sizes': [
+                {
+                  'width': 300,
+                  'height': 600
+                },
+                {
+                  'width': 300,
+                  'height': 250
+                }
+              ]
+            }
+          },
+        ]
+      }
+    };
+
     it('bid response is valid', () => {
-      const result = spec.interpretResponse(serverResponse);
-      const expected = [{
-        requestId: serverResponse.body.seatbid[0].bid[0].id,
-        cpm: serverResponse.body.seatbid[0].bid[0].price,
-        currency: 'USD',
-        width: serverResponse.body.seatbid[0].bid[0].w,
-        height: serverResponse.body.seatbid[0].bid[0].h,
-        creativeId: serverResponse.body.seatbid[0].bid[0].crid,
-        netRevenue: true,
-        ttl: 3000,
-        ad: serverResponse.body.seatbid[0].bid[0].adm,
-        dealId: serverResponse.body.seatbid[0].bid[0].dealid,
-        meta: {
-          cid: serverResponse.body.seatbid[0].bid[0].cid,
-          adomain: serverResponse.body.seatbid[0].bid[0].adomain,
-          mediaType: serverResponse.body.seatbid[0].bid[0].ext.mediaType,
-        },
-      }];
+      const result = spec.interpretResponse(serverResponse, request);
+
+      const expected = [
+        {
+          requestId: 'unique-bid-id-1',
+          cpm: serverResponse.body.seatbid[0].bid[0].price,
+          currency: 'USD',
+          width: serverResponse.body.seatbid[0].bid[0].w,
+          height: serverResponse.body.seatbid[0].bid[0].h,
+          mediaType: 'banner',
+          creativeId: serverResponse.body.seatbid[0].bid[0].crid,
+          netRevenue: true,
+          ttl: 3000,
+          ad: serverResponse.body.seatbid[0].bid[0].adm,
+          dealId: serverResponse.body.seatbid[0].bid[0].dealid,
+          meta: {
+            cid: serverResponse.body.seatbid[0].bid[0].cid,
+            adomain: serverResponse.body.seatbid[0].bid[0].adomain,
+            mediaType: (serverResponse.body.seatbid[0].bid[0].ext || {}).mediaType,
+          },
+        }
+      ];
       expect(result).deep.equal(expected);
     });
 
diff --git a/test/spec/modules/welectBidAdapter_spec.js b/test/spec/modules/welectBidAdapter_spec.js
new file mode 100644
index 00000000000..2f2af35eaec
--- /dev/null
+++ b/test/spec/modules/welectBidAdapter_spec.js
@@ -0,0 +1,211 @@
+import { expect } from 'chai';
+import { spec as adapter } from 'modules/welectBidAdapter.js';
+
+describe('WelectAdapter', function () {
+  describe('Check methods existance', 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');
+    });
+  });
+
+  describe('Check method isBidRequestValid return', function () {
+    let bid = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias',
+        domain: 'www.welect.de'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+    };
+    let bid2 = {
+      bidder: 'welect',
+      params: {
+        domain: 'www.welect.de'
+      },
+      mediaTypes: {
+        video: {
+          context: 'instream',
+          playerSize: [640, 360]
+        }
+      },
+    };
+
+    it('should be true', function () {
+      expect(adapter.isBidRequestValid(bid)).to.be.true;
+    });
+
+    it('should be false because the placementId is missing', function () {
+      expect(adapter.isBidRequestValid(bid2)).to.be.false;
+    });
+  });
+
+  describe('Check buildRequests method', function () {
+    // Bids to be formatted
+    let bid1 = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+      bidId: 'abdc'
+    };
+    let bid2 = {
+      bidder: 'welect',
+      params: {
+        placementId: 'exampleAlias',
+        domain: 'www.welect2.de'
+      },
+      sizes: [[640, 360]],
+      mediaTypes: {
+        video: {
+          context: 'instream'
+        }
+      },
+      bidId: 'abdc',
+      gdprConsent: {
+        gdprApplies: 1,
+        gdprConsent: 'some_string'
+      }
+    };
+
+    let data1 = {
+      bid_id: 'abdc',
+      width: 640,
+      height: 360
+    }
+
+    let data2 = {
+      bid_id: 'abdc',
+      width: 640,
+      height: 360,
+      gdpr_consent: {
+        gdprApplies: 1,
+        tcString: 'some_string'
+      }
+    }
+
+    // Formatted requets
+    let request1 = {
+      method: 'POST',
+      url: 'https://www.welect.de/api/v2/preflight/exampleAlias',
+      data: data1,
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    };
+
+    let request2 = {
+      method: 'POST',
+      url: 'https://www.welect2.de/api/v2/preflight/exampleAlias',
+      data: data2,
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    }
+
+    it('defaults to www.welect.de, without gdpr object', function () {
+      expect(adapter.buildRequests([bid1])).to.deep.equal([request1]);
+    })
+
+    it('must return the right formatted requests, with gdpr object', function () {
+      expect(adapter.buildRequests([bid2])).to.deep.equal([request2]);
+    });
+  });
+
+  describe('Check interpretResponse method return', function () {
+    // invalid server response
+    let unavailableResponse = {
+      body: {
+        available: false
+      }
+    };
+
+    let availableResponse = {
+      body: {
+        available: true,
+        bidResponse: {
+          ad: {
+            video: 'some vast url'
+          },
+          meta: {
+            advertiserDomains: [],
+          },
+          cpm: 17,
+          creativeId: 'svmpreview',
+          currency: 'EUR',
+          netRevenue: true,
+          requestId: 'some bid id',
+          ttl: 120,
+          vastUrl: 'some vast url',
+          height: 640,
+          width: 320
+        }
+      }
+    }
+    // bid Request
+    let bid = {
+      data: {
+        bid_id: 'some bid id',
+        width: 640,
+        height: 320,
+        gdpr_consent: {
+          gdprApplies: 1,
+          tcString: 'some_string'
+        }
+      },
+      method: 'POST',
+      url: 'https://www.welect.de/api/v2/preflight/exampleAlias',
+      options: {
+        contentType: 'application/json',
+        withCredentials: false,
+        crossOrigin: true,
+      }
+    };
+    // Formatted reponse
+    let result = {
+      ad: {
+        video: 'some vast url'
+      },
+      meta: {
+        advertiserDomains: []
+      },
+      cpm: 17,
+      creativeId: 'svmpreview',
+      currency: 'EUR',
+      height: 640,
+      netRevenue: true,
+      requestId: 'some bid id',
+      ttl: 120,
+      vastUrl: 'some vast url',
+      width: 320
+    }
+
+    it('if response reflects unavailability, should be empty', function () {
+      expect(adapter.interpretResponse(unavailableResponse, bid)).to.deep.equal([]);
+    });
+
+    it('if response reflects availability, should equal result', function () {
+      expect(adapter.interpretResponse(availableResponse, bid)).to.deep.equal([result])
+    })
+  });
+});
diff --git a/test/spec/modules/widespaceBidAdapter_spec.js b/test/spec/modules/widespaceBidAdapter_spec.js
index 382bf2c593e..af8d505b4f4 100644
--- a/test/spec/modules/widespaceBidAdapter_spec.js
+++ b/test/spec/modules/widespaceBidAdapter_spec.js
@@ -75,7 +75,10 @@ describe('+widespaceAdatperTest', function () {
       'status': 'ad',
       'ttl': 30,
       'width': 300,
-      'syncPixels': ['https://url1.com/url', 'https://url2.com/url']
+      'syncPixels': ['https://url1.com/url', 'https://url2.com/url'],
+      'meta': {
+        advertiserDomains: ['advertiserdomain.com']
+      }
     }],
     headers: {}
   };
@@ -195,10 +198,6 @@ describe('+widespaceAdatperTest', function () {
     it('-bidRequest options have header type', function () {
       expect(request[0].options.contentType).to.exist;
     });
-
-    it('-cookie test for wsCustomData ', function () {
-      expect(request[0].data.indexOf('hb.cd') > -1).to.equal(true);
-    });
   });
 
   describe('+interpretResponse', function () {
@@ -214,7 +213,8 @@ describe('+widespaceAdatperTest', function () {
         'netRevenue',
         'ttl',
         'referrer',
-        'ad'
+        'ad',
+        'meta'
       ];
       const resultKeys = Object.keys(result[0]);
       requiredKeys.forEach((key) => {
diff --git a/test/spec/modules/yieldlabBidAdapter_spec.js b/test/spec/modules/yieldlabBidAdapter_spec.js
index 097f85b9b8d..3cc5971ce67 100644
--- a/test/spec/modules/yieldlabBidAdapter_spec.js
+++ b/test/spec/modules/yieldlabBidAdapter_spec.js
@@ -7,10 +7,10 @@ const REQUEST = {
   'params': {
     'adslotId': '1111',
     'supplyId': '2222',
-    'adSize': '728x90',
     'targeting': {
       'key1': 'value1',
-      'key2': 'value2'
+      'key2': 'value2',
+      'notDoubleEncoded': 'value3,value4'
     },
     'customParams': {
       'extraParam': true,
@@ -29,7 +29,24 @@ const REQUEST = {
       'id': 'fH5A3n2O8_CZZyPoJVD-eabc6ECb7jhxCicsds7qSg',
       'atype': 1
     }]
-  }]
+  }],
+  'schain': {
+    'ver': '1.0',
+    'complete': 1,
+    'nodes': [
+      {
+        'asi': 'indirectseller.com',
+        'sid': '1',
+        'hp': 1
+      },
+      {
+        'asi': 'indirectseller2.com',
+        'name': 'indirectseller2 name with comma , and bang !',
+        'sid': '2',
+        'hp': 1
+      }
+    ]
+  }
 }
 
 const RESPONSE = {
@@ -39,6 +56,7 @@ const RESPONSE = {
   id: 1111,
   price: 1,
   pid: 2222,
+  adsize: '728x90',
   adtype: 'BANNER'
 }
 
@@ -46,6 +64,16 @@ const VIDEO_RESPONSE = Object.assign({}, RESPONSE, {
   'adtype': 'VIDEO'
 })
 
+const REQPARAMS = {
+  json: true,
+  ts: 1234567890
+}
+
+const REQPARAMS_GDPR = Object.assign({}, REQPARAMS, {
+  gdpr: true,
+  consent: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA'
+})
+
 describe('yieldlabBidAdapter', function () {
   const adapter = newBidder(spec)
 
@@ -60,8 +88,7 @@ describe('yieldlabBidAdapter', function () {
       const request = {
         'params': {
           'adslotId': '1111',
-          'supplyId': '2222',
-          'adSize': '728x90'
+          'supplyId': '2222'
         }
       }
       expect(spec.isBidRequestValid(request)).to.equal(true)
@@ -84,8 +111,8 @@ describe('yieldlabBidAdapter', function () {
       expect(request.validBidRequests).to.eql([REQUEST])
     })
 
-    it('passes targeting to bid request', function () {
-      expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2')
+    it('passes single-encoded targeting to bid request', function () {
+      expect(request.url).to.include('t=key1%3Dvalue1%26key2%3Dvalue2%26notDoubleEncoded%3Dvalue3%2Cvalue4')
     })
 
     it('passes userids to bid request', function () {
@@ -96,6 +123,30 @@ describe('yieldlabBidAdapter', function () {
       expect(request.url).to.include('extraParam=true&foo=bar')
     })
 
+    it('passes unencoded schain string to bid request', function () {
+      expect(request.url).to.include('schain=1.0,1!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,')
+    })
+
+    const refererRequest = spec.buildRequests(bidRequests, {
+      refererInfo: {
+        canonicalUrl: undefined,
+        numIframes: 0,
+        reachedTop: true,
+        referer: 'https://www.yieldlab.de/test?with=querystring',
+        stack: ['https://www.yieldlab.de/test?with=querystring']
+      }
+    })
+
+    it('passes unencoded schain string to bid request when complete == 0', function () {
+      REQUEST.schain.complete = 0;
+      const request = spec.buildRequests([REQUEST])
+      expect(request.url).to.include('schain=1.0,0!indirectseller.com,1,1,,,,!indirectseller2.com,2,1,,indirectseller2%20name%20with%20comma%20%2C%20and%20bang%20%21,,')
+    })
+
+    it('passes encoded referer to bid request', function () {
+      expect(refererRequest.url).to.include('pubref=https%3A%2F%2Fwww.yieldlab.de%2Ftest%3Fwith%3Dquerystring')
+    })
+
     const gdprRequest = spec.buildRequests(bidRequests, {
       gdprConsent: {
         consentString: 'BN5lERiOMYEdiAKAWXEND1AAAAE6DABACMA',
@@ -116,7 +167,7 @@ describe('yieldlabBidAdapter', function () {
     })
 
     it('should get correct bid response', function () {
-      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST]})
+      const result = spec.interpretResponse({body: [RESPONSE]}, {validBidRequests: [REQUEST], queryParams: REQPARAMS})
 
       expect(result[0].requestId).to.equal('2d925f27f5079f')
       expect(result[0].cpm).to.equal(0.01)
@@ -128,10 +179,18 @@ describe('yieldlabBidAdapter', function () {
       expect(result[0].netRevenue).to.equal(false)
       expect(result[0].ttl).to.equal(300)
       expect(result[0].referrer).to.equal('')
-      expect(result[0].ad).to.include('
',
-            creative_id: '9874652394875',
-          },
-        ],
-        header: 'header?',
-      };
+    const mockServerResponse = () => ({
+      body: [{
+        callback_id: '21989fdbef550a',
+        cpm: 3.45455,
+        width: 300,
+        height: 250,
+        ad: '' +
+          '
',
+        creative_id: '9874652394875',
+        adomain: ['www.example.com'],
+      }],
+      header: 'header?',
     });
 
     it('should correctly reorder the server response', function () {
-      const newResponse = spec.interpretResponse(serverResponse);
+      const newResponse = spec.interpretResponse(mockServerResponse());
       expect(newResponse.length).to.be.equal(1);
       expect(newResponse[0]).to.deep.equal({
         requestId: '21989fdbef550a',
@@ -288,19 +461,71 @@ describe('YieldmoAdapter', function () {
         currency: 'USD',
         netRevenue: true,
         ttl: 300,
-        ad:
-          '
',
+        ad: '' +
+          '
',
+        meta: {
+          advertiserDomains: ['www.example.com'],
+          mediaType: 'banner',
+        },
+      });
+    });
+
+    it('should correctly reorder video bids', function () {
+      const response = mockServerResponse();
+      const seatbid = [
+        {
+          bid: {
+            adm: '',
+            adomain: ['www.example.com'],
+            crid: 'dd65c0a7536aff',
+            impid: '91ea8bba1',
+            price: 1.5,
+          },
+        },
+      ];
+      const bidRequest = {
+        data: {
+          imp: [
+            {
+              id: '91ea8bba1',
+              video: {
+                h: 250,
+                w: 300,
+              },
+            },
+          ],
+        },
+      };
+
+      response.body.seatbid = seatbid;
+
+      const newResponse = spec.interpretResponse(response, bidRequest);
+      expect(newResponse.length).to.be.equal(2);
+      expect(newResponse[1]).to.deep.equal({
+        cpm: 1.5,
+        creativeId: 'dd65c0a7536aff',
+        currency: 'USD',
+        height: 250,
+        mediaType: 'video',
+        meta: {
+          advertiserDomains: ['www.example.com'],
+          mediaType: 'video',
+        },
+        netRevenue: true,
+        requestId: '91ea8bba1',
+        ttl: 300,
+        vastXml: '',
+        width: 300,
       });
     });
 
     it('should not add responses if the cpm is 0 or null', function () {
-      serverResponse.body[0].cpm = 0;
-      let response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      let response = mockServerResponse();
+      response.body[0].cpm = 0;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
 
-      serverResponse.body[0].cpm = null;
-      response = spec.interpretResponse(serverResponse);
-      expect(response).to.deep.equal([]);
+      response.body[0].cpm = null;
+      expect(spec.interpretResponse(response)).to.deep.equal([]);
     });
   });
 
diff --git a/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js b/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js
new file mode 100644
index 00000000000..e8eb4ab73be
--- /dev/null
+++ b/test/spec/modules/yuktamediaAnalyticsAdapter_spec.js
@@ -0,0 +1,713 @@
+import yuktamediaAnalyticsAdapter from 'modules/yuktamediaAnalyticsAdapter.js';
+import { expect } from 'chai';
+let events = require('src/events');
+let constants = require('src/constants.json');
+
+let prebidAuction = {
+  'auctionInit': {
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'timestamp': 1595850680304,
+  },
+  'bidRequested': {
+    'bidderCode': 'appnexus',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'bidderRequestId': '181df4d465699c',
+    'bids': [
+      {
+        'bidder': 'appnexus',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'userId': {
+          'id5id': { uid: 'ID5-ZHMOxXeRXPe3inZKGD-Lj0g7y8UWdDbsYXQ_n6aWMQ' },
+          'parrableid': '01.1595590997.46d951017bdc272ca50b88dbcfb0545cfc636bec3e3d8c02091fb1b413328fb2fd3baf65cb4114b3f782895fd09f82f02c9042b85b42c4654d08ba06dc77f0ded936c8ea3fc4085b4a99',
+          'pubcid': '100a8bc9-f588-4c22-873e-a721cb68bc34'
+        },
+        'adUnitCode': 'div-gpt-ad-1460505748561-0',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '2bccebeda7fbe4',
+        'bidderRequestId': '181df4d465699c',
+        'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+        'src': 'client',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 1,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1595850680304,
+    'timeout': 1100,
+    'start': 1595850680307
+  },
+  'noBid': {},
+  'bidTimeout': [],
+  'bidResponse': {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'statusMessage': 'Bid available',
+    'getStatusCode': function () { return 1; },
+    'adId': '3ade442375213f',
+    'requestId': '2bccebeda7fbe4',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 0.5,
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'responseTimestamp': 1595850681254,
+    'requestTimestamp': 1595850680307,
+    'bidder': 'appnexus',
+    'timeToRespond': 947,
+    'size': '300x250',
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_adid': '3ade442375213f',
+      'hb_pb': '0.50',
+      'hb_size': '300x250',
+      'hb_source': 'client',
+      'hb_format': 'banner'
+    }
+  },
+  'auctionEnd': {
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954'
+  },
+  'bidWon': {
+    'bidderCode': 'appnexus',
+    'width': 300,
+    'height': 250,
+    'requestId': '2bccebeda7fbe4',
+    'mediaType': 'banner',
+    'source': 'client',
+    'cpm': 0.5,
+    'currency': 'USD',
+    'netRevenue': true,
+    'ttl': 300,
+    'adUnitCode': 'div-gpt-ad-1460505748561-0',
+    'auctionId': 'ca421611-0bc0-4164-a69c-fe4158c68954',
+    'responseTimestamp': 1595850681254,
+    'requestTimestamp': 1595850680307,
+    'bidder': 'appnexus',
+    'timeToRespond': 947,
+    'size': '300x250',
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_adid': '3ade442375213f',
+      'hb_pb': '0.50',
+      'hb_size': '300x250',
+      'hb_source': 'client',
+      'hb_format': 'banner'
+    },
+    'status': 'rendered'
+  }
+};
+
+let prebidNativeAuction = {
+  'auctionInit': {
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'timestamp': 1595589742100,
+  },
+  'bidRequested': {
+    'bidderCode': 'appnexus',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'tid': 'f9c220eb-e44f-412b-92ff-8c24085ca675',
+    'bids': [
+      {
+        'bidder': 'appnexus',
+        'bid_id': '19a879bd73bc8d',
+        'nativeParams': {
+          'title': {
+            'required': true,
+            'len': 800
+          },
+          'image': {
+            'required': true,
+            'sizes': [
+              989,
+              742
+            ]
+          },
+          'sponsoredBy': {
+            'required': true
+          }
+        },
+        'mediaTypes': {
+          'native': {
+            'title': {
+              'required': true,
+              'len': 800
+            },
+            'image': {
+              'required': true,
+              'sizes': [
+                989,
+                742
+              ]
+            },
+            'sponsoredBy': {
+              'required': true
+            }
+          }
+        },
+        'adUnitCode': '/19968336/prebid_native_example_1',
+        'sizes': [],
+        'bidId': '19a879bd73bc8d',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 0,
+        'bidderWinsCount': 0
+      },
+      {
+        'bidder': 'appnexus',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ],
+              [
+                300,
+                600
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'div-gpt-ad-1460505748561-0',
+        'sizes': [
+          [
+            300,
+            250
+          ],
+          [
+            300,
+            600
+          ]
+        ],
+        'bidId': '28f8cc7d10f2db',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s',
+        'bidRequestsCount': 1,
+        'bidderRequestsCount': 2,
+        'bidderWinsCount': 0
+      }
+    ],
+    'auctionStart': 1595589742100,
+    'timeout': 1000,
+    'src': 's2s',
+    'start': 1595589742108
+  },
+  'bidRequested1': {
+    'bidderCode': 'ix',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'bidderRequestId': '5e64168f3654af',
+    'bids': [
+      {
+        'bidder': 'ix',
+        'mediaTypes': {
+          'banner': {
+            'sizes': [
+              [
+                300,
+                250
+              ]
+            ]
+          }
+        },
+        'adUnitCode': 'dfp-ad-rightrail_top',
+        'sizes': [[300, 250]],
+        'bidId': '9424dea605368f',
+        'bidderRequestId': '5e64168f3654af',
+        'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+        'src': 's2s'
+      }
+    ],
+    'auctionStart': 1595589742100,
+    'timeout': 1000,
+    'src': 's2s',
+    'start': 1595589742108
+  },
+  'noBid': {
+    'bidder': 'ix',
+    'mediaTypes': {
+      'banner': {
+        'sizes': [
+          [
+            300,
+            250
+          ]
+        ]
+      }
+    },
+    'adUnitCode': 'dfp-ad-rightrail_top',
+    'transactionId': 'd99d90e0-663a-459d-8c87-4c92ce6a527c',
+    'sizes': [[300, 250]],
+    'bidId': '9424dea605368f',
+    'bidderRequestId': '5e64168f3654af',
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'src': 's2s',
+    'bidRequestsCount': 1,
+    'bidderRequestsCount': 4,
+    'bidderWinsCount': 0
+  },
+  'bidTimeout': [
+    {
+      'bidId': '28f8cc7d10f2db',
+      'bidder': 'appnexus',
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'auctionId': '86e005fa-1900-4782-b6df-528500f09128'
+    }
+  ],
+  'bidResponse': {
+    'bidderCode': 'appnexus',
+    'statusMessage': 'Bid available',
+    'source': 's2s',
+    'getStatusCode': function () { return 1; },
+    'cpm': 10,
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_pb': '10.00',
+      'hb_adid': '4e756c72ee9044',
+      'hb_size': 'undefinedxundefined',
+      'hb_source': 's2s',
+      'hb_format': 'native',
+      'hb_native_linkurl': 'some_long_url',
+      'hb_native_title': 'This is a Prebid Native Creative',
+      'hb_native_brand': 'Prebid.org'
+    },
+    'native': {
+      'clickUrl': {
+        'url': 'some_long_url'
+      },
+      'impressionTrackers': [
+        'some_long_url'
+      ],
+      'javascriptTrackers': [],
+      'image': {
+        'url': 'some_long_image_path',
+        'width': 989,
+        'height': 742
+      },
+      'title': 'This is a Prebid Native Creative',
+      'sponsoredBy': 'Prebid.org'
+    },
+    'currency': 'USD',
+    'ttl': 60,
+    'netRevenue': true,
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'responseTimestamp': 1595589742827,
+    'requestTimestamp': 1595589742108,
+    'bidder': 'appnexus',
+    'adUnitCode': '/19968336/prebid_native_example_1',
+    'timeToRespond': 719,
+    'size': 'undefinedxundefined'
+  },
+  'auctionEnd': {
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128'
+  },
+  'bidWon': {
+    'bidderCode': 'appnexus',
+    'mediaType': 'native',
+    'source': 's2s',
+    'getStatusCode': function () { return 1; },
+    'cpm': 10,
+    'adserverTargeting': {
+      'hb_bidder': 'appnexus',
+      'hb_pb': '10.00',
+      'hb_adid': '4e756c72ee9044',
+      'hb_size': 'undefinedxundefined',
+      'hb_source': 's2s',
+      'hb_format': 'native',
+      'hb_native_linkurl': 'some_long_url',
+      'hb_native_title': 'This is a Prebid Native Creative',
+      'hb_native_brand': 'Prebid.org'
+    },
+    'native': {
+      'clickUrl': {
+        'url': 'some_long_url'
+      },
+      'impressionTrackers': [
+        'some_long_url'
+      ],
+      'javascriptTrackers': [],
+      'image': {
+        'url': 'some_long_image_path',
+        'width': 989,
+        'height': 742
+      },
+      'title': 'This is a Prebid Native Creative',
+      'sponsoredBy': 'Prebid.org'
+    },
+    'currency': 'USD',
+    'ttl': 60,
+    'netRevenue': true,
+    'auctionId': '86e005fa-1900-4782-b6df-528500f09128',
+    'responseTimestamp': 1595589742827,
+    'requestTimestamp': 1595589742108,
+    'bidder': 'appnexus',
+    'adUnitCode': '/19968336/prebid_native_example_1',
+    'timeToRespond': 719,
+    'size': 'undefinedxundefined',
+    'status': 'rendered'
+  }
+}
+
+describe('yuktamedia analytics adapter', function () {
+  beforeEach(() => {
+    sinon.stub(events, 'getEvents').returns([]);
+  });
+  afterEach(() => {
+    events.getEvents.restore();
+  });
+
+  describe('enableAnalytics', function () {
+    beforeEach(() => {
+      sinon.spy(yuktamediaAnalyticsAdapter, 'track');
+    });
+    afterEach(() => {
+      yuktamediaAnalyticsAdapter.disableAnalytics();
+      yuktamediaAnalyticsAdapter.track.restore();
+    });
+
+    it('should catch all events 1', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 2', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 3', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 4', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 5', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch all events 6', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch no events if no pubKey and pubId', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+        }
+      });
+
+      events.emit(constants.EVENTS.AUCTION_INIT, {});
+      events.emit(constants.EVENTS.AUCTION_END, {});
+      events.emit(constants.EVENTS.BID_REQUESTED, {});
+      events.emit(constants.EVENTS.BID_RESPONSE, {});
+      events.emit(constants.EVENTS.BID_WON, {});
+
+      sinon.assert.callCount(yuktamediaAnalyticsAdapter.track, 0);
+    });
+
+    it('should catch nobid, timeout and bidwon event events one of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidNativeAuction[constants.EVENTS.AUCTION_INIT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events two of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidNativeAuction[constants.EVENTS.BID_REQUESTED]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events three of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidNativeAuction[constants.EVENTS.BID_REQUESTED + '1']);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events four of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.NO_BID, prebidNativeAuction[constants.EVENTS.NO_BID]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events five of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidNativeAuction[constants.EVENTS.BID_TIMEOUT]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events six of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidNativeAuction[constants.EVENTS.BID_RESPONSE]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events seven of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidNativeAuction[constants.EVENTS.AUCTION_END]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+
+    it('should catch nobid, timeout and bidwon event events eight of eight', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_END, prebidNativeAuction[constants.EVENTS.BID_WON]);
+      sinon.assert.called(yuktamediaAnalyticsAdapter.track);
+    });
+  });
+
+  describe('build utm tag data', function () {
+    beforeEach(function () {
+      localStorage.setItem('yuktamediaAnalytics_utm_source', 'prebid');
+      localStorage.setItem('yuktamediaAnalytics_utm_medium', 'ad');
+      localStorage.setItem('yuktamediaAnalytics_utm_campaign', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_term', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_content', '');
+      localStorage.setItem('yuktamediaAnalytics_utm_timeout', Date.now());
+    });
+
+    afterEach(function () {
+      localStorage.clear();
+    });
+
+    it('should build utm data from local storage', function () {
+      let utmTagData = yuktamediaAnalyticsAdapter.buildUtmTagData({
+        pubId: '1',
+        pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+        enableUTMCollection: true,
+        enableSession: true,
+        enableUserIdCollection: true
+      });
+      expect(utmTagData.utm_source).to.equal('prebid');
+      expect(utmTagData.utm_medium).to.equal('ad');
+      expect(utmTagData.utm_campaign).to.equal('');
+      expect(utmTagData.utm_term).to.equal('');
+      expect(utmTagData.utm_content).to.equal('');
+    });
+
+    it('should return empty object for disabled utm setting', function () {
+      let utmTagData = yuktamediaAnalyticsAdapter.buildUtmTagData({
+        pubId: '1',
+        pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+        enableUTMCollection: false,
+        enableSession: true,
+        enableUserIdCollection: true
+      });
+      expect(utmTagData).deep.equal({});
+    });
+  });
+
+  describe('build session information', function () {
+    beforeEach(() => {
+      sinon.spy(yuktamediaAnalyticsAdapter, 'track');
+      localStorage.clear();
+    });
+    afterEach(() => {
+      yuktamediaAnalyticsAdapter.disableAnalytics();
+      yuktamediaAnalyticsAdapter.track.restore();
+      localStorage.clear();
+    });
+
+    it('should create session id in local storage if enabled', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: true,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      expect(localStorage.getItem('yuktamediaAnalytics_session_id')).to.not.equal(null);
+    });
+
+    it('should not create session id in local storage if disabled', function () {
+      yuktamediaAnalyticsAdapter.enableAnalytics({
+        provider: 'yuktamedia',
+        options: {
+          pubId: '1',
+          pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT==',
+          enableUTMCollection: true,
+          enableSession: false,
+          enableUserIdCollection: true
+        }
+      });
+      events.emit(constants.EVENTS.AUCTION_INIT, prebidAuction[constants.EVENTS.AUCTION_INIT]);
+      events.emit(constants.EVENTS.BID_REQUESTED, prebidAuction[constants.EVENTS.BID_REQUESTED]);
+      events.emit(constants.EVENTS.NO_BID, prebidAuction[constants.EVENTS.NO_BID]);
+      events.emit(constants.EVENTS.BID_TIMEOUT, prebidAuction[constants.EVENTS.BID_TIMEOUT]);
+      events.emit(constants.EVENTS.BID_RESPONSE, prebidAuction[constants.EVENTS.BID_RESPONSE]);
+      events.emit(constants.EVENTS.AUCTION_END, prebidAuction[constants.EVENTS.AUCTION_END]);
+      expect(localStorage.getItem('yuktamediaAnalytics_session_id')).to.equal(null);
+    });
+  });
+});
diff --git a/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js b/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js
deleted file mode 100644
index 24a524c85c7..00000000000
--- a/test/spec/modules/yuktamediaAnalyticsAdaptor_spec.js
+++ /dev/null
@@ -1,788 +0,0 @@
-import yuktamediaAnalyticsAdapter from 'modules/yuktamediaAnalyticsAdapter.js';
-import { expect } from 'chai';
-import adapterManager from 'src/adapterManager.js';
-import * as utils from 'src/utils.js';
-import { server } from 'test/mocks/xhr.js';
-
-let events = require('src/events');
-let constants = require('src/constants.json');
-
-describe('yuktamedia analytics adapter', function () {
-  beforeEach(function () {
-    sinon.stub(events, 'getEvents').returns([]);
-  });
-
-  afterEach(function () {
-    events.getEvents.restore();
-  });
-
-  describe('track', function () {
-    let initOptions = {
-      pubId: '1',
-      pubKey: 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT=='
-    };
-
-    let prebidEvent = {
-      'addAdUnits': {},
-      'requestBids': {},
-      'auctionInit': {
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionStatus': 'inProgress',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000
-      },
-      'bidRequested': {
-        'bidderCode': 'appnexus',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'bidderRequestId': '155975c76e13b1',
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'crumbs': {
-              'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-            },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '263efc09896d0c',
-            'bidderRequestId': '155975c76e13b1',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }
-        ],
-        'auctionStart': 1576823893836,
-        'timeout': 1000,
-        'refererInfo': {
-          'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-          'reachedTop': true,
-          'numIframes': 0,
-          'stack': [
-            'http://observer.com/integrationExamples/gpt/hello_world.html'
-          ]
-        },
-        'start': 1576823893838
-      },
-      'bidAdjustment': {
-        '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',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212
-      },
-      'bidTimeout': [
-      ],
-      'bidResponse': {
-        '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',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '393976d8770041',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
-        }
-      },
-      'auctionEnd': {
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionEnd': 1576823894054,
-        'auctionStatus': 'completed',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [
-          {
-            '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',
-            'appnexus': {
-              'buyerMemberId': 9325
-            },
-            'meta': {
-              'advertiserId': 2529885
-            },
-            'ad': '',
-            'originalCpm': 0.5,
-            'originalCurrency': 'USD',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'responseTimestamp': 1576823894050,
-            'requestTimestamp': 1576823893838,
-            'bidder': 'appnexus',
-            'timeToRespond': 212,
-            'pbLg': '0.50',
-            'pbMg': '0.50',
-            'pbHg': '0.50',
-            'pbAg': '0.50',
-            'pbDg': '0.50',
-            'pbCg': '',
-            'size': '300x250',
-            'adserverTargeting': {
-              'hb_bidder': 'appnexus',
-              'hb_adid': '393976d8770041',
-              'hb_pb': '0.50',
-              'hb_size': '300x250',
-              'hb_source': 'client',
-              'hb_format': 'banner'
-            }
-          }
-        ],
-        'winningBids': [],
-        'timeout': 1000
-      },
-      'setTargeting': {
-        'div-gpt-ad-1460505748561-0': {
-          'hb_format': 'banner',
-          'hb_source': 'client',
-          'hb_size': '300x250',
-          'hb_pb': '0.50',
-          'hb_adid': '393976d8770041',
-          'hb_bidder': 'appnexus',
-          'hb_format_appnexus': 'banner',
-          'hb_source_appnexus': 'client',
-          'hb_size_appnexus': '300x250',
-          'hb_pb_appnexus': '0.50',
-          'hb_adid_appnexus': '393976d8770041',
-          'hb_bidder_appnexus': 'appnexus'
-        }
-      },
-      'bidderDone': {
-        'bidderCode': 'appnexus',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'bidderRequestId': '155975c76e13b1',
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': 13144370
-            },
-            'crumbs': {
-              'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-            },
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'adUnitCode': 'div-gpt-ad-1460505748561-0',
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '263efc09896d0c',
-            'bidderRequestId': '155975c76e13b1',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'src': 'client',
-            'bidRequestsCount': 1,
-            'bidderRequestsCount': 1,
-            'bidderWinsCount': 0
-          }
-        ],
-        'auctionStart': 1576823893836,
-        'timeout': 1000,
-        'refererInfo': {
-          'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-          'reachedTop': true,
-          'numIframes': 0,
-          'stack': [
-            'http://observer.com/integrationExamples/gpt/hello_world.html'
-          ]
-        },
-        'start': 1576823893838
-      },
-      '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',
-        'appnexus': {
-          'buyerMemberId': 9325
-        },
-        'meta': {
-          'advertiserId': 2529885
-        },
-        'ad': '',
-        'originalCpm': 0.5,
-        'originalCurrency': 'USD',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'responseTimestamp': 1576823894050,
-        'requestTimestamp': 1576823893838,
-        'bidder': 'appnexus',
-        'timeToRespond': 212,
-        'pbLg': '0.50',
-        'pbMg': '0.50',
-        'pbHg': '0.50',
-        'pbAg': '0.50',
-        'pbDg': '0.50',
-        'pbCg': '',
-        'size': '300x250',
-        'adserverTargeting': {
-          'hb_bidder': 'appnexus',
-          'hb_adid': '393976d8770041',
-          'hb_pb': '0.50',
-          'hb_size': '300x250',
-          'hb_source': 'client',
-          'hb_format': 'banner'
-        },
-        'status': 'rendered',
-        'params': [
-          {
-            'placementId': 13144370
-          }
-        ]
-      }
-    };
-    let location = utils.getWindowLocation();
-
-    let expectedAfterBid = {
-      'bids': [
-        {
-          'adUnitCode': 'div-gpt-ad-1460505748561-0',
-          'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-          'bidId': '263efc09896d0c',
-          'bidderCode': 'appnexus',
-          'cpm': 0.5,
-          'creativeId': 96846035,
-          'currency': 'USD',
-          'mediaType': 'banner',
-          'netRevenue': true,
-          'renderStatus': 2,
-          'requestId': '155975c76e13b1',
-          'requestTimestamp': 1576823893838,
-          'responseTimestamp': 1576823894050,
-          'sizes': '300x250,300x600',
-          'statusMessage': 'Bid available',
-          'timeToRespond': 212
-        }
-      ],
-      'auctionInit': {
-        'host': location.host,
-        'path': location.pathname,
-        'search': location.search,
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'timestamp': 1576823893836,
-        'auctionStatus': 'inProgress',
-        'adUnits': [
-          {
-            'code': 'div-gpt-ad-1460505748561-0',
-            'mediaTypes': {
-              'banner': {
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ]
-              }
-            },
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                }
-              }
-            ],
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98'
-          }
-        ],
-        'adUnitCodes': [
-          'div-gpt-ad-1460505748561-0'
-        ],
-        'bidderRequests': [
-          {
-            'bidderCode': 'appnexus',
-            'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-            'bidderRequestId': '155975c76e13b1',
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': 13144370
-                },
-                'crumbs': {
-                  'pubcid': 'ff4002c4-ce05-4a61-b4ef-45a3cd93991a'
-                },
-                'mediaTypes': {
-                  'banner': {
-                    'sizes': [
-                      [
-                        300,
-                        250
-                      ],
-                      [
-                        300,
-                        600
-                      ]
-                    ]
-                  }
-                },
-                'adUnitCode': 'div-gpt-ad-1460505748561-0',
-                'transactionId': '6d275806-1943-4f3e-9cd5-624cbd05ad98',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '263efc09896d0c',
-                'bidderRequestId': '155975c76e13b1',
-                'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-                'src': 'client',
-                'bidRequestsCount': 1,
-                'bidderRequestsCount': 1,
-                'bidderWinsCount': 0
-              }
-            ],
-            'auctionStart': 1576823893836,
-            'timeout': 1000,
-            'refererInfo': {
-              'referer': 'http://observer.com/integrationExamples/gpt/hello_world.html',
-              'reachedTop': true,
-              'numIframes': 0,
-              'stack': [
-                'http://observer.com/integrationExamples/gpt/hello_world.html'
-              ]
-            },
-            'start': 1576823893838
-          }
-        ],
-        'noBids': [],
-        'bidsReceived': [],
-        'winningBids': [],
-        'timeout': 1000,
-        'config': initOptions
-      },
-      'initOptions': initOptions
-    };
-
-    let expectedAfterBidWon = {
-      'bidWon': {
-        'bidderCode': 'appnexus',
-        'bidId': '263efc09896d0c',
-        'adUnitCode': 'div-gpt-ad-1460505748561-0',
-        'auctionId': 'db377024-d866-4a24-98ac-5e430f881313',
-        'creativeId': 96846035,
-        'currency': 'USD',
-        'cpm': 0.5,
-        'netRevenue': true,
-        'renderedSize': '300x250',
-        'mediaType': 'banner',
-        'statusMessage': 'Bid available',
-        'status': 'rendered',
-        'renderStatus': 4,
-        'timeToRespond': 212,
-        'requestTimestamp': 1576823893838,
-        'responseTimestamp': 1576823894050
-      },
-      'initOptions': {
-        'pubId': '1',
-        'pubKey': 'ZXlKaGJHY2lPaUpJVXpJMU5pSjkuT=='
-      }
-    }
-
-    adapterManager.registerAnalyticsAdapter({
-      code: 'yuktamedia',
-      adapter: yuktamediaAnalyticsAdapter
-    });
-
-    beforeEach(function () {
-      adapterManager.enableAnalytics({
-        provider: 'yuktamedia',
-        options: initOptions
-      });
-    });
-
-    afterEach(function () {
-      yuktamediaAnalyticsAdapter.disableAnalytics();
-    });
-
-    it('builds and sends auction data', function () {
-      // Step 1: Send auction init event
-      events.emit(constants.EVENTS.AUCTION_INIT, prebidEvent['auctionInit']);
-
-      // Step 2: Send bid requested event
-      events.emit(constants.EVENTS.BID_REQUESTED, prebidEvent['bidRequested']);
-
-      // Step 3: Send bid response event
-      events.emit(constants.EVENTS.BID_RESPONSE, prebidEvent['bidResponse']);
-
-      // Step 4: Send bid time out event
-      events.emit(constants.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);
-
-      let realAfterBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(realAfterBid).to.deep.equal(expectedAfterBid);
-
-      // Step 6: Send auction bid won event
-      events.emit(constants.EVENTS.BID_WON, prebidEvent['bidWon']);
-
-      expect(server.requests.length).to.equal(2);
-
-      let winEventData = JSON.parse(server.requests[1].requestBody);
-
-      expect(winEventData).to.deep.equal(expectedAfterBidWon);
-    });
-  });
-});
diff --git a/test/spec/modules/zemantaBidAdapter_spec.js b/test/spec/modules/zemantaBidAdapter_spec.js
new file mode 100644
index 00000000000..523cdcd2eb3
--- /dev/null
+++ b/test/spec/modules/zemantaBidAdapter_spec.js
@@ -0,0 +1,558 @@
+import {expect} from 'chai';
+import {spec} from 'modules/zemantaBidAdapter.js';
+import {config} from 'src/config.js';
+import {server} from 'test/mocks/xhr';
+
+describe('Zemanta Adapter', function () {
+  describe('Bid request and response', function () {
+    const commonBidRequest = {
+      bidder: 'zemanta',
+      params: {
+        publisher: {
+          id: 'publisher-id'
+        },
+      },
+      bidId: '2d6815a92ba1ba',
+      auctionId: '12043683-3254-4f74-8934-f941b085579e',
+    }
+    const nativeBidRequestParams = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [
+            120,
+            100
+          ],
+          sendId: true
+        },
+        title: {
+          required: true,
+          sendId: true
+        },
+        sponsoredBy: {
+          required: false
+        }
+      },
+    }
+
+    const displayBidRequestParams = {
+      sizes: [
+        [
+          300,
+          250
+        ]
+      ]
+    }
+
+    describe('isBidRequestValid', function () {
+      before(() => {
+        config.setConfig({
+          zemanta: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      it('should fail when bid is invalid', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed when bid contains native params', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should succeed when bid contains sizes', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...displayBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if publisher id is not set', function () {
+        const bid = {
+          bidder: 'zemanta',
+          ...nativeBidRequestParams,
+        }
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+      it('should succeed with outbrain config', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        config.setConfig({
+          outbrain: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        })
+        expect(spec.isBidRequestValid(bid)).to.equal(true)
+      })
+      it('should fail if bidder url is not set', function () {
+        const bid = {
+          bidder: 'zemanta',
+          params: {
+            publisher: {
+              id: 'publisher-id',
+            }
+          },
+          ...nativeBidRequestParams,
+        }
+        config.resetConfig()
+        expect(spec.isBidRequestValid(bid)).to.equal(false)
+      })
+    })
+
+    describe('buildRequests', function () {
+      before(() => {
+        config.setConfig({
+          zemanta: {
+            bidderUrl: 'https://bidder-url.com',
+          }
+        }
+        )
+      })
+      after(() => {
+        config.resetConfig()
+      })
+
+      const commonBidderRequest = {
+        refererInfo: {
+          referer: 'https://example.com/'
+        }
+      }
+
+      it('should build native request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const expectedNativeAssets = {
+          assets: [
+            {
+              required: 1,
+              id: 3,
+              img: {
+                type: 3,
+                w: 120,
+                h: 100
+              }
+            },
+            {
+              required: 1,
+              id: 0,
+              title: {}
+            },
+            {
+              required: 0,
+              id: 5,
+              data: {
+                type: 1
+              }
+            }
+          ]
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              native: {
+                request: JSON.stringify(expectedNativeAssets)
+              }
+            }
+          ]
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      });
+
+      it('should build display request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...displayBidRequestParams,
+        }
+        const expectedData = {
+          site: {
+            page: 'https://example.com/',
+            publisher: {
+              id: 'publisher-id'
+            }
+          },
+          device: {
+            ua: navigator.userAgent
+          },
+          source: {
+            fd: 1
+          },
+          cur: [
+            'USD'
+          ],
+          imp: [
+            {
+              id: '1',
+              banner: {
+                format: [
+                  {
+                    w: 300,
+                    h: 250
+                  }
+                ]
+              }
+            }
+          ]
+        }
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        expect(res.url).to.equal('https://bidder-url.com')
+        expect(res.data).to.deep.equal(JSON.stringify(expectedData))
+      })
+
+      it('should pass optional parameters in request', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        bidRequest.params.tagid = 'test-tag'
+        bidRequest.params.publisher.name = 'test-publisher'
+        bidRequest.params.publisher.domain = 'test-publisher.com'
+        bidRequest.params.bcat = ['bad-category']
+        bidRequest.params.badv = ['bad-advertiser']
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.imp[0].tagid).to.equal('test-tag')
+        expect(resData.site.publisher.name).to.equal('test-publisher')
+        expect(resData.site.publisher.domain).to.equal('test-publisher.com')
+        expect(resData.bcat).to.deep.equal(['bad-category'])
+        expect(resData.badv).to.deep.equal(['bad-advertiser'])
+      });
+
+      it('should pass bidder timeout', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          timeout: 500
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.tmax).to.equal(500)
+      });
+
+      it('should pass GDPR consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          gdprConsent: {
+            gdprApplies: true,
+            consentString: 'consentString',
+          }
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.user.ext.consent).to.equal('consentString')
+        expect(resData.regs.ext.gdpr).to.equal(1)
+      });
+
+      it('should pass us privacy consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        const bidderRequest = {
+          ...commonBidderRequest,
+          uspConsent: 'consentString'
+        }
+        const res = spec.buildRequests([bidRequest], bidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.ext.us_privacy).to.equal('consentString')
+      });
+
+      it('should pass coppa consent', function () {
+        const bidRequest = {
+          ...commonBidRequest,
+          ...nativeBidRequestParams,
+        }
+        config.setConfig({coppa: true})
+
+        const res = spec.buildRequests([bidRequest], commonBidderRequest)
+        const resData = JSON.parse(res.data)
+        expect(resData.regs.coppa).to.equal(1)
+
+        config.resetConfig()
+      });
+    })
+
+    describe('interpretResponse', function () {
+      it('should return empty array if no valid bids', function () {
+        const res = spec.interpretResponse({}, [])
+        expect(res).to.be.an('array').that.is.empty
+      });
+
+      it('should interpret native response', function () {
+        const serverResponse = {
+          body: {
+            id: '0a73e68c-9967-4391-b01b-dda2d9fc54e4',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: '82822cf5-259c-11eb-8a52-f29e5275aa57',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '{"ver":"1.2","assets":[{"id":3,"required":1,"img":{"url":"http://example.com/img/url","w":120,"h":100}},{"id":0,"required":1,"title":{"text":"Test title"}},{"id":5,"data":{"value":"Test sponsor"}}],"link":{"url":"http://example.com/click/url"},"eventtrackers":[{"event":1,"method":1,"url":"http://example.com/impression"}]}',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3487171',
+                    crid: '28023739',
+                    cat: [
+                      'IAB10-2'
+                    ]
+                  }
+                ],
+                seat: 'acc-5537'
+              }
+            ],
+            bidid: '82822cf5-259c-11eb-8a52-b48e7518c657',
+            cur: 'USD'
+          },
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...nativeBidRequestParams,
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '28023739',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'native',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+            native: {
+              clickTrackers: undefined,
+              clickUrl: 'http://example.com/click/url',
+              image: {
+                url: 'http://example.com/img/url',
+                width: 120,
+                height: 100
+              },
+              title: 'Test title',
+              sponsoredBy: 'Test sponsor',
+              impressionTrackers: [
+                'http://example.com/impression',
+              ]
+            }
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+
+      it('should interpret display response', function () {
+        const serverResponse = {
+          body: {
+            id: '6b2eedc8-8ff5-46ef-adcf-e701b508943e',
+            seatbid: [
+              {
+                bid: [
+                  {
+                    id: 'd90fe7fa-28d7-11eb-8ce4-462a842a7cf9',
+                    impid: '1',
+                    price: 1.1,
+                    nurl: 'http://example.com/win/${AUCTION_PRICE}',
+                    adm: '
ad
',
+                    adomain: [
+                      'example.com'
+                    ],
+                    cid: '3865084',
+                    crid: '29998660',
+                    cat: [
+                      'IAB10-2'
+                    ],
+                    w: 300,
+                    h: 250
+                  }
+                ],
+                seat: 'acc-6536'
+              }
+            ],
+            bidid: 'd90fe7fa-28d7-11eb-8ce4-13d94bfa26f9',
+            cur: 'USD'
+          }
+        }
+        const request = {
+          bids: [
+            {
+              ...commonBidRequest,
+              ...displayBidRequestParams
+            }
+          ]
+        }
+        const expectedRes = [
+          {
+            requestId: request.bids[0].bidId,
+            cpm: 1.1,
+            creativeId: '29998660',
+            ttl: 360,
+            netRevenue: false,
+            currency: 'USD',
+            mediaType: 'banner',
+            nurl: 'http://example.com/win/${AUCTION_PRICE}',
+            ad: '
ad
',
+            width: 300,
+            height: 250,
+            meta: {
+              'advertiserDomains': [
+                'example.com'
+              ]
+            },
+          }
+        ]
+
+        const res = spec.interpretResponse(serverResponse, request)
+        expect(res).to.deep.equal(expectedRes)
+      });
+    })
+  })
+
+  describe('getUserSyncs', function () {
+    const usersyncUrl = 'https://usersync-url.com';
+    beforeEach(() => {
+      config.setConfig({
+        zemanta: {
+          usersyncUrl: usersyncUrl,
+        }
+      }
+      )
+    })
+    after(() => {
+      config.resetConfig()
+    })
+
+    it('should return user sync if pixel enabled', function () {
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: 'https://usersync-url.com'}])
+    })
+    it('should return user sync if pixel enabled with outbrain config', function () {
+      config.resetConfig()
+      config.setConfig({
+        outbrain: {
+          usersyncUrl: 'https://usersync-url.com',
+        }
+      })
+      const ret = spec.getUserSyncs({pixelEnabled: true})
+      expect(ret).to.deep.equal([{type: 'image', url: 'https://usersync-url.com'}])
+    })
+
+    it('should not return user sync if pixel disabled', function () {
+      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})
+      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([{
+        type: 'image', url: `${usersyncUrl}&gdpr=1&gdpr_consent=foo`
+      }]);
+      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([{
+        type: 'image', url: `${usersyncUrl}&gdpr=1&gdpr_consent=`
+      }]);
+    });
+
+    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([{
+        type: 'image', url: `${usersyncUrl}&gdpr=1&gdpr_consent=foo&us_privacy=1NYN`
+      }]);
+    });
+  })
+
+  describe('onBidWon', function () {
+    it('should make an ajax call with the original cpm', function () {
+      const bid = {
+        nurl: 'http://example.com/win/${AUCTION_PRICE}',
+        cpm: 2.1,
+        originalCpm: 1.1,
+      }
+      spec.onBidWon(bid)
+      expect(server.requests[0].url).to.equals('http://example.com/win/1.1')
+    });
+  })
+})
diff --git a/test/spec/modules/zeotapIdPlusIdSystem_spec.js b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
new file mode 100644
index 00000000000..3892eeff6a3
--- /dev/null
+++ b/test/spec/modules/zeotapIdPlusIdSystem_spec.js
@@ -0,0 +1,197 @@
+import { expect } from 'chai';
+import find from 'core-js-pure/features/array/find.js';
+import { config } from 'src/config.js';
+import { init, requestBidsHook, setSubmoduleRegistry } from 'modules/userId/index.js';
+import { storage, getStorage, zeotapIdPlusSubmodule } from 'modules/zeotapIdPlusIdSystem.js';
+import * as storageManager from 'src/storageManager.js';
+
+const ZEOTAP_COOKIE_NAME = 'IDP';
+const ZEOTAP_COOKIE = 'THIS-IS-A-DUMMY-COOKIE';
+const ENCODED_ZEOTAP_COOKIE = btoa(JSON.stringify(ZEOTAP_COOKIE));
+
+function getConfigMock() {
+  return {
+    userSync: {
+      syncDelay: 0,
+      userIds: [{
+        name: 'zeotapIdPlus'
+      }]
+    }
+  }
+}
+
+function getAdUnitMock(code = 'adUnit-code') {
+  return {
+    code,
+    mediaTypes: { banner: {}, native: {} },
+    sizes: [
+      [300, 200],
+      [300, 600]
+    ],
+    bids: [{
+      bidder: 'sampleBidder',
+      params: { placementId: 'banner-only-bidder' }
+    }]
+  };
+}
+
+function unsetCookie() {
+  storage.setCookie(ZEOTAP_COOKIE_NAME, '');
+}
+
+function unsetLocalStorage() {
+  storage.setDataInLocalStorage(ZEOTAP_COOKIE_NAME, '');
+}
+
+describe('Zeotap ID System', function () {
+  describe('Zeotap Module invokes StorageManager with appropriate arguments', function () {
+    let getStorageManagerSpy;
+
+    beforeEach(function () {
+      getStorageManagerSpy = sinon.spy(storageManager, 'getStorageManager');
+    });
+
+    it('when a stored Zeotap ID exists it is added to bids', function () {
+      let store = getStorage();
+      expect(getStorageManagerSpy.calledOnce).to.be.true;
+      sinon.assert.calledWith(getStorageManagerSpy, 301, 'zeotapIdPlus');
+    });
+  });
+
+  describe('test method: getId calls storage methods to fetch ID', function () {
+    let cookiesAreEnabledStub;
+    let getCookieStub;
+    let localStorageIsEnabledStub;
+    let getDataFromLocalStorageStub;
+
+    beforeEach(() => {
+      cookiesAreEnabledStub = sinon.stub(storage, 'cookiesAreEnabled');
+      getCookieStub = sinon.stub(storage, 'getCookie');
+      localStorageIsEnabledStub = sinon.stub(storage, 'localStorageIsEnabled');
+      getDataFromLocalStorageStub = sinon.stub(storage, 'getDataFromLocalStorage');
+    });
+
+    afterEach(() => {
+      storage.cookiesAreEnabled.restore();
+      storage.getCookie.restore();
+      storage.localStorageIsEnabled.restore();
+      storage.getDataFromLocalStorage.restore();
+      unsetCookie();
+      unsetLocalStorage();
+    });
+
+    it('should check if cookies are enabled', function () {
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+    });
+
+    it('should call getCookie if cookies are enabled', function () {
+      cookiesAreEnabledStub.returns(true);
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getCookieStub, 'IDP');
+    });
+
+    it('should check for localStorage if cookies are disabled', function () {
+      cookiesAreEnabledStub.returns(false);
+      localStorageIsEnabledStub.returns(true)
+      let id = zeotapIdPlusSubmodule.getId();
+      expect(cookiesAreEnabledStub.calledOnce).to.be.true;
+      expect(getCookieStub.called).to.be.false;
+      expect(localStorageIsEnabledStub.calledOnce).to.be.true;
+      expect(getDataFromLocalStorageStub.calledOnce).to.be.true;
+      sinon.assert.calledWith(getDataFromLocalStorageStub, 'IDP');
+    });
+  });
+
+  describe('Zeotap ID System', function () {
+    describe('test method: getId', function () {
+      afterEach(() => {
+        unsetCookie();
+        unsetLocalStorage();
+      });
+
+      it('provides the stored Zeotap id if a cookie exists', function () {
+        storage.setCookie(ZEOTAP_COOKIE_NAME, ENCODED_ZEOTAP_COOKIE);
+        let id = zeotapIdPlusSubmodule.getId();
+        expect(id).to.deep.equal({
+          id: ENCODED_ZEOTAP_COOKIE
+        });
+      });
+
+      it('provides the stored Zeotap id if cookie is absent but present in local storage', function () {
+        storage.setDataInLocalStorage(ZEOTAP_COOKIE_NAME, ENCODED_ZEOTAP_COOKIE);
+        let id = zeotapIdPlusSubmodule.getId();
+        expect(id).to.deep.equal({
+          id: ENCODED_ZEOTAP_COOKIE
+        });
+      });
+
+      it('returns undefined if both cookie and local storage are empty', function () {
+        let id = zeotapIdPlusSubmodule.getId();
+        expect(id).to.be.undefined
+      })
+    });
+
+    describe('test method: decode', function () {
+      it('provides the Zeotap ID (IDP) from a stored object', function () {
+        let zeotapId = {
+          id: ENCODED_ZEOTAP_COOKIE,
+        };
+
+        expect(zeotapIdPlusSubmodule.decode(zeotapId)).to.deep.equal({
+          IDP: ZEOTAP_COOKIE
+        });
+      });
+
+      it('provides the Zeotap ID (IDP) from a stored string', function () {
+        let zeotapId = ENCODED_ZEOTAP_COOKIE;
+
+        expect(zeotapIdPlusSubmodule.decode(zeotapId)).to.deep.equal({
+          IDP: ZEOTAP_COOKIE
+        });
+      });
+    });
+
+    describe('requestBids hook', function () {
+      let adUnits;
+
+      beforeEach(function () {
+        adUnits = [getAdUnitMock()];
+        storage.setCookie(
+          ZEOTAP_COOKIE_NAME,
+          ENCODED_ZEOTAP_COOKIE
+        );
+        setSubmoduleRegistry([zeotapIdPlusSubmodule]);
+        init(config);
+        config.setConfig(getConfigMock());
+      });
+
+      afterEach(function () {
+        unsetCookie();
+        unsetLocalStorage();
+      });
+
+      it('when a stored Zeotap ID exists it is added to bids', function (done) {
+        requestBidsHook(function () {
+          adUnits.forEach(unit => {
+            unit.bids.forEach(bid => {
+              expect(bid).to.have.deep.nested.property('userId.IDP');
+              expect(bid.userId.IDP).to.equal(ZEOTAP_COOKIE);
+              const zeotapIdAsEid = find(bid.userIdAsEids, e => e.source == 'zeotap.com');
+              expect(zeotapIdAsEid).to.deep.equal({
+                source: 'zeotap.com',
+                uids: [{
+                  id: ZEOTAP_COOKIE,
+                  atype: 1,
+                }]
+              });
+            });
+          });
+          done();
+        }, { adUnits });
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/zetaBidAdapter_spec.js b/test/spec/modules/zetaBidAdapter_spec.js
new file mode 100644
index 00000000000..25350725dee
--- /dev/null
+++ b/test/spec/modules/zetaBidAdapter_spec.js
@@ -0,0 +1,84 @@
+import { spec } from '../../../modules/zetaBidAdapter.js'
+
+describe('Zeta Bid Adapter', function() {
+  const bannerRequest = [{
+    bidId: 12345,
+    auctionId: 67890,
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    refererInfo: {
+      referer: 'testprebid.com'
+    },
+    params: {
+      placement: 12345,
+      user: {
+        uid: 12345,
+        buyeruid: 12345
+      },
+      device: {
+        ip: '111.222.33.44',
+        geo: {
+          country: 'USA'
+        }
+      },
+      definerId: '44253',
+      test: 1
+    }
+  }];
+
+  it('Test the bid validation function', function() {
+    const validBid = spec.isBidRequestValid(bannerRequest[0]);
+    const invalidBid = spec.isBidRequestValid(null);
+
+    expect(validBid).to.be.true;
+    expect(invalidBid).to.be.false;
+  });
+
+  it('Test the request processing function', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    expect(request).to.not.be.empty;
+
+    const payload = request.data;
+    expect(payload).to.not.be.empty;
+  });
+
+  const responseBody = {
+    id: '12345',
+    seatbid: [
+      {
+        bid: [
+          {
+            id: 'auctionId',
+            impid: 'impId',
+            price: 0.0,
+            adm: 'adMarkup',
+            crid: 'creativeId',
+            h: 250,
+            w: 300
+          }
+        ]
+      }
+    ],
+    cur: 'USD'
+  };
+
+  it('Test the response parsing function', function () {
+    const receivedBid = responseBody.seatbid[0].bid[0];
+    const response = {};
+    response.body = responseBody;
+
+    const bidResponse = spec.interpretResponse(response, null);
+    expect(bidResponse).to.not.be.empty;
+
+    const bid = bidResponse[0];
+    expect(bid).to.not.be.empty;
+    expect(bid.ad).to.equal(receivedBid.adm);
+    expect(bid.cpm).to.equal(receivedBid.price);
+    expect(bid.height).to.equal(receivedBid.h);
+    expect(bid.width).to.equal(receivedBid.w);
+    expect(bid.requestId).to.equal(receivedBid.impid);
+  });
+});
diff --git a/test/spec/modules/zetaSspBidAdapter_spec.js b/test/spec/modules/zetaSspBidAdapter_spec.js
new file mode 100644
index 00000000000..2313fae3705
--- /dev/null
+++ b/test/spec/modules/zetaSspBidAdapter_spec.js
@@ -0,0 +1,158 @@
+import {spec} from '../../../modules/zetaSspBidAdapter.js'
+
+describe('Zeta Ssp Bid Adapter', function() {
+  const eids = [
+    {
+      'source': 'example.com',
+      'uids': [
+        {
+          'id': 'someId1',
+          'atype': 1
+        },
+        {
+          'id': 'someId2',
+          'atype': 1
+        },
+        {
+          'id': 'someId3',
+          'atype': 2
+        }
+      ],
+      'ext': {
+        'foo': 'bar'
+      }
+    }
+  ];
+
+  const bannerRequest = [{
+    bidId: 12345,
+    auctionId: 67890,
+    mediaTypes: {
+      banner: {
+        sizes: [[300, 250]],
+      }
+    },
+    refererInfo: {
+      referer: 'http://www.zetaglobal.com/page?param=value'
+    },
+    gdprConsent: {
+      gdprApplies: 1,
+      consentString: 'consentString'
+    },
+    params: {
+      placement: 111,
+      user: {
+        uid: 222,
+        buyeruid: 333
+      },
+      tags: {
+        someTag: 444,
+        sid: 'publisherId'
+      },
+      test: 1
+    },
+    userIdAsEids: eids
+  }];
+
+  it('Test the bid validation function', function () {
+    const validBid = spec.isBidRequestValid(bannerRequest[0]);
+    const invalidBid = spec.isBidRequestValid(null);
+
+    expect(validBid).to.be.true;
+    expect(invalidBid).to.be.false;
+  });
+
+  it('Test provide eids', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.user.ext.eids).to.eql(eids);
+  });
+
+  it('Test page and domain in site', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.site.page).to.eql('http://www.zetaglobal.com/page?param=value');
+    expect(payload.site.domain).to.eql('zetaglobal.com');
+  });
+
+  it('Test the request processing function', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    expect(request).to.not.be.empty;
+
+    const payload = request.data;
+    expect(payload).to.not.be.empty;
+  });
+
+  const responseBody = {
+    id: '12345',
+    seatbid: [
+      {
+        bid: [
+          {
+            id: 'auctionId',
+            impid: 'impId',
+            price: 0.0,
+            adm: 'adMarkup',
+            crid: 'creativeId',
+            adomain: [
+              'https://example.com'
+            ],
+            h: 250,
+            w: 300
+          }
+        ]
+      }
+    ],
+    cur: 'USD'
+  };
+
+  it('Test the response parsing function', function () {
+    const receivedBid = responseBody.seatbid[0].bid[0];
+    const response = {};
+    response.body = responseBody;
+
+    const bidResponse = spec.interpretResponse(response, null);
+    expect(bidResponse).to.not.be.empty;
+
+    const bid = bidResponse[0];
+    expect(bid).to.not.be.empty;
+    expect(bid.ad).to.equal(receivedBid.adm);
+    expect(bid.cpm).to.equal(receivedBid.price);
+    expect(bid.height).to.equal(receivedBid.h);
+    expect(bid.width).to.equal(receivedBid.w);
+    expect(bid.requestId).to.equal(receivedBid.impid);
+    expect(bid.meta.advertiserDomains).to.equal(receivedBid.adomain);
+  });
+
+  it('Different cases for user syncs', function () {
+    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 sync1 = spec.getUserSyncs({iframeEnabled: true})[0];
+    expect(sync1.type).to.equal('iframe');
+    expect(sync1.url).to.include(USER_SYNC_URL_IFRAME);
+
+    const sync2 = spec.getUserSyncs({iframeEnabled: false})[0];
+    expect(sync2.type).to.equal('image');
+    expect(sync2.url).to.include(USER_SYNC_URL_IMAGE);
+
+    const sync3 = spec.getUserSyncs({iframeEnabled: true}, {}, {gdprApplies: true})[0];
+    expect(sync3.type).to.equal('iframe');
+    expect(sync3.url).to.include(USER_SYNC_URL_IFRAME);
+    expect(sync3.url).to.include('&gdpr=');
+
+    const sync4 = spec.getUserSyncs({iframeEnabled: true}, {}, {gdprApplies: true}, 'test')[0];
+    expect(sync4.type).to.equal('iframe');
+    expect(sync4.url).to.include(USER_SYNC_URL_IFRAME);
+    expect(sync4.url).to.include('&gdpr=');
+    expect(sync4.url).to.include('&us_privacy=');
+  });
+
+  it('Test do not override user object', function () {
+    const request = spec.buildRequests(bannerRequest, bannerRequest[0]);
+    const payload = JSON.parse(request.data);
+    expect(payload.user.uid).to.eql(222);
+    expect(payload.user.buyeruid).to.eql(333);
+    expect(payload.user.ext.consent).to.eql('consentString');
+  });
+});
diff --git a/test/spec/native_spec.js b/test/spec/native_spec.js
index cd58dcb2cf7..714d61b95e2 100644
--- a/test/spec/native_spec.js
+++ b/test/spec/native_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { fireNativeTrackers, getNativeTargeting, nativeBidIsValid, getAssetMessage } from 'src/native.js';
+import { fireNativeTrackers, getNativeTargeting, nativeBidIsValid, getAssetMessage, getAllAssetsMessage } from 'src/native.js';
 import CONSTANTS from 'src/constants.json';
 const utils = require('src/utils');
 
@@ -23,7 +23,11 @@ const bid = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: ''
+    javascriptTrackers: '',
+    ext: {
+      foo: 'foo-value',
+      baz: 'baz-value'
+    }
   }
 };
 
@@ -36,7 +40,11 @@ const bidWithUndefinedFields = {
     clickUrl: 'https://www.link.example',
     clickTrackers: ['https://tracker.example'],
     impressionTrackers: ['https://impression.example'],
-    javascriptTrackers: ''
+    javascriptTrackers: '',
+    ext: {
+      foo: 'foo-value',
+      baz: undefined
+    }
   }
 };
 
@@ -59,34 +67,326 @@ describe('native.js', function () {
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
     expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal(bid.native.body);
     expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal(bid.native.clickUrl);
+    expect(targeting.hb_native_foo).to.equal(bid.native.foo);
   });
 
   it('sends placeholders for configured assets', function () {
     const bidRequest = {
-      mediaTypes: {
-        native: {
-          body: { sendId: true },
-          clickUrl: { sendId: true },
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            sendId: false
+          },
+          baz: {
+            sendId: true
+          }
         }
       }
     };
     const targeting = getNativeTargeting(bid, bidRequest);
 
     expect(targeting[CONSTANTS.NATIVE_KEYS.title]).to.equal(bid.native.title);
-    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('pwt_native_body:123');
-    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('pwt_native_linkurl:123');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.body]).to.equal('hb_native_body:123');
+    expect(targeting[CONSTANTS.NATIVE_KEYS.clickUrl]).to.equal('hb_native_linkurl:123');
+    expect(targeting.hb_native_foo).to.equal(bid.native.ext.foo);
+    expect(targeting.hb_native_baz).to.equal('hb_native_baz:123');
   });
 
   it('should only include native targeting keys with values', function () {
-    const targeting = getNativeTargeting(bidWithUndefinedFields);
+    const bidRequest = {
+      nativeParams: {
+        body: { sendId: true },
+        clickUrl: { sendId: true },
+        ext: {
+          foo: {
+            required: false
+          },
+          baz: {
+            required: false
+          }
+        }
+      }
+    };
+
+    const targeting = getNativeTargeting(bidWithUndefinedFields, bidRequest);
 
     expect(Object.keys(targeting)).to.deep.equal([
       CONSTANTS.NATIVE_KEYS.title,
       CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo'
+    ]);
+  });
+
+  it('should only include targeting that has sendTargetingKeys set to true', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+          sendTargetingKeys: true
+        },
+        sendTargetingKeys: false,
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title
+    ]);
+  });
+
+  it('should only include targeting if sendTargetingKeys not set to false', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80
+        },
+        body: {
+          required: true
+        },
+        clickUrl: {
+          required: true
+        },
+        icon: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        cta: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        sponsoredBy: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        ext: {
+          foo: {
+            required: false,
+            sendTargetingKeys: true
+          }
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      'hb_native_foo'
+    ]);
+  });
+
+  it('should copy over rendererUrl to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        rendererUrl: {
+          url: 'https://www.renderer.com/'
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.rendererUrl
+    ]);
+
+    expect(bid.native.rendererUrl).to.deep.equal('https://www.renderer.com/');
+    delete bid.native.rendererUrl;
+  });
+
+  it('should copy over adTemplate to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        adTemplate: '
##hb_native_body##<\/p><\/div>'
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl
+    ]);
+
+    expect(bid.native.adTemplate).to.deep.equal('
##hb_native_body##<\/p><\/div>');
+    delete bid.native.adTemplate;
+  });
+
+  it('should only include targeting that has sendTargetingKeys set to true', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+          sendTargetingKeys: true
+        },
+        sendTargetingKeys: false,
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title
+    ]);
+  });
+
+  it('should only include targeting if sendTargetingKeys not set to false', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80
+        },
+        body: {
+          required: true
+        },
+        clickUrl: {
+          required: true
+        },
+        icon: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        cta: {
+          required: false,
+          sendTargetingKeys: false
+        },
+        sponsoredBy: {
+          required: false,
+          sendTargetingKeys: false
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.image,
       CONSTANTS.NATIVE_KEYS.clickUrl
     ]);
   });
 
+  it('should copy over rendererUrl to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        rendererUrl: {
+          url: 'https://www.renderer.com/'
+        }
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl,
+      CONSTANTS.NATIVE_KEYS.rendererUrl
+    ]);
+
+    expect(bid.native.rendererUrl).to.deep.equal('https://www.renderer.com/');
+    delete bid.native.rendererUrl;
+  });
+
+  it('should copy over adTemplate to bid object and include it in targeting', function () {
+    const bidRequest = {
+      nativeParams: {
+        image: {
+          required: true,
+          sizes: [150, 50]
+        },
+        title: {
+          required: true,
+          len: 80,
+        },
+        adTemplate: '
##hb_native_body##<\/p><\/div>'
+      }
+
+    };
+    const targeting = getNativeTargeting(bid, bidRequest);
+
+    expect(Object.keys(targeting)).to.deep.equal([
+      CONSTANTS.NATIVE_KEYS.title,
+      CONSTANTS.NATIVE_KEYS.body,
+      CONSTANTS.NATIVE_KEYS.cta,
+      CONSTANTS.NATIVE_KEYS.image,
+      CONSTANTS.NATIVE_KEYS.icon,
+      CONSTANTS.NATIVE_KEYS.sponsoredBy,
+      CONSTANTS.NATIVE_KEYS.clickUrl
+    ]);
+
+    expect(bid.native.adTemplate).to.deep.equal('
##hb_native_body##<\/p><\/div>');
+    delete bid.native.adTemplate;
+  });
+
   it('fires impression trackers', function () {
     fireNativeTrackers({}, bid);
     sinon.assert.calledOnce(triggerPixelStub);
@@ -125,6 +425,82 @@ describe('native.js', function () {
       value: bid.native.clickUrl
     });
   });
+
+  it('creates native all asset message', function() {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bid);
+
+    expect(message.assets.length).to.equal(9);
+    expect(message.assets).to.deep.include({
+      key: 'body',
+      value: bid.native.body
+    });
+    expect(message.assets).to.deep.include({
+      key: 'image',
+      value: bid.native.image.url
+    });
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title
+    });
+    expect(message.assets).to.deep.include({
+      key: 'icon',
+      value: bid.native.icon.url
+    });
+    expect(message.assets).to.deep.include({
+      key: 'cta',
+      value: bid.native.cta
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy
+    });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo
+    });
+    expect(message.assets).to.deep.include({
+      key: 'baz',
+      value: bid.native.ext.baz
+    });
+  });
+
+  it('creates native all asset message with only defined fields', function() {
+    const messageRequest = {
+      message: 'Prebid Native',
+      action: 'allAssetRequest',
+      adId: '123',
+    };
+
+    const message = getAllAssetsMessage(messageRequest, bidWithUndefinedFields);
+
+    expect(message.assets.length).to.equal(4);
+    expect(message.assets).to.deep.include({
+      key: 'clickUrl',
+      value: bid.native.clickUrl
+    });
+    expect(message.assets).to.deep.include({
+      key: 'title',
+      value: bid.native.title
+    });
+    expect(message.assets).to.deep.include({
+      key: 'sponsoredBy',
+      value: bid.native.sponsoredBy
+    });
+    expect(message.assets).to.deep.include({
+      key: 'foo',
+      value: bid.native.ext.foo
+    });
+  });
 });
 
 describe('validate native', function () {
@@ -187,11 +563,7 @@ describe('validate native', function () {
     native: {
       body: 'This is a Prebid Native Creative. There are many like it, but this one is mine.',
       clickTrackers: ['http://my.click.tracker/url'],
-      icon: {
-        url: 'http://my.image.file/ad_image.jpg',
-        height: 0,
-        width: 0
-      },
+      icon: 'http://my.image.file/ad_image.jpg',
       image: {
         url: 'http://my.icon.file/ad_icon.jpg',
         height: 2250,
@@ -217,11 +589,7 @@ describe('validate native', function () {
         height: 75,
         width: 75
       },
-      image: {
-        url: 'http://my.icon.file/ad_icon.jpg',
-        height: 0,
-        width: 0
-      },
+      image: 'http://my.icon.file/ad_icon.jpg',
       clickUrl: 'http://prebid.org/dev-docs/show-native-ads.html',
       impressionTrackers: ['http://my.imp.tracker/url'],
       javascriptTrackers: '',
@@ -233,12 +601,12 @@ describe('validate native', function () {
 
   afterEach(function () {});
 
-  it('should reject bid if no image sizes are defined', function () {
+  it('should accept bid if no image sizes are defined', function () {
     let result = nativeBidIsValid(validBid, bidReq);
     expect(result).to.be.true;
     result = nativeBidIsValid(noIconDimBid, bidReq);
-    expect(result).to.be.false;
+    expect(result).to.be.true;
     result = nativeBidIsValid(noImgDimBid, bidReq);
-    expect(result).to.be.false;
+    expect(result).to.be.true;
   });
 });
diff --git a/test/spec/refererDetection_spec.js b/test/spec/refererDetection_spec.js
index 90892d915fe..46990ae841f 100644
--- a/test/spec/refererDetection_spec.js
+++ b/test/spec/refererDetection_spec.js
@@ -1,87 +1,357 @@
 import { detectReferer } from 'src/refererDetection.js';
 import { expect } from 'chai';
 
-var mocks = {
-  createFakeWindow: function (referrer, href) {
-    return {
-      document: {
-        referrer: referrer
-      },
-      location: {
-        href: href,
-        // TODO: add ancestorOrigins to increase test coverage
-      },
-      parent: null,
-      top: null
-    };
+/**
+ * Build a walkable linked list of window-like objects for testing.
+ *
+ * @param {Array} urls Array of URL strings starting from the top window.
+ * @param {string} [topReferrer]
+ * @param {string} [canonicalUrl]
+ * @param {boolean} [ancestorOrigins]
+ * @returns {Object}
+ */
+function buildWindowTree(urls, topReferrer = '', canonicalUrl = null, ancestorOrigins = false) {
+  /**
+     * Find the origin from a given fully-qualified URL.
+     *
+     * @param {string} url The fully qualified URL
+     * @returns {string|null}
+     */
+  function getOrigin(url) {
+    const originRegex = new RegExp('^(https?://[^/]+/?)');
+
+    const result = originRegex.exec(url);
+
+    if (result && result[0]) {
+      return result[0];
+    }
+
+    return null;
   }
-}
 
-describe('referer detection', () => {
-  it('should return referer details in nested friendly iframes', function() {
-    // Fake window object to test friendly iframes
-    // - Main page http://example.com/page.html
-    // - - Iframe1 http://example.com/iframe1.html
-    // - - - Iframe2 http://example.com/iframe2.html
-    let mockIframe2WinObject = mocks.createFakeWindow('http://example.com/iframe1.html', 'http://example.com/iframe2.html');
-    let mockIframe1WinObject = mocks.createFakeWindow('http://example.com/page.html', 'http://example.com/iframe1.html');
-    let mainWinObject = mocks.createFakeWindow('http://example.com/page.html', 'http://example.com/page.html');
-    mainWinObject.document.querySelector = function() {
-      return {
-        href: 'http://prebid.org'
+  let previousWindow;
+  const myOrigin = getOrigin(urls[urls.length - 1]);
+
+  const windowList = urls.map((url, index) => {
+    const theirOrigin = getOrigin(url),
+      sameOrigin = (myOrigin === theirOrigin);
+
+    const win = {};
+
+    if (sameOrigin) {
+      win.location = {
+        href: url
+      };
+
+      if (ancestorOrigins) {
+        win.location.ancestorOrigins = urls.slice(0, index).reverse().map(getOrigin);
+      }
+
+      if (index === 0) {
+        win.document = {
+          referrer: topReferrer
+        };
+
+        if (canonicalUrl) {
+          win.document.querySelector = function(selector) {
+            if (selector === "link[rel='canonical']") {
+              return {
+                href: canonicalUrl
+              };
+            }
+
+            return null;
+          };
+        }
+      } else {
+        win.document = {
+          referrer: urls[index - 1]
+        };
       }
     }
-    mockIframe2WinObject.parent = mockIframe1WinObject;
-    mockIframe2WinObject.top = mainWinObject;
-    mockIframe1WinObject.parent = mainWinObject;
-    mockIframe1WinObject.top = mainWinObject;
-    mainWinObject.top = mainWinObject;
-
-    const getRefererInfo = detectReferer(mockIframe2WinObject);
-    let result = getRefererInfo();
-    let expectedResult = {
-      referer: 'http://example.com/page.html',
-      reachedTop: true,
-      numIframes: 2,
-      stack: [
-        'http://example.com/page.html',
-        'http://example.com/iframe1.html',
-        'http://example.com/iframe2.html'
-      ],
-      canonicalUrl: 'http://prebid.org'
-    };
-    expect(result).to.deep.equal(expectedResult);
+
+    previousWindow = win;
+
+    return win;
+  });
+
+  const topWindow = windowList[0];
+
+  previousWindow = null;
+
+  windowList.forEach((win) => {
+    win.top = topWindow;
+    win.parent = previousWindow || topWindow;
+    previousWindow = win;
+  });
+
+  return windowList[windowList.length - 1];
+}
+
+describe('Referer detection', () => {
+  describe('Non cross-origin scenarios', () => {
+    describe('No iframes', () => {
+      it('Should return the current window location and no canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/'),
+          result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: null
+        });
+      });
+
+      it('Should return the current window location and a canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 0,
+          stack: ['https://example.com/some/page'],
+          canonicalUrl: 'https://example.com/canonical/page'
+        });
+      });
+    });
+
+    describe('Friendly iframes', () => {
+      it('Should return the top window location and no canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page', 'https://example.com/other/page', 'https://example.com/third/page'], 'https://othersite.com/'),
+          result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            'https://example.com/some/page',
+            'https://example.com/other/page',
+            'https://example.com/third/page'
+          ],
+          canonicalUrl: null
+        });
+      });
+
+      it('Should return the top window location and a canonical URL', () => {
+        const testWindow = buildWindowTree(['https://example.com/some/page', 'https://example.com/other/page', 'https://example.com/third/page'], 'https://othersite.com/', 'https://example.com/canonical/page'),
+          result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page',
+          reachedTop: true,
+          isAmp: false,
+          numIframes: 2,
+          stack: [
+            'https://example.com/some/page',
+            'https://example.com/other/page',
+            'https://example.com/third/page'
+          ],
+          canonicalUrl: 'https://example.com/canonical/page'
+        });
+      });
+    });
   });
 
-  it('should return referer details in nested cross domain iframes', function() {
-    // Fake window object to test cross domain iframes.
-    // - Main page http://example.com/page.html
-    // - - Iframe1 http://aaa.com/iframe1.html
-    // - - - Iframe2 http://bbb.com/iframe2.html
-    let mockIframe2WinObject = mocks.createFakeWindow('http://aaa.com/iframe1.html', 'http://bbb.com/iframe2.html');
-    // Sinon cannot throw exception when accessing a propery so passing null to create cross domain
-    // environment for refererDetection module
-    let mockIframe1WinObject = mocks.createFakeWindow(null, null);
-    let mainWinObject = mocks.createFakeWindow(null, null);
-    mockIframe2WinObject.parent = mockIframe1WinObject;
-    mockIframe2WinObject.top = mainWinObject;
-    mockIframe1WinObject.parent = mainWinObject;
-    mockIframe1WinObject.top = mainWinObject;
-    mainWinObject.top = mainWinObject;
-
-    const getRefererInfo = detectReferer(mockIframe2WinObject);
-    let result = getRefererInfo();
-    let expectedResult = {
-      referer: 'http://aaa.com/iframe1.html',
-      reachedTop: false,
-      numIframes: 2,
-      stack: [
-        null,
-        'http://aaa.com/iframe1.html',
-        'http://bbb.com/iframe2.html'
-      ],
-      canonicalUrl: undefined
-    };
-    expect(result).to.deep.equal(expectedResult);
+  describe('Cross-origin scenarios', () => {
+    it('Should return the top URL and no canonical URL with one cross-origin iframe', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://example.com/some/page',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page',
+          'https://safe.frame/ad'
+        ],
+        canonicalUrl: null
+      });
+    });
+
+    it('Should return the top URL and no canonical URL with one cross-origin iframe and one friendly iframe', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://safe.frame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://example.com/some/page',
+        reachedTop: true,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          'https://example.com/some/page',
+          'https://safe.frame/ad',
+          'https://safe.frame/ad'
+        ],
+        canonicalUrl: null
+      });
+    });
+
+    it('Should return the second iframe location with three cross-origin windows and no ancessorOrigins', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://otherfr.ame/ad'], 'https://othersite.com/', 'https://canonical.example.com/'),
+        result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://safe.frame/ad',
+        reachedTop: false,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          null,
+          'https://safe.frame/ad',
+          'https://otherfr.ame/ad'
+        ],
+        canonicalUrl: null
+      });
+    });
+
+    it('Should return the top window origin with three cross-origin windows with ancessorOrigins', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page', 'https://safe.frame/ad', 'https://otherfr.ame/ad'], 'https://othersite.com/', 'https://canonical.example.com/', true),
+        result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://example.com/',
+        reachedTop: false,
+        isAmp: false,
+        numIframes: 2,
+        stack: [
+          'https://example.com/',
+          'https://safe.frame/ad',
+          'https://otherfr.ame/ad'
+        ],
+        canonicalUrl: null
+      });
+    });
+  });
+
+  describe('Cross-origin AMP page scenarios', () => {
+    it('Should return the AMP page source and canonical URLs in an amp-ad iframe for a non-cached AMP page', () => {
+      const testWindow = buildWindowTree(['https://example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+      testWindow.context = {
+        sourceUrl: 'https://example.com/some/page/amp/',
+        canonicalUrl: 'https://example.com/some/page/'
+      };
+
+      const result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://example.com/some/page/amp/',
+        reachedTop: true,
+        isAmp: true,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page/amp/',
+          'https://ad-iframe.ampproject.org/ad'
+        ],
+        canonicalUrl: 'https://example.com/some/page/'
+      });
+    });
+
+    it('Should return the AMP page source and canonical URLs in an amp-ad iframe for a cached AMP page on top', () => {
+      const testWindow = buildWindowTree(['https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+      testWindow.context = {
+        sourceUrl: 'https://example.com/some/page/amp/',
+        canonicalUrl: 'https://example.com/some/page/'
+      };
+
+      const result = detectReferer(testWindow)();
+
+      expect(result).to.deep.equal({
+        referer: 'https://example.com/some/page/amp/',
+        reachedTop: true,
+        isAmp: true,
+        numIframes: 1,
+        stack: [
+          'https://example.com/some/page/amp/',
+          'https://ad-iframe.ampproject.org/ad'
+        ],
+        canonicalUrl: 'https://example.com/some/page/'
+      });
+    });
+
+    describe('Cached AMP page in iframed search result', () => {
+      it('Should return the AMP source and canonical URLs but with a null top-level stack location Without ancesorOrigins', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad']);
+
+        testWindow.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 2,
+          stack: [
+            null,
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/'
+        });
+      });
+
+      it('Should return the AMP source and canonical URLs and include the top window origin in the stack with ancesorOrigins', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad'], null, null, true);
+
+        testWindow.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 2,
+          stack: [
+            'https://google.com/',
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/'
+        });
+      });
+
+      it('Should return the AMP source and canonical URLs and include the top window origin in the stack with ancesorOrigins and a friendly iframe under the amp-ad iframe', () => {
+        const testWindow = buildWindowTree(['https://google.com/amp/example-com/some/page/amp/', 'https://example-com.amp-cache.example.com/some/page/amp/', 'https://ad-iframe.ampproject.org/ad', 'https://ad-iframe.ampproject.org/ad'], null, null, true);
+
+        testWindow.parent.context = {
+          sourceUrl: 'https://example.com/some/page/amp/',
+          canonicalUrl: 'https://example.com/some/page/'
+        };
+
+        const result = detectReferer(testWindow)();
+
+        expect(result).to.deep.equal({
+          referer: 'https://example.com/some/page/amp/',
+          reachedTop: false,
+          isAmp: true,
+          numIframes: 3,
+          stack: [
+            'https://google.com/',
+            'https://example.com/some/page/amp/',
+            'https://ad-iframe.ampproject.org/ad',
+            'https://ad-iframe.ampproject.org/ad'
+          ],
+          canonicalUrl: 'https://example.com/some/page/'
+        });
+      });
+    });
   });
 });
diff --git a/test/spec/renderer_spec.js b/test/spec/renderer_spec.js
index 77d806e4dbc..dcca94396cd 100644
--- a/test/spec/renderer_spec.js
+++ b/test/spec/renderer_spec.js
@@ -132,6 +132,59 @@ describe('Renderer', function () {
       expect(utilsSpy.callCount).to.equal(1);
     });
 
+    it('should load renderer adunit renderer when backupOnly', function() {
+      $$PREBID_GLOBAL$$.adUnits = [{
+        code: 'video1',
+        renderer: {
+          url: 'http://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+          backupOnly: true,
+          render: sinon.spy()
+        }
+      }]
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config1' },
+        id: 1,
+        adUnitCode: 'video1'
+
+      });
+      testRenderer.setRender(() => {})
+
+      testRenderer.render()
+      expect(loadExternalScript.called).to.be.true;
+    });
+
+    it('should load external script instead of publisher-defined one when backupOnly option is true in mediaTypes.video options', function() {
+      $$PREBID_GLOBAL$$.adUnits = [{
+        code: 'video1',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            mimes: ['video/mp4'],
+            playerSize: [[400, 300]],
+            renderer: {
+              url: 'https://acdn.adnxs.com/video/outstream/ANOutstreamVideo.js',
+              backupOnly: true,
+              render: sinon.spy()
+            },
+          }
+        }
+      }]
+
+      let testRenderer = Renderer.install({
+        url: 'https://httpbin.org/post',
+        config: { test: 'config1' },
+        id: 1,
+        adUnitCode: 'video1'
+
+      });
+      testRenderer.setRender(() => {})
+
+      testRenderer.render()
+      expect(loadExternalScript.called).to.be.true;
+    });
+
     it('should call loadExternalScript() for script not defined on adUnit, only when .render() is called', function() {
       $$PREBID_GLOBAL$$.adUnits = [{
         code: 'video1',
diff --git a/test/spec/unit/core/adapterManager_spec.js b/test/spec/unit/core/adapterManager_spec.js
index c96d1c87879..da1ba308bbb 100644
--- a/test/spec/unit/core/adapterManager_spec.js
+++ b/test/spec/unit/core/adapterManager_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import adapterManager, { gdprDataHandler } from 'src/adapterManager.js';
+import adapterManager, { allS2SBidders, clientTestAdapters, gdprDataHandler, coppaDataHandler } from 'src/adapterManager.js';
 import {
   getAdUnits,
   getServerTestingConfig,
@@ -25,6 +25,17 @@ const CONFIG = {
   bidders: ['appnexus'],
   accountId: 'abc'
 };
+
+const CONFIG2 = {
+  enabled: true,
+  endpoint: 'https://prebid-server.rubiconproject.com/openrtb2/auction',
+  timeout: 1000,
+  maxBids: 1,
+  adapter: 'prebidServer',
+  bidders: ['pubmatic'],
+  accountId: 'def'
+}
+
 var prebidServerAdapterMock = {
   bidder: 'prebidServer',
   callBids: sinon.stub()
@@ -43,6 +54,11 @@ var rubiconAdapterMock = {
   callBids: sinon.stub()
 };
 
+var pubmaticAdapterMock = {
+  bidder: 'rubicon',
+  callBids: sinon.stub()
+};
+
 var badAdapterMock = {
   bidder: 'badBidder',
   callBids: sinon.stub().throws(Error('some fake error'))
@@ -82,6 +98,7 @@ describe('adapterManager tests', function () {
       adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
       adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
       adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
+      adapterManager.bidderRegistry['badBidder'] = badAdapterMock;
     });
 
     afterEach(function () {
@@ -387,6 +404,38 @@ describe('adapterManager tests', function () {
     });
   }); // end onSetTargeting
 
+  describe('onBidViewable', function () {
+    var criteoSpec = { onBidViewable: sinon.stub() }
+    var criteoAdapter = {
+      bidder: 'criteo',
+      getSpec: function() { return criteoSpec; }
+    }
+    before(function () {
+      config.setConfig({s2sConfig: { enabled: false }});
+    });
+
+    beforeEach(function () {
+      adapterManager.bidderRegistry['criteo'] = criteoAdapter;
+    });
+
+    afterEach(function () {
+      delete adapterManager.bidderRegistry['criteo'];
+    });
+
+    it('should call spec\'s onBidViewable callback when callBidViewableBidder is called', function () {
+      const bids = [
+        {bidder: 'criteo', params: {placementId: 'id'}},
+      ];
+      const adUnits = [{
+        code: 'adUnit-code',
+        sizes: [[728, 90]],
+        bids
+      }];
+      adapterManager.callBidViewableBidder(bids[0].bidder, bids[0]);
+      sinon.assert.called(criteoSpec.onBidViewable);
+    });
+  }); // end onBidViewable
+
   describe('S2S tests', function () {
     beforeEach(function () {
       config.setConfig({s2sConfig: CONFIG});
@@ -394,144 +443,144 @@ describe('adapterManager tests', function () {
       prebidServerAdapterMock.callBids.reset();
     });
 
-    it('invokes callBids on the S2S adapter', function () {
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'timeout': 1000,
-        'src': 's2s',
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
               },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
                 ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '68136e1c47023d'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
               },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
                 ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '7e5d6af25ed188'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
+                [
+                  300,
+                  600
+                ]
               ],
-              [
-                970,
-                90
-              ]
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
             ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
           },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
             ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    }];
 
+    it('invokes callBids on the S2S adapter', function () {
       adapterManager.callBids(
         getAdUnits(),
         bidRequests,
@@ -559,143 +608,6 @@ describe('adapterManager tests', function () {
         ]
       });
 
-      let bidRequests = [{
-        'bidderCode': 'appnexus',
-        'auctionId': '1863e370099523',
-        'bidderRequestId': '2946b569352ef2',
-        'tid': '34566b569352ef2',
-        'src': 's2s',
-        'timeout': 1000,
-        'adUnitsS2SCopy': [
-          {
-            'code': '/19968336/header-bid-tag1',
-            'sizes': [
-              {
-                'w': 728,
-                'h': 90
-              },
-              {
-                'w': 970,
-                'h': 90
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '543221',
-                  'test': 'me'
-                },
-                'adUnitCode': '/19968336/header-bid-tag1',
-                'sizes': [
-                  [
-                    728,
-                    90
-                  ],
-                  [
-                    970,
-                    90
-                  ]
-                ],
-                'bidId': '68136e1c47023d',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220995,
-                'status': 1,
-                'bid_id': '378a8914450b334'
-              }
-            ]
-          },
-          {
-            'code': '/19968336/header-bid-tag-0',
-            'sizes': [
-              {
-                'w': 300,
-                'h': 250
-              },
-              {
-                'w': 300,
-                'h': 600
-              }
-            ],
-            'bids': [
-              {
-                'bidder': 'appnexus',
-                'params': {
-                  'placementId': '5324321'
-                },
-                'adUnitCode': '/19968336/header-bid-tag-0',
-                'sizes': [
-                  [
-                    300,
-                    250
-                  ],
-                  [
-                    300,
-                    600
-                  ]
-                ],
-                'bidId': '7e5d6af25ed188',
-                'bidderRequestId': '55e24a66bed717',
-                'auctionId': '1ff753bd4ae5cb',
-                'startTime': 1463510220996,
-                'bid_id': '387d9d9c32ca47c'
-              }
-            ]
-          }
-        ],
-        'bids': [
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418',
-              'test': 'me'
-            },
-            'adUnitCode': '/19968336/header-bid-tag1',
-            'sizes': [
-              [
-                728,
-                90
-              ],
-              [
-                970,
-                90
-              ]
-            ],
-            'bidId': '392b5a6b05d648',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897462,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          },
-          {
-            'bidder': 'appnexus',
-            'params': {
-              'placementId': '4799418'
-            },
-            'adUnitCode': '/19968336/header-bid-tag-0',
-            'sizes': [
-              [
-                300,
-                250
-              ],
-              [
-                300,
-                600
-              ]
-            ],
-            'bidId': '4dccdc37746135',
-            'bidderRequestId': '2946b569352ef2',
-            'auctionId': '1863e370099523',
-            'startTime': 1462918897463,
-            'status': 1,
-            'transactionId': 'fsafsa'
-          }
-        ],
-        'start': 1462918897460
-      }];
-
       adapterManager.callBids(
         adUnits,
         bidRequests,
@@ -749,133 +661,764 @@ describe('adapterManager tests', function () {
     });
   }); // end s2s tests
 
-  describe('s2sTesting', function () {
-    let doneStub = sinon.stub();
-    let ajaxStub = sinon.stub();
-
-    function getTestAdUnits() {
-      // copy adUnits
-      // return JSON.parse(JSON.stringify(getAdUnits()));
-      return utils.deepClone(getAdUnits()).map(adUnit => {
-        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
-        return adUnit;
-      })
-    }
-
-    function callBids(adUnits = getTestAdUnits()) {
-      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
-      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
-    }
-
-    function checkServerCalled(numAdUnits, numBids) {
-      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
-      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
-      expect(requestObj.ad_units.length).to.equal(numAdUnits);
-      for (let i = 0; i < numAdUnits; i++) {
-        expect(requestObj.ad_units[i].bids.filter((bid) => {
-          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
-        }).length).to.equal(numBids);
-      }
-    }
-
-    function checkClientCalled(adapter, numBids) {
-      sinon.assert.calledOnce(adapter.callBids);
-      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
-    }
-
-    let TESTING_CONFIG = utils.deepClone(CONFIG);
-    Object.assign(TESTING_CONFIG, {
-      bidders: ['appnexus', 'adequant'],
-      testing: true
-    });
-    let stubGetSourceBidderMap;
-
+  describe('Multiple S2S tests', function () {
     beforeEach(function () {
-      config.setConfig({s2sConfig: TESTING_CONFIG});
+      config.setConfig({s2sConfig: [CONFIG, CONFIG2]});
       adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
-      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
-      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
-      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
-
-      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
-
       prebidServerAdapterMock.callBids.reset();
-      adequantAdapterMock.callBids.reset();
-      appnexusAdapterMock.callBids.reset();
-      rubiconAdapterMock.callBids.reset();
     });
 
     afterEach(function () {
-      config.setConfig({s2sConfig: {}});
-      s2sTesting.getSourceBidderMap.restore();
-    });
-
-    it('calls server adapter if no sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      sinon.assert.notCalled(appnexusAdapterMock.callBids);
-
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
-    });
-
-    it('calls client adapter if one client source defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
+      allS2SBidders.length = 0;
     });
 
-    it('calls client adapters if client sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      callBids();
-
-      // server adapter
-      checkServerCalled(2, 2);
-
-      // appnexus
-      checkClientCalled(appnexusAdapterMock, 2);
-
-      // adequant
-      checkClientCalled(adequantAdapterMock, 2);
+    const bidRequests = [{
+      'bidderCode': 'appnexus',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '34566b569352ef2',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'appnexus',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        },
+        {
+          'bidder': 'appnexus',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': 'fsafsa'
+        }
+      ],
+      'start': 1462918897460
+    },
+    {
+      'bidderCode': 'pubmatic',
+      'auctionId': '1863e370099523',
+      'bidderRequestId': '2946b569352ef2',
+      'tid': '2342342342lfi23',
+      'timeout': 1000,
+      'src': 's2s',
+      'adUnitsS2SCopy': [
+        {
+          'code': '/19968336/header-bid-tag1',
+          'sizes': [
+            {
+              'w': 728,
+              'h': 90
+            },
+            {
+              'w': 970,
+              'h': 90
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '543221',
+                'test': 'me'
+              },
+              'adUnitCode': '/19968336/header-bid-tag1',
+              'sizes': [
+                [
+                  728,
+                  90
+                ],
+                [
+                  970,
+                  90
+                ]
+              ],
+              'bidId': '68136e1c47023d',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220995,
+              'status': 1,
+              'bid_id': '68136e1c47023d'
+            }
+          ]
+        },
+        {
+          'code': '/19968336/header-bid-tag-0',
+          'sizes': [
+            {
+              'w': 300,
+              'h': 250
+            },
+            {
+              'w': 300,
+              'h': 600
+            }
+          ],
+          'bids': [
+            {
+              'bidder': 'pubmatic',
+              'params': {
+                'placementId': '5324321'
+              },
+              'adUnitCode': '/19968336/header-bid-tag-0',
+              'sizes': [
+                [
+                  300,
+                  250
+                ],
+                [
+                  300,
+                  600
+                ]
+              ],
+              'bidId': '7e5d6af25ed188',
+              'bidderRequestId': '55e24a66bed717',
+              'auctionId': '1ff753bd4ae5cb',
+              'startTime': 1463510220996,
+              'bid_id': '7e5d6af25ed188'
+            }
+          ]
+        }
+      ],
+      'bids': [
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418',
+            'test': 'me'
+          },
+          'adUnitCode': '/19968336/header-bid-tag1',
+          'sizes': [
+            [
+              728,
+              90
+            ],
+            [
+              970,
+              90
+            ]
+          ],
+          'bidId': '392b5a6b05d648',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897462,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        },
+        {
+          'bidder': 'pubmatic',
+          'params': {
+            'placementId': '4799418'
+          },
+          'adUnitCode': '/19968336/header-bid-tag-0',
+          'sizes': [
+            [
+              300,
+              250
+            ],
+            [
+              300,
+              600
+            ]
+          ],
+          'bidId': '4dccdc37746135',
+          'bidderRequestId': '2946b569352ef2',
+          'auctionId': '1863e370099523',
+          'startTime': 1462918897463,
+          'status': 1,
+          'transactionId': '4r42r23r23'
+        }
+      ],
+      'start': 1462918897460
+    }];
+
+    it('invokes callBids on the S2S adapter', function () {
+      adapterManager.callBids(
+        getAdUnits(),
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
     });
 
-    it('calls client adapters if client sources defined', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+    // Enable this test when prebidServer adapter is made 1.0 compliant
+    it('invokes callBids with only s2s bids', function () {
+      const adUnits = getAdUnits();
+      // adUnit without appnexus bidder
+      adUnits.push({
+        'code': '123',
+        'sizes': [300, 250],
+        'bids': [
+          {
+            'bidder': 'adequant',
+            'params': {
+              'publisher_id': '1234567',
+              'bidfloor': 0.01
+            }
+          }
+        ]
+      });
+
+      adapterManager.callBids(
+        adUnits,
+        bidRequests,
+        () => {},
+        () => () => {}
+      );
+      const requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(2);
+      sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+    });
+
+    describe('BID_REQUESTED event', function () {
+      // function to count BID_REQUESTED events
+      let cnt, count = () => cnt++;
+
+      beforeEach(function () {
+        prebidServerAdapterMock.callBids.reset();
+        cnt = 0;
+        events.on(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      afterEach(function () {
+        events.off(CONSTANTS.EVENTS.BID_REQUESTED, count);
+      });
+
+      it('should fire for s2s requests', function () {
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(2);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+      });
+
+      it('should fire for simultaneous s2s and client requests', function () {
+        adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+        let adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
+          adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'pubmatic'], bid.bidder));
+          return adUnit;
+        })
+        let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+        adapterManager.callBids(adUnits, bidRequests, () => {}, () => {});
+        expect(cnt).to.equal(3);
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        sinon.assert.calledOnce(adequantAdapterMock.callBids);
+        adequantAdapterMock.callBids.reset();
+        delete adapterManager.bidderRegistry['adequant'];
+      });
+    });
+  }); // end multiple s2s tests
+
+  describe('s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      // return JSON.parse(JSON.stringify(getAdUnits()));
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => includes(['adequant', 'appnexus', 'rubicon'], bid.bidder));
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, numBids) {
+      sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+      let requestObj = prebidServerAdapterMock.callBids.firstCall.args[0];
+      expect(requestObj.ad_units.length).to.equal(numAdUnits);
+      for (let i = 0; i < numAdUnits; i++) {
+        expect(requestObj.ad_units[i].bids.filter((bid) => {
+          return bid.bidder === 'appnexus' || bid.bidder === 'adequant';
+        }).length).to.equal(numBids);
+      }
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    let TESTING_CONFIG = utils.deepClone(CONFIG);
+    Object.assign(TESTING_CONFIG, {
+      bidders: ['appnexus', 'adequant'],
+      testing: true
+    });
+    let stubGetSourceBidderMap;
+
+    beforeEach(function () {
+      config.setConfig({s2sConfig: TESTING_CONFIG});
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+
+      stubGetSourceBidderMap = sinon.stub(s2sTesting, 'getSourceBidderMap');
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+    });
+
+    afterEach(function () {
+      s2sTesting.getSourceBidderMap.restore();
+    });
+
+    it('calls server adapter if no sources defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: [], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client adapter if one client source defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus'], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client adapters if client sources defined', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+    });
+
+    it('does not call server adapter for bidders that go to client', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[1].finalSource = s2sTesting.CLIENT;
+      callBids(adUnits);
+
+      // server adapter
+      sinon.assert.notCalled(prebidServerAdapterMock.callBids);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+    });
+
+    it('does not call client adapters for bidders that go to server', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[0].bids[1].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+    });
+
+    it('calls client and server adapters for bidders that go to both', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      // adUnits[0].bids[0].finalSource = s2sTesting.BOTH;
+      // adUnits[0].bids[1].finalSource = s2sTesting.BOTH;
+      // adUnits[1].bids[0].finalSource = s2sTesting.BOTH;
+      // adUnits[1].bids[1].finalSource = s2sTesting.BOTH;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(2, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 2);
+    });
+
+    it('makes mixed client/server adapter calls for mixed bidder sources', function () {
+      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
+      var adUnits = getTestAdUnits();
+      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
+      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
+      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
+      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
+      callBids(adUnits);
+
+      // server adapter
+      checkServerCalled(1, 2);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 1);
+
+      // adequant
+      checkClientCalled(adequantAdapterMock, 1);
+    });
+  });
+
+  describe('Multiple Server s2sTesting', function () {
+    let doneStub = sinon.stub();
+    let ajaxStub = sinon.stub();
+
+    function getTestAdUnits() {
+      // copy adUnits
+      return utils.deepClone(getAdUnits()).map(adUnit => {
+        adUnit.bids = adUnit.bids.filter(bid => {
+          return includes(['adequant', 'appnexus', 'pubmatic', 'rubicon'],
+            bid.bidder);
+        });
+        return adUnit;
+      })
+    }
+
+    function callBids(adUnits = getTestAdUnits()) {
+      let bidRequests = adapterManager.makeBidRequests(adUnits, 1111, 2222, 1000);
+      adapterManager.callBids(adUnits, bidRequests, doneStub, ajaxStub);
+    }
+
+    function checkServerCalled(numAdUnits, firstConfigNumBids, secondConfigNumBids) {
+      let requestObjects = [];
+      let configBids;
+      if (firstConfigNumBids === 0 || secondConfigNumBids === 0) {
+        configBids = Math.max(firstConfigNumBids, secondConfigNumBids)
+        sinon.assert.calledOnce(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        requestObjects.push(requestObj1)
+      } else {
+        sinon.assert.calledTwice(prebidServerAdapterMock.callBids);
+        let requestObj1 = prebidServerAdapterMock.callBids.firstCall.args[0];
+        let requestObj2 = prebidServerAdapterMock.callBids.secondCall.args[0];
+        requestObjects.push(requestObj1, requestObj2);
+      }
+
+      requestObjects.forEach((requestObj, index) => {
+        const numBids = configBids !== undefined ? configBids : index === 0 ? firstConfigNumBids : secondConfigNumBids
+        expect(requestObj.ad_units.length).to.equal(numAdUnits);
+        for (let i = 0; i < numAdUnits; i++) {
+          expect(requestObj.ad_units[i].bids.filter((bid) => {
+            return bid.bidder === 'appnexus' || bid.bidder === 'adequant' || bid.bidder === 'pubmatic';
+          }).length).to.equal(numBids);
+        }
+      })
+    }
+
+    function checkClientCalled(adapter, numBids) {
+      sinon.assert.calledOnce(adapter.callBids);
+      expect(adapter.callBids.firstCall.args[0].bids.length).to.equal(numBids);
+    }
+
+    beforeEach(function () {
+      allS2SBidders.length = 0;
+      clientTestAdapters.length = 0
+
+      adapterManager.bidderRegistry['prebidServer'] = prebidServerAdapterMock;
+      adapterManager.bidderRegistry['adequant'] = adequantAdapterMock;
+      adapterManager.bidderRegistry['appnexus'] = appnexusAdapterMock;
+      adapterManager.bidderRegistry['rubicon'] = rubiconAdapterMock;
+      adapterManager.bidderRegistry['pubmatic'] = pubmaticAdapterMock;
+
+      prebidServerAdapterMock.callBids.reset();
+      adequantAdapterMock.callBids.reset();
+      appnexusAdapterMock.callBids.reset();
+      rubiconAdapterMock.callBids.reset();
+      pubmaticAdapterMock.callBids.reset();
+    });
+
+    it('calls server adapter if no sources defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 2, 1);
+
+      // appnexus
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.called(rubiconAdapterMock.callBids);
+    });
+
+    it('calls client adapter if one client source defined for config where testing is true, ' +
+    'calls client adapter for second config where testing is false', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
+
+      // server adapter
+      checkServerCalled(2, 1, 1);
+
+      // appnexus
+      checkClientCalled(appnexusAdapterMock, 2);
+
+      // adequant
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
+
+    it('calls client adapters if client sources defined in first config and server in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+
       callBids();
 
       // server adapter
-      checkServerCalled(2, 2);
+      checkServerCalled(2, 0, 1);
 
       // appnexus
       checkClientCalled(appnexusAdapterMock, 2);
 
       // adequant
       checkClientCalled(adequantAdapterMock, 2);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
     });
 
-    it('does not call server adapter for bidders that go to client', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[1].finalSource = s2sTesting.CLIENT;
-      callBids(adUnits);
+    it('does not call server adapter for bidders that go to client when both configs are set to client', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
 
-      // server adapter
       sinon.assert.notCalled(prebidServerAdapterMock.callBids);
 
       // appnexus
@@ -883,63 +1426,110 @@ describe('adapterManager tests', function () {
 
       // adequant
       checkClientCalled(adequantAdapterMock, 2);
-    });
 
-    it('does not call client adapters for bidders that go to server', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[0].bids[1].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
-      callBids(adUnits);
+      // pubmatic
+      checkClientCalled(pubmaticAdapterMock, 2);
 
-      // server adapter
-      checkServerCalled(2, 2);
+      // rubicon
+      checkClientCalled(rubiconAdapterMock, 1);
+    });
 
-      // appnexus
-      sinon.assert.notCalled(appnexusAdapterMock.callBids);
+    it('does not call client adapters for bidders in either config when testServerOnly if true in first config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        testServerOnly: true,
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
 
-      // adequant
-      sinon.assert.notCalled(adequantAdapterMock.callBids);
-    });
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
 
-    it('calls client and server adapters for bidders that go to both', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      // adUnits[0].bids[0].finalSource = s2sTesting.BOTH;
-      // adUnits[0].bids[1].finalSource = s2sTesting.BOTH;
-      // adUnits[1].bids[0].finalSource = s2sTesting.BOTH;
-      // adUnits[1].bids[1].finalSource = s2sTesting.BOTH;
-      callBids(adUnits);
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
 
       // server adapter
-      checkServerCalled(2, 2);
+      checkServerCalled(2, 1, 0);
 
       // appnexus
       checkClientCalled(appnexusAdapterMock, 2);
 
       // adequant
-      checkClientCalled(adequantAdapterMock, 2);
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
     });
 
-    it('makes mixed client/server adapter calls for mixed bidder sources', function () {
-      stubGetSourceBidderMap.returns({[s2sTesting.CLIENT]: ['appnexus', 'adequant'], [s2sTesting.SERVER]: []});
-      var adUnits = getTestAdUnits();
-      adUnits[0].bids[0].finalSource = s2sTesting.CLIENT;
-      adUnits[0].bids[1].finalSource = s2sTesting.CLIENT;
-      adUnits[1].bids[0].finalSource = s2sTesting.SERVER;
-      adUnits[1].bids[1].finalSource = s2sTesting.SERVER;
-      callBids(adUnits);
+    it('does not call client adapters for bidders in either config when testServerOnly if true in second config', function () {
+      let TEST_CONFIG = utils.deepClone(CONFIG);
+      Object.assign(TEST_CONFIG, {
+        bidders: ['appnexus', 'adequant'],
+        bidderControl: {
+          appnexus: {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+          adequant: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          },
+        },
+        testing: true,
+      });
+
+      let TEST_CONFIG2 = utils.deepClone(CONFIG2);
+      Object.assign(TEST_CONFIG2, {
+        bidders: ['pubmatic'],
+        testServerOnly: true,
+        bidderControl: {
+          pubmatic: {
+            bidSource: { server: 100, client: 0 },
+            includeSourceKvp: true,
+          }
+        },
+        testing: true
+      });
+
+      config.setConfig({s2sConfig: [TEST_CONFIG, TEST_CONFIG2]});
+      callBids();
 
       // server adapter
-      checkServerCalled(1, 2);
+      checkServerCalled(2, 1, 1);
 
       // appnexus
-      checkClientCalled(appnexusAdapterMock, 1);
+      sinon.assert.notCalled(appnexusAdapterMock.callBids);
 
       // adequant
-      checkClientCalled(adequantAdapterMock, 1);
+      sinon.assert.notCalled(adequantAdapterMock.callBids);
+
+      // pubmatic
+      sinon.assert.notCalled(pubmaticAdapterMock.callBids);
+
+      // rubicon
+      sinon.assert.notCalled(rubiconAdapterMock.callBids);
     });
   });
 
@@ -988,6 +1578,27 @@ describe('adapterManager tests', function () {
         expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
       });
 
+      it('should allow an alias if alias is part of s2sConfig.bidders for multiple s2sConfigs', function () {
+        let testS2sConfig = utils.deepClone(CONFIG);
+        testS2sConfig.bidders = ['s2sAlias'];
+        config.setConfig({s2sConfig: [
+          testS2sConfig, {
+            enabled: true,
+            endpoint: 'rp-pbs-endpoint-test.com',
+            timeout: 500,
+            maxBids: 1,
+            adapter: 'prebidServer',
+            bidders: ['s2sRpAlias'],
+            accountId: 'def'
+          }
+        ]});
+
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sAlias');
+        adapterManager.aliasBidAdapter('s2sBidder', 's2sRpAlias');
+        expect(adapterManager.aliasRegistry).to.have.property('s2sRpAlias');
+      });
+
       it('should throw an error if alias + bidder are unknown and not part of s2sConfig.bidders', function () {
         let testS2sConfig = utils.deepClone(CONFIG);
         testS2sConfig.bidders = ['s2sAlias'];
@@ -1003,6 +1614,7 @@ describe('adapterManager tests', function () {
   describe('makeBidRequests', function () {
     let adUnits;
     beforeEach(function () {
+      allS2SBidders.length = 0
       adUnits = utils.deepClone(getAdUnits()).map(adUnit => {
         adUnit.bids = adUnit.bids.filter(bid => includes(['appnexus', 'rubicon'], bid.bidder));
         return adUnit;
@@ -1051,6 +1663,8 @@ describe('adapterManager tests', function () {
 
     describe('sizeMapping', function () {
       beforeEach(function () {
+        allS2SBidders.length = 0;
+        clientTestAdapters.length = 0;
         sinon.stub(window, 'matchMedia').callsFake(() => ({matches: true}));
       });
 
@@ -1184,7 +1798,7 @@ describe('adapterManager tests', function () {
           []
         );
 
-          // only valid sizes as specified in size config should show up in bidRequests
+        // only valid sizes as specified in size config should show up in bidRequests
         bidRequests.forEach(bidRequest => {
           bidRequest.bids.forEach(bid => {
             bid.sizes.forEach(size => {
@@ -1287,13 +1901,35 @@ describe('adapterManager tests', function () {
         expect(bidRequests[0].gdprConsent).to.be.undefined;
       });
     });
-
+    describe('coppa consent module', function () {
+      afterEach(() => {
+        config.resetConfig();
+      });
+      it('test coppa configuration with value false', function () {
+        config.setConfig({ coppa: 0 });
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.false;
+      });
+      it('test coppa configuration with value true', function () {
+        config.setConfig({ coppa: 1 });
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.true;
+      });
+      it('test coppa configuration', function () {
+        const coppa = coppaDataHandler.getCoppa();
+        expect(coppa).to.be.false;
+      });
+    });
     describe('s2sTesting - testServerOnly', () => {
       beforeEach(() => {
         config.setConfig({ s2sConfig: getServerTestingConfig(CONFIG) });
+        allS2SBidders.length = 0
+        s2sTesting.bidSource = {};
       });
 
-      afterEach(() => config.resetConfig());
+      afterEach(() => {
+        config.resetConfig();
+      });
 
       const makeBidRequests = ads => {
         let bidRequests = adapterManager.makeBidRequests(
@@ -1410,5 +2046,192 @@ describe('adapterManager tests', function () {
         }
       );
     });
+
+    describe('Multiple s2sTesting - testServerOnly', () => {
+      beforeEach(() => {
+        config.setConfig({s2sConfig: [getServerTestingConfig(CONFIG), CONFIG2]});
+      });
+
+      afterEach(() => {
+        config.resetConfig()
+        allS2SBidders.length = 0;
+        s2sTesting.bidSource = {};
+      });
+
+      const makeBidRequests = ads => {
+        let bidRequests = adapterManager.makeBidRequests(
+          ads, 1111, 2222, 1000
+        );
+
+        bidRequests.sort((a, b) => {
+          if (a.bidderCode < b.bidderCode) return -1;
+          if (a.bidderCode > b.bidderCode) return 1;
+          return 0;
+        });
+
+        return bidRequests;
+      };
+
+      const removeAdUnitsBidSource = adUnits => adUnits.map(adUnit => {
+        const newAdUnit = { ...adUnit };
+        newAdUnit.bids = newAdUnit.bids.map(bid => {
+          if (bid.bidSource) delete bid.bidSource;
+          return bid;
+        });
+        return newAdUnit;
+      });
+
+      it('suppresses all client bids if there are server bids resulting from bidSource at the adUnit Level', () => {
+        let ads = getServerTestingsAds();
+        ads.push({
+          code: 'test_div_5',
+          sizes: [[300, 250]],
+          bids: [{ bidder: 'pubmatic' }]
+        })
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('openx');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      it('should not surpress client side bids if testServerOnly is true in one config, ' +
+      ',bidderControl resolves to server in another config' +
+      'and there are no bid with bidSource at the adUnit Level', () => {
+        let testConfig1 = utils.deepClone(getServerTestingConfig(CONFIG));
+        let testConfig2 = utils.deepClone(CONFIG2);
+        testConfig1.testServerOnly = false;
+        testConfig2.testServerOnly = true;
+        testConfig2.testing = true;
+        testConfig2.bidderControl = {
+          'pubmatic': {
+            bidSource: { server: 0, client: 100 },
+            includeSourceKvp: true,
+          },
+        };
+        config.setConfig({s2sConfig: [testConfig1, testConfig2]});
+
+        let ads = [
+          {
+            code: 'test_div_1',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'adequant' }]
+          },
+          {
+            code: 'test_div_2',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'openx' }]
+          },
+          {
+            code: 'test_div_3',
+            sizes: [[300, 250]],
+            bids: [{ bidder: 'pubmatic' }]
+          },
+        ];
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('pubmatic');
+        expect(bidRequests[2].bids[0].finalSource).equals('client');
+      });
+
+      // todo: update description
+      it('suppresses all, and only, client bids if there are bids resulting from bidSource at the adUnit Level', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be server based
+        ads[1].bids[1].bidSource.client = 0;
+        ads[1].bids[1].bidSource.server = 100;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(3);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[1].bids).lengthOf(1);
+        expect(bidRequests[1].bids[0].bidder).equals('openx');
+        expect(bidRequests[1].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+      });
+
+      // we have a server call now
+      it('does not suppress client bids if no "test case" bids result in a server bid', () => {
+        const ads = getServerTestingsAds();
+
+        // change this adUnit to be client based
+        ads[0].bids[0].bidSource.client = 100;
+        ads[0].bids[0].bidSource.server = 0;
+
+        const bidRequests = makeBidRequests(ads);
+
+        expect(bidRequests).lengthOf(4);
+
+        expect(bidRequests[0].bids).lengthOf(1);
+        expect(bidRequests[0].bids[0].bidder).equals('adequant');
+        expect(bidRequests[0].bids[0].finalSource).equals('client');
+
+        expect(bidRequests[1].bids).lengthOf(2);
+        expect(bidRequests[1].bids[0].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[0].finalSource).equals('client');
+        expect(bidRequests[1].bids[1].bidder).equals('appnexus');
+        expect(bidRequests[1].bids[1].finalSource).equals('client');
+
+        expect(bidRequests[2].bids).lengthOf(1);
+        expect(bidRequests[2].bids[0].bidder).equals('openx');
+        expect(bidRequests[2].bids[0].finalSource).equals('server');
+
+        expect(bidRequests[3].bids).lengthOf(2);
+        expect(bidRequests[3].bids[0].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[0].finalSource).equals('client');
+        expect(bidRequests[3].bids[1].bidder).equals('rubicon');
+        expect(bidRequests[3].bids[1].finalSource).equals('client');
+      });
+
+      it(
+        'should surpress client side bids if no ad unit bidSources are set, ' +
+        'but bidderControl resolves to server',
+        () => {
+          const ads = removeAdUnitsBidSource(getServerTestingsAds());
+
+          const bidRequests = makeBidRequests(ads);
+
+          expect(bidRequests).lengthOf(2);
+
+          expect(bidRequests[0].bids).lengthOf(1);
+          expect(bidRequests[0].bids[0].bidder).equals('openx');
+          expect(bidRequests[0].bids[0].finalSource).equals('server');
+
+          expect(bidRequests[1].bids).lengthOf(2);
+          expect(bidRequests[1].bids[0].bidder).equals('rubicon');
+          expect(bidRequests[1].bids[0].finalSource).equals('server');
+        }
+      );
+    });
   });
 });
diff --git a/test/spec/unit/core/bidderFactory_spec.js b/test/spec/unit/core/bidderFactory_spec.js
index cab0655a29d..a7e8a0d7871 100644
--- a/test/spec/unit/core/bidderFactory_spec.js
+++ b/test/spec/unit/core/bidderFactory_spec.js
@@ -401,8 +401,12 @@ describe('bidders created by newBidder', function () {
         adUnitCode: 'mock/placement',
         currency: 'USD',
         netRevenue: true,
-        ttl: 300
+        ttl: 300,
+        bidderCode: 'sampleBidder',
+        sampleBidder: {advertiserId: '12345', networkId: '111222'}
       };
+      const bidderRequest = Object.assign({}, MOCK_BIDS_REQUEST);
+      bidderRequest.bids[0].bidder = 'sampleBidder';
       spec.isBidRequestValid.returns(true);
       spec.buildRequests.returns({
         method: 'POST',
@@ -413,7 +417,7 @@ describe('bidders created by newBidder', function () {
 
       spec.interpretResponse.returns(bid);
 
-      bidder.callBids(MOCK_BIDS_REQUEST, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
+      bidder.callBids(bidderRequest, addBidResponseStub, doneStub, ajaxStub, onTimelyResponseStub, wrappedCallback);
 
       expect(addBidResponseStub.calledOnce).to.equal(true);
       expect(addBidResponseStub.firstCall.args[0]).to.equal('mock/placement');
@@ -423,6 +427,8 @@ describe('bidders created by newBidder', function () {
       expect(bidObject.originalCurrency).to.equal(bid.currency);
       expect(doneStub.calledOnce).to.equal(true);
       expect(logErrorSpy.callCount).to.equal(0);
+      expect(bidObject.meta).to.exist;
+      expect(bidObject.meta).to.deep.equal({advertiserId: '12345', networkId: '111222'});
     });
 
     it('should call spec.getUserSyncs() with the response', function () {
@@ -645,6 +651,50 @@ describe('registerBidder', function () {
     expect(registerBidAdapterStub.secondCall.args[1]).to.equal('foo')
     expect(registerBidAdapterStub.thirdCall.args[1]).to.equal('bar')
   });
+
+  it('should register alias with their gvlid', function() {
+    const aliases = [
+      {
+        code: 'foo',
+        gvlid: 1
+      },
+      {
+        code: 'bar',
+        gvlid: 2
+      },
+      {
+        code: 'baz'
+      }
+    ]
+    const thisSpec = Object.assign(newEmptySpec(), { aliases: aliases });
+    registerBidder(thisSpec);
+
+    expect(registerBidAdapterStub.getCall(1).args[0].getSpec().gvlid).to.equal(1);
+    expect(registerBidAdapterStub.getCall(2).args[0].getSpec().gvlid).to.equal(2);
+    expect(registerBidAdapterStub.getCall(3).args[0].getSpec().gvlid).to.equal(undefined);
+  })
+
+  it('should register alias with skipPbsAliasing', function() {
+    const aliases = [
+      {
+        code: 'foo',
+        skipPbsAliasing: true
+      },
+      {
+        code: 'bar',
+        skipPbsAliasing: false
+      },
+      {
+        code: 'baz'
+      }
+    ]
+    const thisSpec = Object.assign(newEmptySpec(), { aliases: aliases });
+    registerBidder(thisSpec);
+
+    expect(registerBidAdapterStub.getCall(1).args[0].getSpec().skipPbsAliasing).to.equal(true);
+    expect(registerBidAdapterStub.getCall(2).args[0].getSpec().skipPbsAliasing).to.equal(false);
+    expect(registerBidAdapterStub.getCall(3).args[0].getSpec().skipPbsAliasing).to.equal(undefined);
+  })
 })
 
 describe('validate bid response: ', function () {
diff --git a/test/spec/unit/core/storageManager_spec.js b/test/spec/unit/core/storageManager_spec.js
index 0b406242f90..5bb766217f5 100644
--- a/test/spec/unit/core/storageManager_spec.js
+++ b/test/spec/unit/core/storageManager_spec.js
@@ -42,5 +42,57 @@ describe('storage manager', function() {
     storage.setCookie('foo1', 'baz1');
     expect(deviceAccessSpy.calledOnce).to.equal(true);
     deviceAccessSpy.restore();
+  });
+
+  describe('localstorage forbidden access in 3rd-party context', function() {
+    let errorLogSpy;
+    let originalLocalStorage;
+    const localStorageMock = { get: () => { throw Error } };
+
+    beforeEach(function() {
+      originalLocalStorage = window.localStorage;
+      Object.defineProperty(window, 'localStorage', localStorageMock);
+      errorLogSpy = sinon.spy(utils, 'logError');
+    });
+
+    afterEach(function() {
+      Object.defineProperty(window, 'localStorage', { get: () => originalLocalStorage });
+      errorLogSpy.restore();
+    })
+
+    it('should not throw if the localstorage is not accessible when setting/getting/removing from localstorage', function() {
+      const coreStorage = getStorageManager();
+
+      coreStorage.setDataInLocalStorage('key', 'value');
+      const val = coreStorage.getDataFromLocalStorage('key');
+      coreStorage.removeDataFromLocalStorage('key');
+
+      expect(val).to.be.null;
+      sinon.assert.calledThrice(errorLogSpy);
+    })
   })
+
+  describe('localstorage is enabled', function() {
+    let localStorage;
+
+    beforeEach(function() {
+      localStorage = window.localStorage;
+      localStorage.clear();
+    });
+
+    afterEach(function() {
+      localStorage.clear();
+    })
+
+    it('should remove side-effect after checking', function () {
+      const storage = getStorageManager();
+
+      localStorage.setItem('unrelated', 'dummy');
+      const val = storage.localStorageIsEnabled();
+
+      expect(val).to.be.true;
+      expect(localStorage.length).to.be.eq(1);
+      expect(localStorage.getItem('unrelated')).to.be.eq('dummy');
+    });
+  });
 });
diff --git a/test/spec/unit/core/targeting_spec.js b/test/spec/unit/core/targeting_spec.js
index 4640e97ab4d..c112c29bae1 100644
--- a/test/spec/unit/core/targeting_spec.js
+++ b/test/spec/unit/core/targeting_spec.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { targeting as targetingInstance, filters, sortByDealAndPriceBucketOrCpm } from 'src/targeting.js';
+import { targeting as targetingInstance, filters, getHighestCpmBidsFromBidPool, sortByDealAndPriceBucketOrCpm } from 'src/targeting.js';
 import { config } from 'src/config.js';
 import { getAdUnits, createBidReceived } from 'test/fixtures/fixtures.js';
 import CONSTANTS from 'src/constants.json';
@@ -338,11 +338,44 @@ describe('targeting tests', function () {
         bid4 = utils.deepClone(bid1);
         bid4.adserverTargeting['hb_bidder'] = bid4.bidder = bid4.bidderCode = 'appnexus';
         bid4.cpm = 2.25;
+        bid4.adId = '8383838';
         enableSendAllBids = true;
 
         bidsReceived.push(bid4);
       });
 
+      it('when sendBidsControl.bidLimit is set greater than 0 in getHighestCpmBidsFromBidPool', function () {
+        config.setConfig({
+          sendBidsControl: {
+            bidLimit: 2,
+            dealPrioritization: true
+          }
+        });
+
+        const bids = getHighestCpmBidsFromBidPool(bidsReceived, utils.getHighestCpm, 2);
+
+        expect(bids.length).to.equal(3);
+        expect(bids[0].adId).to.equal('8383838');
+        expect(bids[1].adId).to.equal('148018fe5e');
+        expect(bids[2].adId).to.equal('48747745');
+      });
+
+      it('when sendBidsControl.bidLimit is set greater than 0 and deal priortization is false in getHighestCpmBidsFromBidPool', function () {
+        config.setConfig({
+          sendBidsControl: {
+            bidLimit: 2,
+            dealPrioritization: false
+          }
+        });
+
+        const bids = getHighestCpmBidsFromBidPool(bidsReceived, utils.getHighestCpm, 2);
+
+        expect(bids.length).to.equal(3);
+        expect(bids[0].adId).to.equal('8383838');
+        expect(bids[1].adId).to.equal('148018fe5e');
+        expect(bids[2].adId).to.equal('48747745');
+      });
+
       it('selects the top n number of bids when enableSendAllBids is true and and bitLimit is set', function () {
         config.setConfig({
           sendBidsControl: {
@@ -369,7 +402,7 @@ describe('targeting tests', function () {
         expect(limitedBids.length).to.equal(2);
       });
 
-      it('Sends all bids when enableSendAllBids is true and and bitLimit is set to 0', function () {
+      it('Sends all bids when enableSendAllBids is true and and bidLimit is set to 0', function () {
         config.setConfig({
           sendBidsControl: {
             bidLimit: 0
@@ -383,6 +416,89 @@ describe('targeting tests', function () {
       });
     });
 
+    describe('targetingControls.allowTargetingKeys', function () {
+      let bid4;
+
+      beforeEach(function() {
+        bid4 = utils.deepClone(bid1);
+        bid4.adserverTargeting = {
+          hb_deal: '4321',
+          hb_pb: '0.1',
+          hb_adid: '567891011',
+          hb_bidder: 'appnexus',
+        };
+        bid4.bidder = bid4.bidderCode = 'appnexus';
+        bid4.cpm = 0.1; // losing bid so not included if enableSendAllBids === false
+        bid4.dealId = '4321';
+        enableSendAllBids = true;
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET']
+          }
+        });
+        bidsReceived.push(bid4);
+      });
+
+      it('targeting should include custom keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('foobar');
+      });
+
+      it('targeting should include keys prefixed by allowed default targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder_rubicon', 'hb_adid_rubicon', 'hb_pb_rubicon');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder_appnexus', 'hb_adid_appnexus', 'hb_pb_appnexus');
+      });
+
+      it('targeting should not include keys prefixed by disallowed default targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.not.have.all.keys(['hb_deal_appnexus', 'hb_deal_rubicon']);
+      });
+    });
+
+    describe('targetingControls.allowSendAllBidsTargetingKeys', function () {
+      let bid4;
+
+      beforeEach(function() {
+        bid4 = utils.deepClone(bid1);
+        bid4.adserverTargeting = {
+          hb_deal: '4321',
+          hb_pb: '0.1',
+          hb_adid: '567891011',
+          hb_bidder: 'appnexus',
+        };
+        bid4.bidder = bid4.bidderCode = 'appnexus';
+        bid4.cpm = 0.1; // losing bid so not included if enableSendAllBids === false
+        bid4.dealId = '4321';
+        enableSendAllBids = true;
+        config.setConfig({
+          targetingControls: {
+            allowTargetingKeys: ['BIDDER', 'AD_ID', 'PRICE_BUCKET'],
+            allowSendAllBidsTargetingKeys: ['PRICE_BUCKET', 'AD_ID']
+          }
+        });
+        bidsReceived.push(bid4);
+      });
+
+      it('targeting should include custom keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('foobar');
+      });
+
+      it('targeting should only include keys prefixed by allowed default send all bids targeting keys and standard keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder', 'hb_adid', 'hb_pb');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_adid_rubicon', 'hb_pb_rubicon');
+        expect(targeting['/123456/header-bid-tag-0']).to.include.all.keys('hb_bidder', 'hb_adid', 'hb_pb', 'hb_adid_appnexus', 'hb_pb_appnexus');
+      });
+
+      it('targeting should not include keys prefixed by disallowed default targeting keys and disallowed send all bid targeting keys', function () {
+        const targeting = targetingInstance.getAllTargeting(['/123456/header-bid-tag-0']);
+        expect(targeting['/123456/header-bid-tag-0']).to.not.have.all.keys(['hb_deal', 'hb_bidder_rubicon', 'hb_bidder_appnexus', 'hb_deal_appnexus', 'hb_deal_rubicon']);
+      });
+    });
+
     describe('targetingControls.alwaysIncludeDeals', function () {
       let bid4;
 
@@ -690,171 +806,171 @@ describe('targeting tests', function () {
   describe('sortByDealAndPriceBucketOrCpm', function() {
     it('will properly sort bids when some bids have deals and some do not', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '20.00',
           hb_deal: '4532'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '9.00',
           hb_deal: '9864'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '50.00',
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00',
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('mno');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('mno');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when all bids have deals', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
           hb_deal: '4321'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '2.50',
           hb_deal: '4532'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '2.00',
           hb_deal: '9864'
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when no bids have deals', function () {
       let bids = [{
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.10'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '10.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '10.01'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '1.00'
         }
       }, {
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00'
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm());
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('mno');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('def');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('mno');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('def');
     });
 
     it('will properly sort bids when some bids have deals and some do not and by cpm when flag is set to true', function () {
       let bids = [{
         cpm: 1.04,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'abc',
           hb_pb: '1.00',
           hb_deal: '1234'
         }
       }, {
         cpm: 0.50,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'def',
           hb_pb: '0.50',
           hb_deal: '4532'
         }
       }, {
         cpm: 0.53,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'ghi',
           hb_pb: '0.50',
           hb_deal: '4532'
         }
       }, {
         cpm: 9.04,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'jkl',
           hb_pb: '9.00',
           hb_deal: '9864'
         }
       }, {
         cpm: 50.00,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'mno',
           hb_pb: '50.00',
         }
       }, {
         cpm: 100.00,
-        adUnitTargeting: {
+        adserverTargeting: {
           hb_adid: 'pqr',
           hb_pb: '100.00',
         }
       }];
       bids.sort(sortByDealAndPriceBucketOrCpm(true));
-      expect(bids[0].adUnitTargeting.hb_adid).to.equal('jkl');
-      expect(bids[1].adUnitTargeting.hb_adid).to.equal('abc');
-      expect(bids[2].adUnitTargeting.hb_adid).to.equal('ghi');
-      expect(bids[3].adUnitTargeting.hb_adid).to.equal('def');
-      expect(bids[4].adUnitTargeting.hb_adid).to.equal('pqr');
-      expect(bids[5].adUnitTargeting.hb_adid).to.equal('mno');
+      expect(bids[0].adserverTargeting.hb_adid).to.equal('jkl');
+      expect(bids[1].adserverTargeting.hb_adid).to.equal('abc');
+      expect(bids[2].adserverTargeting.hb_adid).to.equal('ghi');
+      expect(bids[3].adserverTargeting.hb_adid).to.equal('def');
+      expect(bids[4].adserverTargeting.hb_adid).to.equal('pqr');
+      expect(bids[5].adserverTargeting.hb_adid).to.equal('mno');
     });
   });
 
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index 8a142d7a6aa..0bd3380f737 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -199,6 +199,10 @@ describe('Unit: Prebid Module', function () {
     configObj.setConfig({ useBidCache: false });
   });
 
+  after(function() {
+    auctionManager.clearAllAuctions();
+  });
+
   describe('getAdserverTargetingForAdUnitCodeStr', function () {
     beforeEach(function () {
       resetAuction();
@@ -1062,6 +1066,8 @@ describe('Unit: Prebid Module', function () {
     var adResponse = {};
     var spyLogError = null;
     var spyLogMessage = null;
+    var spyLogWarn = null;
+    var spyAddWinningBid;
     var inIframe = true;
     var triggerPixelStub;
 
@@ -1100,6 +1106,8 @@ describe('Unit: Prebid Module', function () {
 
       spyLogError = sinon.spy(utils, 'logError');
       spyLogMessage = sinon.spy(utils, 'logMessage');
+      spyLogWarn = sinon.spy(utils, 'logWarn');
+      spyAddWinningBid = sinon.spy(auctionManager, 'addWinningBid');
 
       inIframe = true;
       sinon.stub(utils, 'inIframe').callsFake(() => inIframe);
@@ -1110,8 +1118,10 @@ describe('Unit: Prebid Module', function () {
       auction.getBidsReceived = getBidResponses;
       utils.logError.restore();
       utils.logMessage.restore();
+      utils.logWarn.restore();
       utils.inIframe.restore();
       triggerPixelStub.restore();
+      spyAddWinningBid.restore();
     });
 
     it('should require doc and id params', function () {
@@ -1197,6 +1207,14 @@ describe('Unit: Prebid Module', function () {
       assert.deepEqual($$PREBID_GLOBAL$$.getAllWinningBids()[0], adResponse);
     });
 
+    it('should replace ${CLICKTHROUGH} macro in winning bids response', function () {
+      pushBidResponseToAuction({
+        ad: ""
+      });
+      $$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 () {
       const burl = 'http://www.example.com/burl';
       pushBidResponseToAuction({
@@ -1210,6 +1228,117 @@ describe('Unit: Prebid Module', function () {
       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);
+
+      sinon.assert.calledOnce(spyAddWinningBid);
+      sinon.assert.calledWith(spyAddWinningBid, adResponse);
+    });
+
+    it('should warn stale rendering', function () {
+      var message = 'Calling renderAd with adId :' + bidId;
+      var warning = `Ad id ${bidId} has been rendered before`;
+      var onWonEvent = sinon.stub();
+      var onStaleEvent = sinon.stub();
+
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.EVENTS.BID_WON, onWonEvent);
+      $$PREBID_GLOBAL$$.onEvent(CONSTANTS.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);
+    });
+
+    it('should stop stale rendering', function () {
+      var message = 'Calling renderAd with adId :' + bidId;
+      var warning = `Ad id ${bidId} has been rendered before`;
+      var onWonEvent = sinon.stub();
+      var onStaleEvent = sinon.stub();
+
+      // 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);
+
+      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);
+      expect(adResponse).to.have.property('status', CONSTANTS.BID_STATUS.RENDERED);
+
+      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();
+
+      // 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);
+
+      sinon.assert.notCalled(spyAddWinningBid);
+
+      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': {}});
+    });
   });
 
   describe('requestBids', function () {
@@ -1765,13 +1894,37 @@ describe('Unit: Prebid Module', function () {
             expect(auctionArgs.adUnits[0].mediaTypes.native.icon).to.exist;
             assert.ok(logErrorSpy.calledWith('Please use an array of sizes for native.icon.sizes field.  Removing invalid mediaTypes.native.icon.sizes property from request.'));
           });
+
+          it('should throw error message and remove adUnit if adUnit.bids is not defined correctly', function () {
+            const adUnits = [{
+              code: 'ad-unit-1',
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 400]
+                }
+              },
+              bids: [{code: 'appnexus', params: 1234}]
+            }, {
+              code: 'bad-ad-unit-2',
+              mediaTypes: {
+                banner: {
+                  sizes: [300, 400]
+                }
+              }
+            }];
+
+            $$PREBID_GLOBAL$$.requestBids({
+              adUnits: adUnits
+            });
+            expect(auctionArgs.adUnits.length).to.equal(1);
+            expect(auctionArgs.adUnits[1]).to.not.exist;
+            assert.ok(logErrorSpy.calledWith("Detected adUnit.code 'bad-ad-unit-2' did not have 'adUnit.bids' defined or 'adUnit.bids' is not an array. Removing adUnit from auction."));
+          });
         });
       });
     });
 
     describe('multiformat requests', function () {
-      let spyCallBids;
-      let createAuctionStub;
       let adUnits;
 
       beforeEach(function () {
@@ -1791,14 +1944,10 @@ describe('Unit: Prebid Module', function () {
         }];
         adUnitCodes = ['adUnit-code'];
         configObj.setConfig({maxRequestsPerOrigin: Number.MAX_SAFE_INTEGER || 99999999});
-        let auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: timeout});
-        spyCallBids = sinon.spy(adapterManager, 'callBids');
-        createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-        createAuctionStub.returns(auction);
+        sinon.spy(adapterManager, 'callBids');
       })
 
       afterEach(function () {
-        auctionModule.newAuction.restore();
         adapterManager.callBids.restore();
       });
 
@@ -1821,7 +1970,6 @@ describe('Unit: Prebid Module', function () {
 
         const spyArgs = adapterManager.callBids.getCall(0);
         const biddersCalled = spyArgs.args[0][0].bids;
-
         // only appnexus supports native
         expect(biddersCalled.length).to.equal(1);
       });
@@ -2548,6 +2696,58 @@ describe('Unit: Prebid Module', function () {
     });
   });
 
+  describe('getHighestUnusedBidResponseForAdUnitCode', () => {
+    afterEach(() => {
+      resetAuction();
+    })
+
+    it('returns an empty object if there is no bid for the given adUnitCode', () => {
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('stallone');
+      expect(highestBid).to.deep.equal({});
+    })
+
+    it('returns undefined if adUnitCode is provided', () => {
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode();
+      expect(highestBid).to.be.undefined;
+    })
+
+    it('should ignore bids that have already been used (\'rendered\')', () => {
+      const _bidsReceived = getBidResponses().slice(0, 3);
+      _bidsReceived[0].cpm = 11
+      _bidsReceived[1].cpm = 13
+      _bidsReceived[2].cpm = 12
+
+      _bidsReceived.forEach((bid) => {
+        bid.adUnitCode = '/19968336/header-bid-tag-0';
+      });
+
+      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
+      const highestBid2 = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
+      expect(highestBid2).to.deep.equal(_bidsReceived[2])
+    })
+
+    it('should ignore expired bids', () => {
+      const _bidsReceived = getBidResponses().slice(0, 3);
+      _bidsReceived[0].cpm = 11
+      _bidsReceived[1].cpm = 13
+      _bidsReceived[2].cpm = 12
+
+      _bidsReceived.forEach((bid) => {
+        bid.adUnitCode = '/19968336/header-bid-tag-0';
+      });
+
+      auction.getBidsReceived = function() { return _bidsReceived };
+
+      bidExpiryStub.restore();
+      bidExpiryStub = sinon.stub(filters, 'isBidNotExpired').callsFake((bid) => bid.cpm !== 13);
+      const highestBid = $$PREBID_GLOBAL$$.getHighestUnusedBidResponseForAdUnitCode('/19968336/header-bid-tag-0');
+      expect(highestBid).to.deep.equal(_bidsReceived[2])
+    })
+  })
+
   describe('getHighestCpm', () => {
     after(() => {
       resetAuction();
diff --git a/test/spec/unit/secureCreatives_spec.js b/test/spec/unit/secureCreatives_spec.js
index 566154f0003..eca00e8c8fa 100644
--- a/test/spec/unit/secureCreatives_spec.js
+++ b/test/spec/unit/secureCreatives_spec.js
@@ -1,8 +1,18 @@
 import {
-  _sendAdToCreative
-} from '../../../src/secureCreatives.js';
-import { expect } from 'chai';
+  _sendAdToCreative, receiveMessage
+} 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';
+import * as auctionModule from 'src/auction.js';
+import * as native from 'src/native.js';
+import {fireNativeTrackers, getAllAssetsMessage} from 'src/native.js';
+import events from 'src/events.js';
+import { config as configObj } from 'src/config.js';
+
+import { expect } from 'chai';
+
+var CONSTANTS = require('src/constants.json');
 
 describe('secureCreatives', () => {
   describe('_sendAdToCreative', () => {
@@ -42,4 +52,319 @@ describe('secureCreatives', () => {
       window.apntag = oldapntag;
     });
   });
+
+  describe('receiveMessage', function() {
+    const bidId = 1;
+    const warning = `Ad id ${bidId} has been rendered before`;
+    let auction;
+    let adResponse = {};
+    let spyAddWinningBid;
+    let spyLogWarn;
+    let stubFireNativeTrackers;
+    let stubGetAllAssetsMessage;
+    let stubEmit;
+
+    function pushBidResponseToAuction(obj) {
+      adResponse = Object.assign({
+        auctionId: 1,
+        adId: bidId,
+        width: 300,
+        height: 250,
+        renderer: null
+      }, obj);
+      auction.getBidsReceived = function() {
+        let bidsReceived = getBidResponses();
+        bidsReceived.push(adResponse);
+        return bidsReceived;
+      }
+      auction.getAuctionId = () => 1;
+    }
+
+    function resetAuction() {
+      $$PREBID_GLOBAL$$.setConfig({ enableSendAllBids: false });
+      auction.getBidRequests = getBidRequests;
+      auction.getBidsReceived = getBidResponses;
+      auction.getAdUnits = getAdUnits;
+      auction.getAuctionStatus = function() { return auctionModule.AUCTION_COMPLETED }
+    }
+
+    function resetHistories(...others) {
+      [
+        spyAddWinningBid,
+        spyLogWarn,
+        stubFireNativeTrackers,
+        stubGetAllAssetsMessage,
+        stubEmit
+      ].forEach(s => s.resetHistory());
+
+      if (others && others.length > 0) { others.forEach(s => s.resetHistory()); }
+    }
+
+    before(function() {
+      const adUnits = getAdUnits();
+      const adUnitCodes = getAdUnits().map(unit => unit.code);
+      const bidsBackHandler = function() {};
+      const timeout = 2000;
+      auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout: timeout});
+      resetAuction();
+    });
+
+    after(function() {
+      auctionManager.clearAllAuctions();
+    });
+
+    beforeEach(function() {
+      spyAddWinningBid = sinon.spy(auctionManager, 'addWinningBid');
+      spyLogWarn = sinon.spy(utils, 'logWarn');
+      stubFireNativeTrackers = sinon.stub(native, 'fireNativeTrackers');
+      stubGetAllAssetsMessage = sinon.stub(native, 'getAllAssetsMessage');
+      stubEmit = sinon.stub(events, 'emit');
+    });
+
+    afterEach(function() {
+      spyAddWinningBid.restore();
+      spyLogWarn.restore();
+      stubFireNativeTrackers.restore();
+      stubGetAllAssetsMessage.restore();
+      stubEmit.restore();
+      resetAuction();
+    });
+
+    describe('Prebid Request', function() {
+      it('should render', function () {
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = {
+          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);
+      });
+
+      it('should allow stale rendering without config', function () {
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = {
+          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);
+      });
+
+      it('should stop stale rendering with config', function () {
+        configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
+
+        pushBidResponseToAuction({
+          renderer: {render: sinon.stub(), url: 'some url'}
+        });
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Request'
+        };
+
+        const ev = {
+          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': {}});
+      });
+    });
+
+    describe('Prebid Native', function() {
+      it('Prebid native should render', function () {
+        pushBidResponseToAuction({});
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Native',
+          action: 'allAssetRequest'
+        };
+
+        const ev = {
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          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.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubFireNativeTrackers, data, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+      });
+
+      it('Prebid native should allow stale rendering without config', function () {
+        pushBidResponseToAuction({});
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Native',
+          action: 'allAssetRequest'
+        };
+
+        const ev = {
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          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.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubFireNativeTrackers, data, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        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(ev.source.postMessage);
+
+        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.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubFireNativeTrackers, data, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+      });
+
+      it('Prebid native should allow stale rendering with config', function () {
+        configObj.setConfig({'auctionOptions': {'suppressStaleRender': true}});
+
+        pushBidResponseToAuction({});
+
+        const data = {
+          adId: bidId,
+          message: 'Prebid Native',
+          action: 'allAssetRequest'
+        };
+
+        const ev = {
+          data: JSON.stringify(data),
+          source: {
+            postMessage: sinon.stub()
+          },
+          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.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubFireNativeTrackers, data, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        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(ev.source.postMessage);
+
+        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.calledOnce(stubFireNativeTrackers);
+        sinon.assert.calledWith(stubFireNativeTrackers, data, adResponse);
+        sinon.assert.calledOnce(spyAddWinningBid);
+        sinon.assert.calledWith(stubEmit, CONSTANTS.EVENTS.BID_WON, adResponse);
+        sinon.assert.neverCalledWith(stubEmit, CONSTANTS.EVENTS.STALE_RENDER);
+
+        configObj.setConfig({'auctionOptions': {}});
+      });
+    });
+  });
 });
diff --git a/test/spec/userSync_spec.js b/test/spec/userSync_spec.js
index 2b68349ca31..55b613ce929 100644
--- a/test/spec/userSync_spec.js
+++ b/test/spec/userSync_spec.js
@@ -475,6 +475,24 @@ describe('user sync', function () {
           });
           expect(userSync.canBidderRegisterSync('iframe', 'otherTestBidder')).to.equal(false);
         });
+        it('should return false for iframe if there is no iframe filterSettings', function () {
+          const userSync = newUserSync({
+            config: {
+              syncEnabled: true,
+              filterSettings: {
+                image: {
+                  bidders: '*',
+                  filter: 'include'
+                }
+              },
+              syncsPerBidder: 5,
+              syncDelay: 3000,
+              auctionDelay: 0
+            }
+          });
+
+          expect(userSync.canBidderRegisterSync('iframe', 'otherTestBidder')).to.equal(false);
+        });
         it('should return true if filter settings does allow it', function () {
           const userSync = newUserSync({
             config: {
diff --git a/test/spec/utils_spec.js b/test/spec/utils_spec.js
index 4dbb40557af..6494ead78e7 100644
--- a/test/spec/utils_spec.js
+++ b/test/spec/utils_spec.js
@@ -1115,4 +1115,87 @@ describe('Utils', function () {
       });
     });
   });
+
+  describe('deepEqual', function() {
+    it('should return "true" if comparing the same object', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = obj1;
+      expect(utils.deepEqual(obj1, obj2)).to.equal(true);
+    });
+    it('should return "true" if two deeply nested objects are equal', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      expect(utils.deepEqual(obj1, obj2)).to.equal(true);
+    });
+    it('should return "true" if comparting the same primitive values', function() {
+      const primitive1 = 'Prebid.js';
+      const primitive2 = 'Prebid.js';
+      expect(utils.deepEqual(primitive1, primitive2)).to.equal(true);
+    });
+    it('should return "false" if comparing two different primitive values', function() {
+      const primitive1 = 12;
+      const primitive2 = 123;
+      expect(utils.deepEqual(primitive1, primitive2)).to.equal(false);
+    });
+    it('should return "false" if comparing two different deeply nested objects', function() {
+      const obj1 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [1000, 90], [970, 250], [970, 90], [728, 90]] },
+          ],
+        },
+      };
+      const obj2 = {
+        banner: {
+          sizeConfig: [
+            { minViewPort: [0, 0], sizes: [] },
+            { minViewPort: [1000, 0], sizes: [[1000, 300], [728, 90]] },
+          ],
+        },
+      }
+      expect(utils.deepEqual(obj1, obj2)).to.equal(false);
+    });
+
+    describe('cyrb53Hash', function() {
+      it('should return the same hash for the same string', function() {
+        const stringOne = 'string1';
+        expect(utils.cyrb53Hash(stringOne)).to.equal(utils.cyrb53Hash(stringOne));
+      });
+      it('should return a different hash for the same string with different seeds', function() {
+        const stringOne = 'string1';
+        expect(utils.cyrb53Hash(stringOne, 1)).to.not.equal(utils.cyrb53Hash(stringOne, 2));
+      });
+      it('should return a different hash for different strings with the same seed', function() {
+        const stringOne = 'string1';
+        const stringTwo = 'string2';
+        expect(utils.cyrb53Hash(stringOne)).to.not.equal(utils.cyrb53Hash(stringTwo));
+      });
+      it('should return a string value, not a number', function() {
+        const stringOne = 'string1';
+        expect(typeof utils.cyrb53Hash(stringOne)).to.equal('string');
+      });
+    });
+  });
 });
diff --git a/test/spec/videoCache_spec.js b/test/spec/videoCache_spec.js
index 6bb214af8a0..554db3ebe4e 100644
--- a/test/spec/videoCache_spec.js
+++ b/test/spec/videoCache_spec.js
@@ -201,13 +201,15 @@ describe('The video cache', function () {
         ttl: 25,
         customCacheKey: customKey1,
         requestId: '12345abc',
-        bidder: 'appnexus'
+        bidder: 'appnexus',
+        auctionId: '1234-56789-abcde'
       }, {
         vastXml: vastXml2,
         ttl: 25,
         customCacheKey: customKey2,
         requestId: 'cba54321',
-        bidder: 'rubicon'
+        bidder: 'rubicon',
+        auctionId: '1234-56789-abcde'
       }];
 
       store(bids, function () { });
@@ -222,6 +224,7 @@ describe('The video cache', function () {
           ttlseconds: 25,
           key: customKey1,
           bidid: '12345abc',
+          aid: '1234-56789-abcde',
           bidder: 'appnexus'
         }, {
           type: 'xml',
@@ -229,6 +232,7 @@ describe('The video cache', function () {
           ttlseconds: 25,
           key: customKey2,
           bidid: 'cba54321',
+          aid: '1234-56789-abcde',
           bidder: 'rubicon'
         }]
       };
@@ -254,13 +258,15 @@ describe('The video cache', function () {
         ttl: 25,
         customCacheKey: customKey1,
         requestId: '12345abc',
-        bidder: 'appnexus'
+        bidder: 'appnexus',
+        auctionId: '1234-56789-abcde'
       }, {
         vastXml: vastXml2,
         ttl: 25,
         customCacheKey: customKey2,
         requestId: 'cba54321',
-        bidder: 'rubicon'
+        bidder: 'rubicon',
+        auctionId: '1234-56789-abcde'
       }];
 
       store(bids, function () { }, getMockBidRequest());
@@ -276,6 +282,7 @@ describe('The video cache', function () {
           key: customKey1,
           bidid: '12345abc',
           bidder: 'appnexus',
+          aid: '1234-56789-abcde',
           timestamp: 1510852447530
         }, {
           type: 'xml',
@@ -284,6 +291,7 @@ describe('The video cache', function () {
           key: customKey2,
           bidid: 'cba54321',
           bidder: 'rubicon',
+          aid: '1234-56789-abcde',
           timestamp: 1510852447530
         }]
       };
diff --git a/test/spec/video_spec.js b/test/spec/video_spec.js
index 72a585049c3..3ce8ba081da 100644
--- a/test/spec/video_spec.js
+++ b/test/spec/video_spec.js
@@ -71,6 +71,29 @@ describe('video.js', function () {
     expect(valid).to.equal(true);
   });
 
+  it('validates valid outstream bids with a publisher defined renderer', function () {
+    const bid = {
+      requestId: '123abc',
+    };
+    const bidRequests = [{
+      bids: [{
+        bidId: '123abc',
+        bidder: 'appnexus',
+        mediaTypes: {
+          video: {
+            context: 'outstream',
+            renderer: {
+              url: 'render.url',
+              render: () => true,
+            }
+          }
+        }
+      }]
+    }];
+    const valid = isValidVideoBid(bid, bidRequests);
+    expect(valid).to.equal(true);
+  });
+
   it('catches invalid outstream bids', function () {
     const bid = {
       requestId: '123abc'
diff --git a/webpack.conf.js b/webpack.conf.js
index a5c75fa8a1a..6f0841757b0 100644
--- a/webpack.conf.js
+++ b/webpack.conf.js
@@ -13,7 +13,8 @@ var neverBundle = [
 ];
 
 var plugins = [
-  new RequireEnsureWithoutJsonp()
+  new RequireEnsureWithoutJsonp(),
+  new webpack.EnvironmentPlugin(['LiveConnectMode'])
 ];
 
 if (argv.analyze) {