added changes for workflow 2.6.0
Merge remote-tracking branch 'origin/develop' into develop