Adding files taken from FWO

Files updated while deploying at FWO. Checking in the changes here.