Merge "Populate additional fields for smartspace logging" into sc-qpr1-dev