Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1