Merge "DALi Version 1.1.14" into devel/master