6.1.x lps 33493

I've tested this on 6.1.x CE