Merge remote-tracking branch 'remotes/origin/master' into bsc_operationals

# Conflicts:
#	.gitignore
3 jobs for bsc_operationals
in 1 minute and 38 seconds, using 0 compute credits, and was queued for 51 seconds