Merge "DALi Version 1.2.40" into devel/master