Merge "DALi Version 2.0.48" into devel/master