Merge Test with GNZ changes (disjoint)
Merge branch 'second_iteration' of https://github.com/messianos/pci_server.git into second_iteration