Merge branch 'origin/master'
fix test template
add new dump
Merge remote-tracking branch 'refs/remotes/origin/maks_fix'