Prepare release 3.0.4

Change-Id: I471bcee8aa0b00f30f6dab52d16d50ecaf754ab9