Merge tag '5.0.0.970' into develop

5.0.0.970
5.0.1.1255
Merge branch 'release/5.0.1.1255'