Merge Repeat Timer enhancements into master