Merge "DALi Version 1.3.39" into devel/master