Merge "Fixing some issues with the assistant stack" into oc-dr1-dev