Merge "DALi Version 1.0.48" into devel/master