Merge "fix bug 5942522" into ics-mr1