Merge branch 'master' into xtrnsec1

# Conflicts:
merge in master
Status Job ID Name Coverage
  Build
passed #1564
build-sbbs

00:13:10

passed #1565
build-sexpots

00:00:13

passed #1566
build-syncterm

00:01:50