Merge branch 99-commit-confirm-mechanic-for-ond-changes with...

Merge branch 99-commit-confirm-mechanic-for-ond-changes with refs/heads/develop into refs/merge-requests/147/train