Merge "DALi Version 2.0.36" into devel/master