Version 1.0.4 Beta 3

Change-Id: Idefcfb3b2f803137be28cd9d60764feaf4e30ae5