Merge branch 'release/3.1.5' into develop
I still forget to update the changelogs

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Merge branch 'develop'