Retain & Filter refactor#46

deankarn merged 3 commits intomastergo-playground/pkg:masterfrom

retain-filter-refactorgo-playground/pkg:retain-filter-refactorCopy head branch name to clipboard