delete hot fix 3 & 4
added hot fix 6
Merge commit '795d644580bea2a64d0da866440c80c7495362b0' into develop