move experimental Timer feature to dev branch