Merge "Collect changes for transition right before updating config" into tm-qpr-dev