Update release/3.0.0
with changes from dev
#347
Merged
release/3.0.0
with changes from dev
#347