Put back in commits that were lost in messed up reverted pull request

Branched livetsl -> livetsl-fix, merged master -> livetsl-fix, this PR merges livetsl-fix -> livetsl

Git is hard