lld-fix

Manjunath Kumarrequested to merge
hotfix/city-state-id-addition into develop-beta

Merge request reports