Merge "DALi Version 2.2.17" into devel/master