Fa4

Hey Tom, this is a rebase of your #6084 with