AI-842: Ensures that adminLevelid for location types reaches the client
Merge branch 'beta'