Merge "DALi Version 2.0.5" into devel/master