Merge pull request #1898 from berak:b_3349_24