hotfix-5564

[*] Header update

requested review from @naeper

assigned to @roman.khlopkov

added 3 commits

• 0a867ec4...56a63876 - 2 commits from branch master
• 908e9818 - [*] Conflicts

Compare with previous version

mentioned in commit 34e27880

merged