Fix for connector and timer TCK regressions
Merge pull request #6453 from sguilhen/master

Fix for connector and timer TCK regressions