Merge "DALi Version 1.2.7" into devel/master