Merge "DALi Version 1.9.36" into devel/master