Merge "DALi Version 1.2.34" into devel/master