Merge "DALi Version 1.2.36" into devel/master