Merge "DALi Version 1.4.40" into devel/master