Merge "DALi Version 2.3.6" into devel/master