Revert "Revert "Merge branch 'master' of Citizens"" This reverts commit 2f48ae982e36c6d66f62b029c47a77b8799ee9ab.