Merge "DALi Version 2.0.19" into devel/master