v3.1.4: fuck you git

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