main
Intermediate changes
Initial NBS OpenSource export
revert rXXXXXX (see discusstion in pr), will commit again more pci-dss friendly way