Merge "DALi Version 1.2.19" into devel/master