Merge "DALi Version 1.4.39" into devel/master