master -> Lift 30 merge

Let's see if I screwed anything up!

(Answer: guaranteed yes.)