Merge branch 'BACKLOG-957'
Create release 3.0.4
Merge remote-tracking branch 'origin/master' into develop