fixed csp trace observer (includes temporary fix for backtracking)
Merge remote-tracking branch 'origin/develop' into develop