fix #4019: enable live not working from wp map
Merge branch 'release' into upstream