Closes #3116 (closed)
Notes: https://docs.google.com/document/d/1Ku3RNqDq5p4tjTr524y2hPsnZSAudrNkbw1qyHnZT1A/edit?usp=sharing