Replaced the regular escaping for device with a comma removing transformation, the former will require too much adjustments in the servelet
Merge remote-tracking branch 'origin/dev' into dev