Version 1.0.4 Beta 2

Change-Id: Iedde0680447c7e395560b0247c3bc884367a3be3