Merge "DALi Version 1.2.41" into devel/master