Merge "DALi Version 1.1.35" into devel/master