Merge pull request #1899 from berak:b_3171_24