Re: #1870 Fixed
Merge branch 'ticket-1870' into v2.0.15.h1