am 718af2f9: am 55a1c40f: am 85cb9dec: Merge "docs: fix bug 5990526" into ics-mr1

* commit '718af2f93bbc0eda5a72e736e14b3a08d52799ed':