Merge "DALi Version 2.2.34" into devel/master