Merge "DALi Version 1.1.25" into devel/master