Merge "DALi Version 1.3.26" into devel/master