Deduder and bucket functionality with code review changes
Merge pull request #676 from chandnisingh/MLHR-452-M

Deduder and bucket functionality with code review changes