Merge "DALi Version 2.2.24" into devel/master