Merge "DALi Version 1.1.17" into devel/master