Added garbage collection to release branch : CSH-511