Merge "DALi Version 2.1.8" into devel/master