PROV-486

See description of last commit.

I'm running this by you to make sure the way the configuration works makes sense (you can take a look at the descriptions for the two last settings).

Thanks!