Prepare release 5.0.4

Change-Id: I0c8afc3c245a0f7b7e4d53fd085640b540082a95