Merge "DALi Version 1.2.18" into devel/master