Merge pull request #2024 from ivantcholakov/develop

3.0.0-dev: Fixing the issue #2023.