Release 1.3.21
v1.3.21.1
Merge branch 'master' into dev