Issue 7329

Pulled the 2 PR together into a single one.
Re gh-7330, gh-7340