Merge branch 'releases/2.1.3' into develop

2.1.3 readiness