Rewrites per Marten & Andy K's feedback
Fixes DOC-684
Fixes EUCA-4730