Merge "DALi Version 2.3.0" into devel/master