Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1