Merge branch 'release/v3.0.4'
Update to 3.1.4 version