Merge branch 'call-forwarding' into 'develop'

Call forwarding

See merge request !115
1 job for 16-deploy-to-staticpages-vm in 44 seconds (queued for 1 second)