ongoing work trying to find out if the patch (master branch) is also applicable for 1.3.5/1.3.6 branch ... or if we should wait for release updates.