Merge "DALi Version 2.2.19" into devel/master