6c40f0bfe0
Original Pull Request #1867 Closes #1866 (cherry picked from commit27094724dc) (cherry picked from commit303438ae63) (cherry picked from commit626b274677)