Merge "DALi Version 1.2.25" into devel/master