Merge "DALi Version 2.2.40" into devel/master