Prepare release 5.0.4

Change-Id: I948a9f4d2cdd7b915be9fb92d630712e4317a74e