Merge branch 'vplyashkun/clang-tidy'