Per comments in !6250 (merged) that were unresolved in that merge request.
@northrup @stanhu can you please review?