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