Merge "DALi Version 1.9.7" into devel/master