Closes #3101314
changed title from Patch from comment 4 by Jan-E, kirkkala applied to 3.3 to #3101314 Patch from comment 4 by Jan-E, kirkkala applied to 3.3