Merge branch 'updates' into 'master'

April node update

See merge request !163
1 job for master in 25 seconds (queued for 6 seconds)