Merge remote-tracking branch 'origin/bw_holgern2gitlab_master' into brianoflondon/fix-encrypted-transfer-cfoxon