Merge "DALi Version 1.2.17" into devel/master