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