Merge "Fix issue with late binding to ICS." into tm-qpr-dev