Increase transition fallback timeout
Merge branch 'dev'