Merge "DALi Version 2.0.40" into devel/master