Merge "Fix issues with GC thread." into jb-mr2-dev