Merge "DALi Version 2.1.25" into devel/master