More GC related update in 5.3.