Merge "DALi Version 1.1.36" into devel/master