Merge "DALi Version 2.1.26" into devel/master