Merge "[SB Refactor] Ensure the initial value is also logged to the table." into tm-qpr-dev