Patch/v2.1.2

[aneyzberg]

Problem

problem statement, including link to Pivotal Tracker #12345678

Solution

What I/we did to solve this problem

with @pairperson1

Double Checks:

• [] Did you update the changelog?
• [] Any new modules need to be exported?
• [] Are new methods in the right module?
• [] Are new methods/modules in core or not (i.e. porcelain or plumbing)?
• [] Do you have good documentation on exported methods?

Change summary:

• Tidy, well formulated commit message
• Another great commit message
• Something else I/we did

Steps to Verify:

1. A setup step / beginning state
2. What to do next
3. Any other instructions
4. Expected behavior
5. Suggestions for testing