Merge "DALi Version 2.3.19" into devel/master