Merge "DALi Version 1.2.42" into devel/master