- PENDING: verify PR #6717 gates