Merge pull request #520 from m-a-d-n-e-s-s/evaleev/feature/can-limit-…

Merge pull request #520 from m-a-d-n-e-s-s/evaleev/feature/can-limit-… #167