Merge commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1' * commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1': Use secure settings for backup enable / transport selection
Merge commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1' * commit 'ce0bf069fe8c5c93f91cb70b0cd9365245d144c1': Use secure settings for backup enable / transport selection