Fixes #8406: Allow content to be filtered by environment.