Commit c548a83a authored Apr 19, 2021 by Dmitriy Safronov

Merge branch 'master' into 'trunk'

# Conflicts:
#   .gitlab-ci.yml