Merge "DALi Version 1.2.24" into devel/master