Merge "DALi Version 1.1.34" into devel/master