added return  to some methods
escape slash as well
Merge branch 'release/13.10.15' into develop