Merge "DALi Version 2.0.18" into devel/master