Merge pull request #493 from ioanpocol/citizen

LB-1250
Merge pull request #494 from ioanpocol/citizen

LB-1250
Merge pull request #495 from ioanpocol/citizen

Citizen
Merge pull request #496 from ioanpocol/citizen

LB-1250