Merge "Changed header to specify backup lock"