event name change and clearing tmp on upgrade
rp
Merge branch 'release/1.6.10'
Merge tag '1.6.10' into develop

v1.6.10