Merge "Adding system property tracing"