DOC-1466 part 1/2

Don't merge this yet -- I need a look from support to make sure I'm doing what they need.