Merge "DALi Version 1.2.39" into devel/master