Merge "DALi Version 2.2.18" into devel/master