Merge "DALi Version 1.9.26" into devel/master