Version 1.0.4 Beta 5

Change-Id: Ibdce1a452adc760f6e81dc621167a6c075da4f41
changelog

Change-Id: Idf92c39d21e621afd130eff236af493accef504d