Merge "Add de-duplication to periodic triggers"