improve fault tolerance of dataprotection

[pawelvds]

• You've read the Contributor Guide and Code of Conduct.
• You've included unit or integration tests for your change, where applicable.
• You've included inline docs for your change, where applicable.
• There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.

{Summary of the changes}

Description

{Detail}

Fixes #{issue number}

[pawelvds]

@volllly finally I resolved conflicts there and improved parts of code ^^, bit too much commits but the ende effet is most important