Merge pull request from aurusov/dev