Rebasing develop
for latest 0.21.0 RC release
#216
Merged
develop
for latest 0.21.0 RC release
#216