Merge "DALi Version 1.2.0" into devel/master