Merge "DALi Version 1.0.47" into devel/master