Merge remote-tracking branch 'origin/master' into 212-last-backup-status-must-be-shown-in-client-view