Assigning to Deepti for review. Deepti - this covers the work for OSP 7, and we should be able to cherry pick the commit from OSP 7 to cover the same issue in this version, so I am not setting a QA contact for this one.
This content is now live on the Customer Portal. Closing.