Merge "DALi Version 2.0.34" into devel/master