Update solution branch with code from milestone-commits

[gdnathan]

Commits to cherry-pick (might have conflict to resolve, we should only keep documentation update, and test updates):

• 91a63bb