Imported Upstream version 2.1.3
Merge tag 'upstream/2.1.3' into backend-master

Upstream version 2.1.3
new upstream release 2.1.3