Merge "DALi Version 1.2.58" into devel/master