Version 1.0.4 preparations

Change-Id: I54fdb2cd97bcc5c3a5817356dfef845a8c5b82b0