Merge "DALi Version 1.3.42" into devel/master