changed condition to conditional
cleanup
Merge branch 'release/v2.0.4' into develop