compat with old incomplete envs (default state of some distributions)
auto-merge staging into master