Merge tag '1.6.9' into develop

Release 1.6.9
event name change and clearing tmp on upgrade
rp
Merge branch 'release/1.6.10'