Original Pull Request #1993Closes#1989
(cherry picked from commit 95401a5bd783097c7e1aaf7dc35648a9cb90a970)
(cherry picked from commit 15ca49a92eb10524e4fd6a77cbefba5792f787bf)
Original Pull Request #1975Closes#1974
(cherry picked from commit f1b4a54bc23ee3944462c640966672b6310eebf8)
(cherry picked from commit c1ab4d66e06587295c2157b0cc0df4df5bdeb662)
Original Pull Request: #1925Closes: #1926
(cherry picked from commit 3b8f0c9d567d4c91ae937e6b87752d81cda4c0a7)
(cherry picked from commit 92806d2e1194bc470244deae8271b0e74ca3288b)
Original Pull Request #1919Closes#1917
(cherry picked from commit e71758686c35b6ad22e9e952f95a4aabd0909c43)
(cherry picked from commit 2dd0a6771fa955543c350b431bd043dd5083d99a)
Original Pull Request #1894Closes#1893
(cherry picked from commit 36b449c3852fee3b4cdeb0760058c4265d8a176c)
(cherry picked from commit c0781efbaad16bb4d9a943f9692bf6b356609bda)
Original Pull Request #1878Closes#1877
(cherry picked from commit d2e3ea26b80aaf661363a920254350abe915c36c)
(cherry picked from commit cc5b4fa635ffc6461af82e9e178bf1b0ffc3ad32)
Original Pull Request #1873Closes#1870
(cherry picked from commit d88fb037dadc6798641d51876d81ea64c43bf36b)
(cherry picked from commit 796a5ebe34f588efa4ad83932149fc4081e248a4)
Original Pull Request #1867Closes#1866
(cherry picked from commit 27094724dcf1a9f3932c86adff6cb58341ec2016)
(cherry picked from commit 303438ae6398bc02f06115e752791e5ef896939f)
Original Pull Request #1856Closes#1858
(cherry picked from commit 6f84a1c589998ffb47b8a0f97446073ecaa396b8)
(cherry picked from commit 254948d1c9ca3e517f26906c6fe79c6b368e6921)
Original Pull Request #1847Closes#1846
(cherry picked from commit a16a87f3fa42c96566fac06e89aa703767a4842e)
(cherry picked from commit 0bb239a67465fd1304d0f318690b301cd6f3b4fe)
Original Pull Request #1837Closes#1834
(cherry picked from commit 38dc7fb0fb493f0944985bcfd809ebefc3d12d45)
(cherry picked from commit 45a0e2213f13a74e8d27ded49a403f4b37b2f5b9)
Original Pull Request #1812Closes#1811
(cherry picked from commit e96d09fa51e7ee8450513657f51dbd55c4a54641)
(cherry picked from commit ad6022f64ca6071e1d139ae97c39b703570b49d2)