Version 3.0.4

Change-Id: Ic849503395341b87a7f41a722b2b543bc3c08013