Merge "DALi Version 2.0.6" into devel/master