Merge "DALi Version 2.2.6" into devel/master