Merge "DALi Version 1.2.48" into devel/master