Merge "DALi Version 1.1.16" into devel/master