Merge branch 'master' into frontchannel-slo