fixes #3912 - add inheritance for locations / organizations
new changes