Merge branch 'release/0.21.1'
Merge tag '0.21.1' into develop

Extra notifications.