Release version 2.6.0.4
Merge branch 'release/2.6.0.4' into develop