Skip to content

Conversation

@dependabot
Copy link

@dependabot dependabot bot commented on behalf of github Feb 7, 2023

Bumps boto3 from 1.26.38 to 1.26.65.

Changelog

Sourced from boto3's changelog.

1.26.65

  • api-change:compute-optimizer: [botocore] AWS Compute optimizer can now infer if Kafka is running on an instance.
  • api-change:customer-profiles: [botocore] This release deprecates the PartyType and Gender enum data types from the Profile model and replaces them with new PartyTypeString and GenderString attributes, which accept any string of length up to 255.
  • api-change:frauddetector: [botocore] My AWS Service (Amazon Fraud Detector) - This release introduces Cold Start Model Training which optimizes training for small datasets and adds intelligent methods for treating unlabeled data. You can now train Online Fraud Insights or Transaction Fraud Insights models with minimal historical-data.
  • api-change:mediaconvert: [botocore] The AWS Elemental MediaConvert SDK has added improved scene change detection capabilities and a bandwidth reduction filter, along with video quality enhancements, to the AVC encoder.
  • api-change:outposts: [botocore] Adds OrderType to Order structure. Adds PreviousOrderId and PreviousLineItemId to LineItem structure. Adds new line item status REPLACED. Increases maximum length of pagination token.

1.26.64

  • enhancement:AWSCRT: [botocore] Upgrade awscrt version to 0.16.9
  • api-change:proton: [botocore] Add new GetResourcesSummary API
  • api-change:redshift: [botocore] Corrects descriptions of the parameters for the API operations RestoreFromClusterSnapshot, RestoreTableFromClusterSnapshot, and CreateCluster.

1.26.63

  • api-change:appconfig: [botocore] AWS AppConfig introduces KMS customer-managed key (CMK) encryption of configuration data, along with AWS Secrets Manager as a new configuration data source. S3 objects using SSE-KMS encryption and SSM Parameter Store SecureStrings are also now supported.
  • api-change:connect: [botocore] Enabled FIPS endpoints for GovCloud (US) regions in SDK.
  • api-change:ec2: [botocore] Documentation updates for EC2.
  • api-change:elbv2: [botocore] Update elbv2 client to latest version
  • api-change:keyspaces: [botocore] Enabled FIPS endpoints for GovCloud (US) regions in SDK.
  • api-change:quicksight: [botocore] QuickSight support for Radar Chart and Dashboard Publish Options
  • api-change:redshift: [botocore] Enabled FIPS endpoints for GovCloud (US) regions in SDK.
  • api-change:sso-admin: [botocore] Enabled FIPS endpoints for GovCloud (US) regions in SDK.

1.26.62

  • bugfix:s3: [botocore] boto3 no longer overwrites user supplied Content-Encoding with aws-chunked when user also supplies ChecksumAlgorithm.
  • api-change:devops-guru: [botocore] This release adds filter support ListAnomalyForInsight API.
  • api-change:forecast: [botocore] This release will enable customer select INCREMENTAL as ImportModel in Forecast's CreateDatasetImportJob API. Verified latest SDK containing required attribute, following https://w.amazon.com/bin/view/AWS-Seer/Launch/Trebuchet/
  • api-change:iam: [botocore] Documentation updates for AWS Identity and Access Management (IAM).
  • api-change:mediatailor: [botocore] The AWS Elemental MediaTailor SDK for Channel Assembly has added support for program updates, and the ability to clip the end of VOD sources in programs.
  • api-change:sns: [botocore] Additional attributes added for set-topic-attributes.

1.26.61

  • api-change:accessanalyzer: [botocore] Enabled FIPS endpoints for GovCloud (US) regions in SDK.
  • api-change:appsync: [botocore] This release introduces the feature to support EventBridge as AppSync data source.
  • api-change:cloudtrail-data: [botocore] Add CloudTrail Data Service to enable users to ingest activity events from non-AWS sources into CloudTrail Lake.
  • api-change:cloudtrail: [botocore] Add new "Channel" APIs to enable users to manage channels used for CloudTrail Lake integrations, and "Resource Policy" APIs to enable users to manage the resource-based permissions policy attached to a channel.
  • api-change:codeartifact: [botocore] This release introduces a new DeletePackage API, which enables deletion of a package and all of its versions from a repository.

... (truncated)

Commits
  • ae53d05 Merge branch 'release-1.26.65'
  • 0992e88 Bumping version to 1.26.65
  • 44fce2f Add changelog entries from botocore
  • ea2f6b8 Merge branch 'release-1.26.64'
  • 765c5ff Merge branch 'release-1.26.64' into develop
  • f213e42 Bumping version to 1.26.64
  • c99ebd0 Add changelog entries from botocore
  • 76ae4e2 Merge branch 'release-1.26.63'
  • d3bf09d Merge branch 'release-1.26.63' into develop
  • 1324ede Bumping version to 1.26.63
  • Additional commits viewable in compare view

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

crestdatasystems and others added 30 commits November 11, 2022 13:11
* added a modeling rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule

* added a parsing rule
* Updated Metadata Of Pack Code42

* Added release notes to pack Code42

* Packs/Code42/Integrations/Code42/Code42.yml Docker image update

* Fixed Mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack KeeperSecretsManager

* Added release notes to pack KeeperSecretsManager

* Packs/KeeperSecretsManager/Integrations/KeeperSecretsManager/KeeperSecretsManager.yml Docker image update

* Fixed Mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack OctoxLabs

* Added release notes to pack OctoxLabs

* Packs/OctoxLabs/Integrations/OctoxLabs/OctoxLabs.yml Docker image update

* Fixed Mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack BreachRx

* Added release notes to pack BreachRx

* Packs/BreachRx/Integrations/BreachRx/BreachRx.yml Docker image update

* Fixed Mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack CarbonBlackDefense

* Added release notes to pack CarbonBlackDefense

* Packs/CarbonBlackDefense/Integrations/CarbonBlackLiveResponseCloud/CarbonBlackLiveResponseCloud.yml Docker image update

* Fixed Mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack AccentureCTI_Feed

* Added release notes to pack AccentureCTI_Feed

* Packs/AccentureCTI_Feed/Integrations/ACTIIndicatorFeed/ACTIIndicatorFeed.yml Docker image update

* Updated the docker image to demisto/py3-tools:1.0.0.41100 since the old one it deprecated

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack GoogleChronicleBackstory

* Added release notes to pack GoogleChronicleBackstory

* Packs/GoogleChronicleBackstory/Integrations/GoogleChronicleBackstory/GoogleChronicleBackstory.yml Docker image update

* Updated Metadata Of Pack GoogleDrive

* Added release notes to pack GoogleDrive

* Packs/GoogleDrive/Integrations/GoogleDrive/GoogleDrive.yml Docker image update
* add "event_errormessage" to schema

* create RN

* Update ReleaseNotes

* added ModelingRules test
* Updated Metadata Of Pack CybleThreatIntel

* Added release notes to pack CybleThreatIntel

* Packs/CybleThreatIntel/Integrations/CybleThreatIntel/CybleThreatIntel.yml Docker image update

* Fixed mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack GLPI

* Added release notes to pack GLPI

* Packs/GLPI/Integrations/GLPI/GLPI.yml Docker image update

* Fixed mypy and added missing command to readme

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack AbnormalSecurity

* Added release notes to pack AbnormalSecurity

* Packs/AbnormalSecurity/Integrations/AbnormalSecurity/AbnormalSecurity.yml Docker image update

* Updated Metadata Of Pack AgariPhishingDefense

* Added release notes to pack AgariPhishingDefense

* Packs/AgariPhishingDefense/Integrations/AgariPhishingDefense/AgariPhishingDefense.yml Docker image update

* Updated Metadata Of Pack AppNovi

* Added release notes to pack AppNovi

* Packs/AppNovi/Integrations/appNovi/appNovi.yml Docker image update

* Updated Metadata Of Pack AtlassianConfluenceCloud

* Added release notes to pack AtlassianConfluenceCloud

* Packs/AtlassianConfluenceCloud/Integrations/AtlassianConfluenceCloud/AtlassianConfluenceCloud.yml Docker image update

* Updated Metadata Of Pack Automox

* Added release notes to pack Automox

* Packs/Automox/Integrations/Automox/Automox.yml Docker image update

* Updated Metadata Of Pack AzureStorageContainer

* Added release notes to pack AzureStorageContainer

* Packs/AzureStorageContainer/Integrations/AzureStorageContainer/AzureStorageContainer.yml Docker image update

* Updated Metadata Of Pack AzureStorageFileShare

* Added release notes to pack AzureStorageFileShare

* Packs/AzureStorageFileShare/Integrations/AzureStorageFileShare/AzureStorageFileShare.yml Docker image update

* Updated Metadata Of Pack AzureStorageTable

* Added release notes to pack AzureStorageTable

* Packs/AzureStorageTable/Integrations/AzureStorageTable/AzureStorageTable.yml Docker image update

* Updated Metadata Of Pack Binalyze

* Added release notes to pack Binalyze

* Packs/Binalyze/Integrations/BinalyzeAIR/BinalyzeAIR.yml Docker image update

* Updated Metadata Of Pack BitSight

* Added release notes to pack BitSight

* Packs/BitSight/Integrations/BitSightForSecurityPerformanceManagement/BitSightForSecurityPerformanceManagement.yml Docker image update

* Fixed mypy errors

Co-authored-by: sberman <sberman@paloaltonetworks.com>
Co-authored-by: Shelly Tzohar <45915502+Shellyber@users.noreply.github.com>
* Updated Metadata Of Pack MicrosoftAdvancedThreatAnalytics

* Added release notes to pack MicrosoftAdvancedThreatAnalytics

* Packs/MicrosoftAdvancedThreatAnalytics/Integrations/MicrosoftAdvancedThreatAnalytics/MicrosoftAdvancedThreatAnalytics.yml Docker image update
* Updated Metadata Of Pack Kafka

* Added release notes to pack Kafka

* Packs/Kafka/Integrations/KafkaV3/KafkaV3.yml Docker image update

* Fixed mypy

Co-authored-by: sberman <sberman@paloaltonetworks.com>
* Updated Metadata Of Pack CIRCL

* Added release notes to pack CIRCL

* Packs/CIRCL/Integrations/CIRCL/CIRCL.yml Docker image update
* Updated Metadata Of Pack TeamCymru

* Added release notes to pack TeamCymru

* Packs/TeamCymru/Integrations/TeamCymru/TeamCymru.yml Docker image update

* Fixed mypy error

Co-authored-by: sberman <sberman@paloaltonetworks.com>
Co-authored-by: Shelly Tzohar <45915502+Shellyber@users.noreply.github.com>
* Add labels to output of command jira-issue-query

* format on jiraV2.yml file

* Update version and release notes.

* Add release note.
Bump version.

* remove docker image from release notes.
revert changes to yml file.

* Fix unit tests.
…o#22954)

* bug-MCAS multiple entries with raw-response=true

* DI and RN

* fix test

* RN

* Update 2_1_9.md
AradCarmi and others added 14 commits January 1, 2023 17:25
* deprecated the script

* updated release notes

* updated release notes
* adding new upn param

* UPN param

* commit

* adding upn_mailbox exist case in fetch-incidents

* adding upn param and checking all the rest of the commands

* trailing white space deleted

* removing print

* adding release note

* Empty-Commit

* Empty-Commit

* Empty-Commit

* docker image

* updating release note

* added note to read me and small update

* 3 cr notes was updated

* cr notes

* Empty-Commit

* updating targetbox when upn is set

* updating docker

* updated docker and fixed target mailbox

* new release note

* the command of ews-get-out-of-office workes with upn

* updating after cr

* adding RBAC desc to ews-get-searchable-mailboxes

* cr notes
* yml changed

* yml updated

* yml,py, json files modified

* yml updated

* fetch incidents logic

* fetch incidents logic

* fetch incidents duplicate bug solved

* changed latest fetch time calculation

* Delete classifier-PAN-OS.json

* Delete classifier-mapping-incoming-PAN-OS.json

* added classifier and mapper

* unique entries filter

* duplicate incidents bug fixed

* update pan-os-query-logs with new log-types

* removed duplicate entries handling (bug fixed)

* start implementing multiple incident last fetch

* Updated code to support multiple 'last fetch time'

* added fetch incidents helper functions UT's

* added fetch incidents UT

* fetch incidents Query parameter design changes

* updated log type query parameter logic

* fixed "log_types" instead of "log_type" error

* added fetch incidents UT's

* added fetch incidents UT's

* Updated Panorama_tets.py

* docker image updated

* fixed fetch logic to time filtering within queries

* TestFetchIncidentsHelperFunctions UT's updated

* Fetch incidents added incident filtering logic

* TestFetchIncidentsHelperFunctions UT's fixes

* fixed TestFetchIncidentsFlows UT's

* get_query_entries bug fixed, added to description

* Deleted Log Type Query Values in configuration

* mapper geolocation fix & fetch params Test update

* added unique ID to incident filtration logic

* Update Panorama.yml

Done.

* Update Panorama_description.md

Done.

* CR issues fixes

* TestFetchIncidentsHelperFunctions UT updates

* TestFetchIncidentsFlows UT's updates

* TestFetchIncidentsFlows UT's updated

* CR issues fixes

* validation fixes

* build validation fixes

* build validation fixes

* revision, fetch incidents added to README.md

* Added a script to generate password, set Okta password, and send an email (IAMInitOktaUser) (demisto#22473)

* Added script

* updated docker ver

* Added test playbook, added test to conf.json, added secret to secrets-ignore

* RN + manually generated script README because the SDK doesn't work

* Fixed validation for long lines

* Fixes for Dan the prince

* Fixes for Dan the prince

* Added instance name for EWSO365 in conf.json

* Changed instance of EWSO365 since the credentials for the other one are incorrect. Also updated docker image version.

* Xdr entity mitre fix (demisto#23370)

* Add conditional task "has results?"

* Add conditional task "has results?"

* Fixed search value and ID (demisto#23371)

* Fixed search value and ID

* RN

* Update 1_0_12.md

* reverted version bump

Co-authored-by: Dan Tavori <38749041+dantavori@users.noreply.github.com>

* Msde update classification parameter (demisto#23303)

* add classification parameter

* remove atp and SecurityPersonnel

* update readme

* update release notes

* update docker image

* breaking changes

* Changes related to Cached credentials functionality (demisto#23379)

* Changes related to Cached credentials functionality (demisto#23166)

* Changes related to Cached credentials functionality

* Updated docker version

* resolved validations errors

* Resolve validation error

* Fixed linter errors

* Resolved linter errors

* Resolved Linter error

* updated files to resolve linter errors

* updated version

* Added Release notes

* Updated Release notes

* Resolved comments

* Resolved validation errors

* Resolved linter errors

* Resolved comments on PR

* Updated code.

* Added Linter changes

* Updated code

* Updated validation changes

* Updated docker image tag

* Deleted 'Example-delinea-fetch-credentials.yml' playbook

* Added test cases

* Fixed RN and lint

* Resolved linter error

* Removed linter errors

* Update DelineaSS.yml

* Remove log

* fixing RN

* revert change

* Update pack_metadata.json

* Update DelineaSS.yml

* Update 2_0_0.md

Co-authored-by: vidhi dhand <roshani.tambadkar@c.thycotic.com>
Co-authored-by: Jas Beilin <jgranot@paloaltonetworks.com>
Co-authored-by: Jasmine Beilin <71636766+JasBeilin@users.noreply.github.com>

* Update 2_0_0.md

Co-authored-by: roshani-delinea-github <110827431+roshani-delinea-github@users.noreply.github.com>
Co-authored-by: vidhi dhand <roshani.tambadkar@c.thycotic.com>
Co-authored-by: Jas Beilin <jgranot@paloaltonetworks.com>
Co-authored-by: Jasmine Beilin <71636766+JasBeilin@users.noreply.github.com>

* Added layout

* Updated release notes

* Updated release notes

* Delete Layout Panorama.json

* Updated Panorama Layout

* updated Panorama Layout

* Deleted Panorama_Layout

* Added Panorama fetch incidents test playbook

* Updated fetch incidents test playbook

* Updated release notes with test playbook

* Added fetch incidents test playbook  README

* Update fetch incidents test playbook

* Update fetch incidents test playbook

* Removed fetch test playbook due to a dev bug

* Removed fetch TPB from yml

* Update Packs/PAN-OS/Integrations/Panorama/Panorama.py

Co-authored-by: Guy Afik <53861351+GuyAfik@users.noreply.github.com>

* Apply suggestions from code review

according to CR by Guy Afik

Co-authored-by: Guy Afik <53861351+GuyAfik@users.noreply.github.com>

Co-authored-by: Shmuel Fainberg <sfainberg@paloaltonetworks.com>
Co-authored-by: ShirleyDenkberg <62508050+ShirleyDenkberg@users.noreply.github.com>
Co-authored-by: Ido van Dijk <43602124+idovandijk@users.noreply.github.com>
Co-authored-by: ArikDay <115150768+ArikDay@users.noreply.github.com>
Co-authored-by: TalNos <112805149+TalNos@users.noreply.github.com>
Co-authored-by: Dan Tavori <38749041+dantavori@users.noreply.github.com>
Co-authored-by: sapir shuker <49246861+sapirshuker@users.noreply.github.com>
Co-authored-by: content-bot <55035720+content-bot@users.noreply.github.com>
Co-authored-by: roshani-delinea-github <110827431+roshani-delinea-github@users.noreply.github.com>
Co-authored-by: vidhi dhand <roshani.tambadkar@c.thycotic.com>
Co-authored-by: Jas Beilin <jgranot@paloaltonetworks.com>
Co-authored-by: Jasmine Beilin <71636766+JasBeilin@users.noreply.github.com>
Co-authored-by: Guy Afik <53861351+GuyAfik@users.noreply.github.com>
* Fix line widgets  (demisto#23276)

* fixing widgets

* Update pack_metadata.json

* Revert "Update pack_metadata.json"

This reverts commit 0c1f3fc.

* updating docker images

* updated docker image in RN

* test for uploading the pb

* Update Health_Check_-_Collect_Log_Bundle.yml

revert changes

* updated docker images

* added a comment to add the pb

* removed comment

Co-authored-by: Tsach Zimmer <50796203+tsachzim@users.noreply.github.com>
Co-authored-by: okarkkatz <okarkkatz@paloaltonetworks.com>
Co-authored-by: omerKarkKatz <95565843+omerKarkKatz@users.noreply.github.com>
* New type, layout and fields for the new indicator software type.

* New type, layout and fields for the new indicator software type.

* RN

* Added cpe and swid to known words.

* Changes field names to capital letters.

* Update reputation-Software.json

* Capitalization
* Updated Metadata Of Pack Whois

* Added release notes to pack Whois

* Packs/Whois/Integrations/Whois/Whois.yml Docker image update
* Updated Metadata Of Pack MailListener

* Added release notes to pack MailListener

* Packs/MailListener/Integrations/MailListenerV2/MailListenerV2.yml Docker image update
* in progress

* in progress

* rename files

* fixes

* reverts

* update docker

* update rn

* rn fixes
* Updated Metadata Of Pack APIVoid

* Added release notes to pack APIVoid

* Packs/APIVoid/Integrations/APIVoid/APIVoid.yml Docker image update

* Updated Metadata Of Pack Absolute

* Added release notes to pack Absolute

* Packs/Absolute/Integrations/Absolute/Absolute.yml Docker image update

* Updated Metadata Of Pack F5Silverline

* Added release notes to pack F5Silverline

* Packs/F5Silverline/Integrations/F5Silverline/F5Silverline.yml Docker image update

* Updated Metadata Of Pack FeedAlienVault

* Added release notes to pack FeedAlienVault

* Packs/FeedAlienVault/Integrations/FeedAlienVaultReputation/FeedAlienVaultReputation.yml Docker image update

* Updated Metadata Of Pack FeedBruteForceBlocker

* Added release notes to pack FeedBruteForceBlocker

* Packs/FeedBruteForceBlocker/Integrations/FeedBruteForceBlocker/FeedBruteForceBlocker.yml Docker image update
* added comment switched docker

* rn

* fix comment

* upgrade docker

* update rn
* bug - TIR is not read-only to all after publish

* cr

* validation

* TestPlaybook

* add testplaybook to conf.json

* confjson

* test

* fix conf

* readme
Bumps [boto3](https://github.com/boto/boto3) from 1.26.38 to 1.26.65.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.26.38...1.26.65)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file python Pull requests that update Python code labels Feb 7, 2023
@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Feb 7, 2023

The following labels could not be found: docs-approved.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Feb 7, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

3 similar comments
@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Feb 14, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Feb 14, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Feb 20, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Mar 2, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

2 similar comments
@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Mar 7, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Mar 9, 2023

Dependabot tried to update this pull request, but something went wrong. We're looking into it, but in the meantime you can retry the update by commenting @dependabot rebase.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file python Pull requests that update Python code

Projects

None yet

Development

Successfully merging this pull request may close these issues.