I still feel like I've missed something.... Maybe that's just the constant distractions the last couple days...
approved this merge request
merged