Merge "DALi Version 1.9.6" into devel/master