Merge "DALi Version 1.1.42" into devel/master