Merge "DALi Version 1.9.24" into devel/master