logging
Merge branch 'development' into MitjaPolicyNegotiation