Revision 367528 - 8/26/2019

Summary
Un-merge FOCUS-21344