Revision 386703 - 10/23/2019

Summary
Removed FOCUS-19128