Merge "DALi Version 2.0.25" into devel/master