DOC: CL-5645 Fixes from JTO