Merge "DALi Version 1.3.19" into devel/master