Revision 324027 - 4/12/2019

CTE

Summary
Remove FOCUS-18393