Merge "DALi Version 2.1.34" into devel/master