Merge "DALi Version 2.1.17" into devel/master