Merge "DALi Version 2.2.26" into devel/master