Merge "DALi Version 2.1.24" into devel/master