Merge "DALi Version 2.1.40" into devel/master