Updating for latest Dev Desktop + clone from 8.x directly because living DANGEROUSLY IS FUN.