Merge "DALi Version 1.2.9" into devel/master