magento · jilu1 · Jul 29, 2020 · Jul 28, 2020 · Jul 28, 2020 · Jul 28, 2020
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -24,8 +24,16 @@ If there is no response from the contributor for two weeks, the issue is closed.
 Often when the MFTF team works on reviewing the suggested changes, we will add a label to the issue to indicate to our internal team certain information, like status or who is working the issue.
 If you’re ever curious what the different labels mean, see the [table][labels] below for an explanation of each one.
 
-Refer to [Magento Contributor Agreement] for detailed information about the License Agreement.
-All contributors are required to submit a click-through form to agree to the terms.
+## Code Of Conduct
+
+This project adheres to the Adobe [Code Of Conduct](../CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. 
+Please report unacceptable behavior to [Grp-opensourceoffice@adobe.com](mailto:Grp-opensourceoffice@adobe.com).
+
+## Contributor License Agreement
+
+All third-party contributions to this project must be accompanied by a signed Contributor License Agreement (CLA).
+This gives Adobe permission to redistribute your contributions as part of the project.
+[Sign our CLA](https://opensource.adobe.com/cla.html). You only need to sign it once.
 
 ## Contribution requirements
 

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Adobe Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language.
+* Being respectful of differing viewpoints and experiences.
+* Gracefully accepting constructive criticism.
+* Focusing on what is best for the community.
+* Showing empathy towards other community members.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances.
+* Trolling, insulting/derogatory comments, and personal or political attacks.
+* Public or private harassment.
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission.
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting.
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at Grp-opensourceoffice@adobe.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [https://contributor-covenant.org/version/1/4][version].
+
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/
diff --git a/README.md b/README.md
@@ -58,23 +58,23 @@ These labels are applied by the MFTF development team to community contributed i
 To report security vulnerabilities and other security issues in the Magento software or web sites, send an email with the report at [security@magento.com][].
 Do not report security issues using GitHub.
 Be sure to encrypt your e-mail with our [encryption key][] if it includes sensitive information.
-Learn more about reporting security issues [here][].
+Learn more about reporting [security][] issues.
 
 Stay up-to-date on the latest security news and patches for Magento by signing up for [Security Alert Notifications][].
 
 ## License
 
 Each Magento source file included in this distribution is licensed under AGPL 3.0.
 
-See the license [here][] or contact [license@magentocommerce.com][] for a copy.
+See the [license][] or contact [license@magentocommerce.com][] for a copy.
 
 <!-- Link Definitions -->
 [Getting Started]: docs/getting-started.md
-[Contribution Guidelines]: https://github.com/magento/magento2-functional-testing-framework/blob/develop/.github/CONTRIBUTING.md
+[Contribution Guidelines]: .github/CONTRIBUTING.md
 [DevDocs Contributing]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
 [security@magento.com]: mailto:security@magento.com
 [encryption key]: https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc
-[here]: https://magento.com/security/reporting-magento-security-issue
+[security]: https://magento.com/security/reporting-magento-security-issue
 [Security Alert Notifications]: https://magento.com/security/sign-up
-[here]: LICENSE_AGPL3.txt
+[license]: LICENSE_AGPL3.txt
 [license@magentocommerce.com]: mailto:license@magentocommerce.com