Merge "DALi Version 1.1.2" into devel/master