[*] fix dataLocal

requested review from @danil.martynenko

added 45 commits

• 2ab87433...7522341d - 44 commits from branch master
• 84cdba09 - Merge remote-tracking branch 'origin/master' into bugs-13029

Compare with previous version

mentioned in commit 2622a5f5

merged