am 04958d15: Reconcile with jb-mr2-release - do not merge

* commit '04958d154370fde4db2deecfdfded210b694688d':
  Add GC thread to RSGL.