Merge branch '65-promote-special-to-main' into '2.1-dev'

Resolve "Allow a schedule to become a normal schedule on a certain date"

See merge request !34
3 jobs for adding-phone-number in 1 minute and 52 seconds (queued for 1 second)