Merge "docs: fixing bug 5942573" into ics-mr1