Merge "docs: fix bug 5878445" into ics-mr1